Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update .po files

Roland Geiderc0def064a6cc
diff --git a/wger/locale/ar_SA/LC_MESSAGES/django.po b/wger/locale/ar_SA/LC_MESSAGES/django.po
index 6861f5381..354ca1442 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+0000\n"
"PO-Revision-Date: 2026-05-13 13:14+0000\n"
"Last-Translator: \"E. Ta.\" <[email protected]>\n"
"Language-Team: Arabic (Saudi Arabia) <https://hosted.weblate.org/projects/"
@@ -34,10 +34,10 @@ msgstr ""
"المسجلين الجدد إلى الصالة وتحديث جميع المستخدمين الحاليين الذين ليس لديهم "
"صالة."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -49,87 +49,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "تعديل"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "النموذج مؤمّن باستخدام reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "تسجيل"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "الاسم الأول"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "الاسم الأخير"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "البريد الإلكتروني"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr ""
-"يستخدم لإعادة تعيين كلمة السر، واختياريًا، رسائل التذكير عبر البريد "
-"الإلكتروني."
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "تاريخ الميلاد"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "المعلومات الشخصية"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "تذكيرات بالتمارين"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "إعدادات أخرى"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "حفظ"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "البريد الإلكتروني"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "يستخدم لإعادة تعيين كلمة المرور، ورسائل التذكير عبر البريد الإلكتروني."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "هذا البريد مستخدم بالفعل."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "كلمة السر"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "الرجاء إدخال كلمة مرورك الحالية."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -137,27 +131,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "حذف"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "كلمة مرور غير صالحة"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "النموذج مؤمّن باستخدام reCAPTCHA"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Confirm"
+msgstr "توثيق عنوان البريد الإلكتروني"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "إرسال"
@@ -231,34 +230,10 @@ msgid "Imperial (pound)"
msgstr "النظام الإمبراطوري (رطل)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "عرض تعليقات التمرين"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "تحقق لعرض تعليقات التمرين في عرض التمرين"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "استخدم أيضًا المكونات باللغة الإنكليزية"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"تحقق أيضًا من عرض المكونات باللغة الإنكليزية أثناء إنشاء\n"
-"خطة غذائية. يتم استخراج هذه المكونات من قائمة مقدمة\n"
-"من وزارة الزراعة الأميركية. وهي قائمة كاملة للغاية، وتحتوي على حوالي\n"
-"٧٠٠٠ مدخل، ولكنها قد تكون مربكة بعض الشيء وتجعل البحث صعبًا."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "فعّل تذكيرات التمرين"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -266,19 +241,19 @@ msgstr ""
"تحقق لتفعيل التذكيرات التلقائية للتدريبات. تحتاج إلى تقديم بريد إلكتروني "
"صالح حتى يعمل هذا."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "تذكير قبل انتهاء الصلاحية"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "عدد الأيام التي ترغب في تلقي تذكير قبل انتهاء صلاحية تمرين."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "المدة الافتراضية للتمارين"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -286,11 +261,11 @@ msgstr ""
"المدة الافتراضية بالأسابيع للتدريبات غير المدرجة في جدولٍ زمني. تستخدم لإرسال "
"تذكيرات بالتدريبات عبر البريد الإلكتروني."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "لغة الإشعار"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -298,94 +273,81 @@ msgstr ""
"اللغة المستخدمة في إرسال الإشعارات عبر البريد الإلكتروني، مثل رسائل التذكير "
"بالتدريبات. هذا لا يؤثّر على اللغة المستخدمة في الموقع الإلكتروني."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "العمر"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "الطول (سنتيمتر)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "ساعات النوم"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "متوسط ساعات النوم في اليوم"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "العمل"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "متوسط عدد الساعات في اليوم"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "الشدة البدنية"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "تقريبًا"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "رياضة"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "متوسط الساعات في الأسبوع"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "وقت حر"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "إجمالي السعرات الحرارية اليومية"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "إجمالي السعرات الحرارية المتناوَلة، بما في ذلك على سبيل المثال أي فائض"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "وحدة الوزن"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "السماح بالوصول الخارجي"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"اسمح للمستخدمين الخارجيين بالوصول إلى تمارينك وسجلاتك في وضع القراءة فقط. "
-"يجب عليك ضبط هذا الإعداد قبل مشاركة الروابط، على سبيل المثال: على وسائل "
-"التواصل الاجتماعي."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "تذكيرات تلقائية لإدخال الوزن"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "عدد الأيام بعد آخر إدخال للوزن (أدخل ٠ لإلغاء التنشيط)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "فعّل الجوائز"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr "تفعيل أو تعطيل نظام الجوائز لهذا المستخدم"
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "يجب أن يكون مجموع جميع الساعات ٢٤"
@@ -393,8 +355,7 @@ msgstr "يجب أن يكون مجموع جميع الساعات ٢٤"
msgid "Repetitions"
msgstr "التكرارات"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "الوقت"
@@ -403,12 +364,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "الاسم"
@@ -496,6 +457,86 @@ msgstr "إذا لم يعمل الزر، انسخ هذا الرابط والصق
msgid "the wger Team"
msgstr "فريق wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "عناوين البريد الإلكتروني"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Current email"
+msgstr "توثيق عنوان البريد الإلكتروني"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "إرسال بريد إلكتروني للتوثيق"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "عرض التغييرات"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "تغييرات"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Change email"
+msgstr "توثيق عنوان البريد الإلكتروني"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "تسجيل الدخول"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "هل نسيت كلمة السر؟"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "ليس لديك حساب؟"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr "هل لديك حساب بالفعل؟"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -505,7 +546,7 @@ msgstr ""
"أنت تتصفح الموقع بصفتك المستخدم \"%(current_user)s\"، ويتم تنفيذ جميع "
"الإجراءات على بياناته."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "الرجوع إلى \"%(target)s\""
@@ -527,7 +568,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "اللغات"
@@ -536,15 +577,15 @@ msgid "Nothing found."
msgstr "لم يتم العثور على شيء."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "أضف واحدًا الآن."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -558,14 +599,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "الخيارات"
@@ -575,9 +615,9 @@ msgstr "قائمة التراخيص"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -592,7 +632,7 @@ msgstr "قائمة التراخيص"
msgid "Nothing found"
msgstr "لم يتم العثور على شيء"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "طبع"
@@ -604,7 +644,7 @@ msgstr "تمرين"
msgid "Routines"
msgstr "الروتينات"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "التقويم"
@@ -616,7 +656,7 @@ msgstr "القياسات"
msgid "Gallery"
msgstr "المعرض"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr "الجوائز"
@@ -638,7 +678,7 @@ msgstr "قوالب عامة"
msgid "Exercises"
msgstr "تمارين"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "إدارة"
@@ -663,7 +703,7 @@ msgstr "فئات"
msgid "Nutrition"
msgstr "تغذية"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "خطط التغذية"
@@ -684,7 +724,7 @@ msgstr "نظرة عامة على المكونات"
msgid "Body weight"
msgstr "وزن الجسم"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "نظرة عامة على الوزن"
@@ -700,7 +740,7 @@ msgstr "ادعم وشارك"
msgid "REST API"
msgstr "واجهة برمجة تطبيقات REST"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "ترخيص"
@@ -712,42 +752,42 @@ msgstr "وثائق المطور"
msgid "Get the code"
msgstr "احصل على الكود"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "ترجمة"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "إعادة تعيين كلمة المرور"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "تسجيل الخروج"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "تفضيلاتي"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "التراخيص"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "وحدات التكرار"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "وحدات الوزن"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "قائمة المستخدمين"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "الصالات"
@@ -801,34 +841,26 @@ msgstr "شكرًا لاستخدامك موقعنا!"
msgid "The %(site_name)s team"
msgstr "فريق %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "السابق"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "التالي"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "إغلاق"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "أنت تستخدم حساب ضيف، وسيتم حذف البيانات المدخلة بعد أسبوع."
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "أنشئ بعض الإدخالات التجريبية"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "شروط الخدمة"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr "لغة المتصفح"
@@ -836,37 +868,168 @@ msgstr "لغة المتصفح"
msgid "Features"
msgstr "الميزات"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "مفتاح API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "مفتاح API الخاص بك"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "ليس لديك مفتاح API حتى الآن"
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "إنشاء مفتاح API جديد"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "مفتاح API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "حذف مفتاح API الحالي وإنشاء مفتاح جديد"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "إنشاء مفتاح API جديد"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "إنشاء مفتاح API جديد"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "ليس لديك مفتاح API حتى الآن"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "وثائق"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "وثائق"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "حذف الحساب"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "هل أنت متأكد؟"
@@ -883,102 +1046,94 @@ msgstr ""
"والسجلات، وما إلى ذلك)\n"
"ولا يمكن التراجع عنه. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "ليس لديك حساب؟"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "هل نسيت كلمة السر؟"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "آخر %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "الوصف"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "عدد السجلات (بالأيام)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "آخر نشاط"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "لم يتم العثور على أي تمارين."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "سجل"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "الانطباع العام"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "ملحوظات"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "الطاقة"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "البروتين"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "الكربوهيدرات"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "الدهون"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "كيلوكالوري"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,193 +1142,215 @@ msgstr "كيلوكالوري"
msgid "Actions"
msgstr "الإجراءات"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "إلغاء تنشيط المستخدم"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "تنشيط المستخدم"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "إعادة تعيين كلمة مرور المستخدم"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "الأدوار"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "تأكيد إعادة تعيين كلمة المرور"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr "هل تريد حقًا تغيير كلمة مرور هذا المستخدم؟"
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "لا"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "نعم"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "التفاصيل"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "الهاتف"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "العنوان"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "مسجّل"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "آخر تسجيل دخول"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "الحالة"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "نشط"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "غير نشط"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "العقود"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "المستندات"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "تحميل"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "تضمين في نظرة عامة غير نشطة"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "تسجيل الدخول كهذا المستخدم"
+
+#: core/templates/user/overview.html:539
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "تسجيل دخول المسؤول متاح فقط للمستخدمين في %(gym_name)s"
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
-msgstr "تسجيل الدخول كهذا المستخدم"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "التفضيلات"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "بريد إلكتروني موثق"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "بريد إلكتروني غير موثق"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "إرسال بريد إلكتروني للتوثيق"
-
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
-msgstr "يجب عليك توثيق بريدك الإلكتروني للمساهمة في التمارين"
-
-#: core/templates/user/preferences.html:55 core/views/user.py:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "تغيير كلمة المرور"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
-msgstr "هل لديك حساب بالفعل؟"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "إعادة تعيين كلمة المرور"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "حذف الحساب"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "كيلوجرام"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "جرام"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "رطل"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "أونصة"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "تم الحذف بنجاح"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "حذف {0}؟"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "تعديل {0}"
@@ -1188,52 +1365,64 @@ msgstr ""
"تغذية، لتتمكن من رؤية إمكانيات هذا الموقع بشكل أفضل. لا تتردد في تعديلها أو "
"حذفها!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "تم حذف الحساب \"{0}\" بنجاح"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "تم تسجيلك بنجاح"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "تم تحديث الإعدادات بنجاح"
-#: core/views/user.py:396
+#: core/views/user.py:314
+msgid "Please correct the errors below."
+msgstr ""
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "تم إلغاء تفعيل المستخدم بنجاح"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "تم تفعيل المستخدم بنجاح"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "تعديل المستخدم"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "معرف"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "اسم المستخدم"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "الصالة"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr "تم إرسال بريد إلكتروني للتوثيق إلى %(email)s"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "باللاتينية، على سبيل المثال: ”Pectoralis major“"
@@ -1263,44 +1452,148 @@ msgstr "الملف ليس فيديو صالحًا"
msgid "Equipment list"
msgstr "قائمة المعدات"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "سجل إدارة التمارين"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "الإجراء"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
+msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "المستخدم"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "حذف"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "الترجمة"
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "التراجع عن التغييرات"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "هدف"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "تغييرات"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "التراجع عن التغييرات"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "تراجع"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "عرض الهدف"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "عرض التغييرات"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "التراجع عن التغييرات"
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "الاسم الأول"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "السابق"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "الاسم الأخير"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1322,6 +1615,35 @@ msgstr "إضافة معدات جديدة"
msgid "Delete equipment?"
msgstr "حذف المعدات؟"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "المستخدم"
+
+#: exercises/views/history.py:117
+#, fuzzy
+#| msgid "Types"
+msgid "Type"
+msgstr "الأنواع"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "الإجراء"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "إضافة عضلة"
@@ -1420,15 +1742,15 @@ msgstr "تاريخ البدء"
msgid "End date"
msgstr "تاريخ الانتهاء"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "الرمز البريدي"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "المدينة"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "الشارع"
@@ -1520,7 +1842,7 @@ msgstr "قائمة الصالة"
msgid "Global gym configuration"
msgstr "تكوين الصالة العالمية"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "إضافة صالة جديدة"
@@ -1600,11 +1922,11 @@ msgstr ""
"تمت إعادة تعيين كلمة مرور هذا المستخدم. يُرجى إبلاغ المستخدم بكلمة المرور "
"الجديدة."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "إضافة ملاحظة"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "إضافة عقد"
@@ -1621,15 +1943,15 @@ msgstr "حذف {0}"
msgid "Add contract type"
msgstr "إضافة نوع العقد"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "الجنس"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "إضافة مستخدم إلى الصالة"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "تعديل الصالة"
@@ -2041,26 +2363,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2113,53 +2435,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Nutrition"
msgid "Portion"
@@ -2203,77 +2525,101 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
-msgstr ""
+#, fuzzy
+#| msgid "Ingredient weight units"
+msgid "Ingredient pagination"
+msgstr "وحدات وزن المكون"
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
-msgstr ""
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "الاسم الأول"
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "السابق"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "التالي"
+
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "تغذية"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2345,38 +2691,38 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
#, fuzzy
#| msgid "Personal data"
msgid "Nutritional data"
msgstr "المعلومات الشخصية"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2737,35 +3083,35 @@ msgstr ""
msgid "Translation"
msgstr "الترجمة"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2883,6 +3229,64 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "يستخدم لإعادة تعيين كلمة السر، واختياريًا، رسائل التذكير عبر البريد "
+#~ "الإلكتروني."
+
+#~ msgid "Workout reminders"
+#~ msgstr "تذكيرات بالتمارين"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "عرض تعليقات التمرين"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "تحقق لعرض تعليقات التمرين في عرض التمرين"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "استخدم أيضًا المكونات باللغة الإنكليزية"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "تحقق أيضًا من عرض المكونات باللغة الإنكليزية أثناء إنشاء\n"
+#~ "خطة غذائية. يتم استخراج هذه المكونات من قائمة مقدمة\n"
+#~ "من وزارة الزراعة الأميركية. وهي قائمة كاملة للغاية، وتحتوي على حوالي\n"
+#~ "٧٠٠٠ مدخل، ولكنها قد تكون مربكة بعض الشيء وتجعل البحث صعبًا."
+
+#~ msgid "Allow external access"
+#~ msgstr "السماح بالوصول الخارجي"
+
+#~ 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 ""
+#~ "اسمح للمستخدمين الخارجيين بالوصول إلى تمارينك وسجلاتك في وضع القراءة فقط. "
+#~ "يجب عليك ضبط هذا الإعداد قبل مشاركة الروابط، على سبيل المثال: على وسائل "
+#~ "التواصل الاجتماعي."
+
+#~ msgid "Your API key"
+#~ msgstr "مفتاح API الخاص بك"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "يجب عليك توثيق بريدك الإلكتروني للمساهمة في التمارين"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "تم تسجيلك بنجاح"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "تم إرسال بريد إلكتروني للتوثيق إلى %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "عرض الهدف"
+
#~ msgid "Email verification"
#~ msgstr "توثيق البريد الإلكتروني"
@@ -2908,9 +3312,6 @@ msgstr ""
#~ 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 4e9d21a84..f4423f65e 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -32,10 +32,10 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -47,87 +47,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Поправи"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr ""
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Регистрация"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr ""
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr ""
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Е-мейл"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr ""
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Запази"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Е-мейл"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:238
+#: core/forms.py:234
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "Този email е вече използван."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -135,27 +131,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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Изтрии"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr ""
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -229,155 +228,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Покажи коментарите на упражнението"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-"Отбележи, за да се покажат коментарите от упражнението да прегледа за "
-"тренировката"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Също използвай съставки на Английски"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Отбележи за да покажеш също съставките на Английски, докато си създаваш\n"
-"план за хранене. Тези съставки за извлечени от списък издаден от\n"
-"Департамента за Агрикултура на САЩ. Той е изключително пълноценен, с около\n"
-"7000 въведения, но също може да се окаже прекалено голям и да направи "
-"търсенето дълго."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Единица за тегло"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -385,8 +347,7 @@ msgstr ""
msgid "Repetitions"
msgstr "Повторения"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -395,12 +356,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Име"
@@ -484,6 +445,82 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+msgid "Current email"
+msgstr ""
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Password reset confirmation"
+msgid "Resend confirmation email"
+msgstr "Потвърждение за нулиране на паролата"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "Change password"
+msgid "Cancel change"
+msgstr "Смени парола"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Change password"
+msgid "Change to"
+msgstr "Смени парола"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Change password"
+msgid "Change email"
+msgstr "Смени парола"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Вход"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Забравена парола?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Нямаш акаунт?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -491,7 +528,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr ""
@@ -510,7 +547,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -519,15 +556,15 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "Добави сега."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -541,14 +578,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Опции"
@@ -558,9 +594,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -575,7 +611,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -587,7 +623,7 @@ msgstr "Тренировка"
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr ""
@@ -601,7 +637,7 @@ msgstr "Макронутриенти"
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -627,7 +663,7 @@ msgstr ""
msgid "Exercises"
msgstr "Упражнения"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Администрация"
@@ -654,7 +690,7 @@ msgstr ""
msgid "Nutrition"
msgstr "Хранене"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "План за хранене"
@@ -675,7 +711,7 @@ msgstr "Преглед на съставките"
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Преглед на тегло"
@@ -691,7 +727,7 @@ msgstr ""
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Лиценз"
@@ -703,42 +739,42 @@ msgstr ""
msgid "Get the code"
msgstr "Грабни кода"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Преведи"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Промени парола"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Изход"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Моите преференции"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Единици за тегло"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -792,36 +828,28 @@ msgstr "Мерси че ползвахте нашият сайт!"
msgid "The %(site_name)s team"
msgstr "Отбора на %(site_name)s."
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "предишно"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "следващо"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr ""
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Вие сте влезли като гост и всички данни, които добавяте ще бъдат изтрити "
"след една седмица."
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Направи демонстративни попълнения"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -829,37 +857,164 @@ msgstr ""
msgid "Features"
msgstr "Особености"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Направи график"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr ""
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete API key"
+msgstr "Изтрии"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr ""
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Administration"
+msgid "API documentation"
+msgstr "Администрация"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -872,102 +1027,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Нямаш акаунт?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Забравена парола?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Описание"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Не са намерени тренировки."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Бележки"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Енергия"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Протеин"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Въглехидрати"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Мазнини"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,114 +1123,112 @@ msgstr ""
msgid "Actions"
msgstr "Действия"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Потвърждение за нулиране на паролата"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "№"
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1091,78 +1236,102 @@ msgid "Preferences"
msgstr "Преференции"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Смени парола"
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Промени парола"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
-msgstr "Смени парола"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "No account?"
+msgid "Connected accounts"
+msgstr "Нямаш акаунт?"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1178,52 +1347,66 @@ msgstr ""
"този сайт да направи за теб. Чувствай се свободен да ги редактираш или "
"изтриеш!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Вие се регистрирахте успешно"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Настройките бяха успешно обновени"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Моля изберете една опция от изброените по-долу."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1255,49 +1438,145 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise admin history"
msgstr "Ден за упражнение"
-#: exercises/templates/history/overview.html:27
+#: exercises/templates/history/overview.html:16
#, fuzzy
-#| msgid "Actions"
-msgid "Action"
-msgstr "Действия"
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Редактирай серия"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Потребител"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Редактирай серия"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Редактирай серия"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
msgstr ""
-#: exercises/templates/history/overview.html:31
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
#, fuzzy
-#| msgid "Change password"
-msgid "Changes"
-msgstr "Смени парола"
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Изтрии"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translate"
+msgid "translations"
+msgstr "Преведи"
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+msgid "First"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "предишно"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+msgid "Last"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
@@ -1320,6 +1599,35 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Потребител"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Действия"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Добави мускул"
@@ -1420,15 +1728,15 @@ msgstr "Начална дата"
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1520,7 +1828,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1594,11 +1902,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1615,15 +1923,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -2045,26 +2353,26 @@ msgstr "Упражнение"
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2117,55 +2425,55 @@ msgstr "Упражнение"
msgid "Workout for %s"
msgstr "Тренировка за %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Съставка"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Също използвай съставки на Английски"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Duration"
msgid "Portion"
@@ -2217,77 +2525,99 @@ msgstr ""
"успешно."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Няма съставки."
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
-msgstr "Търси"
+#, fuzzy
+#| msgid "ingredient name"
+msgid "Ingredient pagination"
+msgstr "Име на съставка"
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:59
+msgid "First page"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
-msgstr ""
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "предишно"
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "следващо"
+
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
+msgstr "Търси"
+
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Макронутриенти"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Състав на захар в въглехидратите"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "Не е налично"
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Наситени мазнини в мазнини"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Други"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Натрий"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Хранене"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Добави нова единица за тегло"
@@ -2359,36 +2689,36 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Добави нова съставка"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Хранителни данни"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2781,35 +3111,35 @@ msgstr ""
msgid "Translation"
msgstr "Преведи"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2927,6 +3257,35 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Show exercise comments"
+#~ msgstr "Покажи коментарите на упражнението"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Отбележи, за да се покажат коментарите от упражнението да прегледа за "
+#~ "тренировката"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Също използвай съставки на Английски"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Отбележи за да покажеш също съставките на Английски, докато си създаваш\n"
+#~ "план за хранене. Тези съставки за извлечени от списък издаден от\n"
+#~ "Департамента за Агрикултура на САЩ. Той е изключително пълноценен, с "
+#~ "около\n"
+#~ "7000 въведения, но също може да се окаже прекалено голям и да направи "
+#~ "търсенето дълго."
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Вие се регистрирахте успешно"
+
#, fuzzy
#~| msgid "Administration"
#~ msgid "Email verification"
@@ -3231,9 +3590,6 @@ msgstr ""
#~ msgid "Add exercises to day \"%(day_name)s\""
#~ msgstr "Добави упражнения към деня \"%(day_name)s\""
-#~ msgid "Edit set"
-#~ msgstr "Редактирай серия"
-
#, fuzzy
#~| msgid "No schedules found."
#~ msgid "No templates found."
@@ -3267,9 +3623,6 @@ msgstr ""
#~ msgid "Add workout day"
#~ msgstr "Добави тренировъчен ден"
-#~ msgid "Create schedule"
-#~ msgstr "Направи график"
-
#~ msgid "Edit workout"
#~ msgstr "Редактирай тренировката"
@@ -3369,9 +3722,6 @@ msgstr ""
#~ "прегледа\n"
#~ "или търсачката."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Моля изберете една опция от изброените по-долу."
-
#~ msgid "Accept"
#~ msgstr "Приемам"
@@ -3399,9 +3749,6 @@ msgstr ""
#~ msgid "That's done here"
#~ msgstr "Това е свършено"
-#~ msgid "ingredient name"
-#~ msgstr "Име на съставка"
-
#~ msgid "Only registered users can do this"
#~ msgstr "Само за регистрирани потребители"
diff --git a/wger/locale/ca/LC_MESSAGES/django.po b/wger/locale/ca/LC_MESSAGES/django.po
index abfb048a6..22022eb96 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -31,10 +31,10 @@ msgstr ""
"tot nou usuari que es registri a dit gimnàs i actualitzarà tots els usuaris "
"existents que no en tinguin."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -46,89 +46,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Edita"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "El formulari està protegit amb reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Enregistreu-vos"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Nom"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Cognom"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Adreça electrònica"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data de naixement"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Dades personals"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Recordatoris d'entrenament"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Altres configuracions"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Desa"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Adreça electrònica"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Usada per a reinicialitzar contrasenyes i, opcionalment, recordatoris per "
"correu."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Aquesta adreça ja s'està usant."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Contrasenya"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Introduïu la contrasenya actual."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -136,27 +130,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Esborra"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Contrasenya invàlida"
-#: 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:289
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm"
+msgstr "Configuració"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Envia"
@@ -232,36 +231,10 @@ msgid "Imperial (pound)"
msgstr "Imperials (lliura)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Mostra comentaris dels exercicis"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-"Marqueu per a mostrar els comentaris dels exercicis a la vista d'entrenament"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Usa també ingredients en anglès"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Marqueu per a mostrar també els ingredients en anglès quan creeu un pla\n"
-"nutricional. Dits ingredients s'extreuen d'una llista proveïda pel "
-"Departament\n"
-"d'Agricultura dels EUA. És extremadament completa, amb unes 7000 entrades,\n"
-"però pot ser una mica massa extensa i dificultar les cerques."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Activa recordatoris d'entrenament"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -269,21 +242,21 @@ msgstr ""
"Marqueu per a activar els recordatoris automàtics per als entrenaments. Cal "
"que proporcioneu una adreça electrònica vàlida per a que funcionin."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Avisa'm abans que no expiri"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Nombre de dies abans de l'expiració d'un entrenament amb què voleu ser "
"avisat."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Duració per defecte dels entrenaments"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -291,11 +264,11 @@ msgstr ""
"Duració per defecte en setmanes per als entrenaments no programats. Usada "
"pels recordatoris d'entrenament per correu."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Llengua de notificació"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -303,96 +276,83 @@ msgstr ""
"Llengua que s'usa quan se us enviïn notificacions per correu, p. e. "
"recordatoris per entrenaments. No afecta la llengua usada en el web."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Edat"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Alçada (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Hores de son"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Mitjana d'hores de son al dia"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Feina"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Mitjana d'hores diàries"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Intensitat física"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Aproximadament"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Esport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Mitjana d'hores setmanals"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Temps lliure"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Calories diàries totals"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Ingesta calòrica total, inclosos p. e. qualsevol extra"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Unitat de pes"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Permet accés extern"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Permet que usuaris externs accedeixin als vostres entrenaments i registres "
-"en mode de només lectura. Cal que ho activeu abans que podeu compartir "
-"vincles p. e. a xarxes socials."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Recordatoris automàtics per a entrades de pes"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Nombre de dies des de la darrera entrada de pes (introduïu 0 per a "
"desactivar)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "La suma de totes les hores ha de ser 24"
@@ -400,8 +360,7 @@ msgstr "La suma de totes les hores ha de ser 24"
msgid "Repetitions"
msgstr "Repeticions"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Temps"
@@ -410,12 +369,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Nom"
@@ -507,6 +466,86 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Adreces electròniques"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Versió actual"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Configuration"
+msgid "Resend confirmation email"
+msgstr "Configuració"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View logs"
+msgid "Cancel change"
+msgstr "Veure registres"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Change password"
+msgid "Change to"
+msgstr "Canvia la contrasenya"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Configuration"
+msgid "Change email"
+msgstr "Configuració"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Accedeix"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Contrasenya oblidada?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "No teniu cap compte?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -523,7 +562,7 @@ msgstr ""
"s'executarà sobre les seves dates.\n"
" "
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Enrere a \"%(target)s\""
@@ -551,7 +590,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Llengües"
@@ -560,15 +599,15 @@ msgid "Nothing found."
msgstr "No s'ha trobat res."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -582,14 +621,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Opcions"
@@ -599,9 +637,9 @@ msgstr "Llista de llicències"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -616,7 +654,7 @@ msgstr "Llista de llicències"
msgid "Nothing found"
msgstr "No s'ha trobat res"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Colofó"
@@ -628,7 +666,7 @@ msgstr "Entrenament"
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Calendari"
@@ -640,7 +678,7 @@ msgstr ""
msgid "Gallery"
msgstr "Galeria"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -662,7 +700,7 @@ msgstr "Plantilles públiques"
msgid "Exercises"
msgstr "Exercicis"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administració"
@@ -689,7 +727,7 @@ msgstr "Categories"
msgid "Nutrition"
msgstr "Nutrició"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Plans de nutrició"
@@ -710,7 +748,7 @@ msgstr "Ingredients en un cop d'ull"
msgid "Body weight"
msgstr "Pes corporal"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "El pes en un cop d'ull"
@@ -726,7 +764,7 @@ msgstr ""
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Llicència"
@@ -738,42 +776,42 @@ msgstr "Documentació per a desenvolupadors"
msgid "Get the code"
msgstr "Obteniu el codi font"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduïu"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Reinicialitza la contrasenya"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Surt"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Les meves preferències"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Llicències"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unitats de repetició"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Unitats de pes"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Llista d'usuaris"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Gimnasos"
@@ -827,36 +865,28 @@ msgstr "Gràcies per usar el nostre lloc web!"
msgid "The %(site_name)s team"
msgstr "L'equip de %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "enrere"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "següent"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Tanca"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Crea algunes entrades de mostra"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Condicions del servei"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -864,37 +894,168 @@ msgstr ""
msgid "Features"
msgstr "Funcions"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Clau API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "La vostra clau API"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Encara no teniu cap clau API"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Genera una nova clau API"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Crea un programa"
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Sessió d'entrenament"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Clau API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Esborra la clau API actual i genera'n una altra"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Genera una nova clau API"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Genera una nova clau API"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Encara no teniu cap clau API"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Documentació"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentació"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Cancel·la el compte"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Esteu segur?"
@@ -911,102 +1072,94 @@ msgstr ""
"(entrenaments, \n"
"registres, etc.) sense possibilitat de desfer-ho. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "No teniu cap compte?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Contrasenya oblidada?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "darrers %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Descripció"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Nombre de registres (dies)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Darrera activitat"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "No s'han trobat entrenaments."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Registre"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Impressió general"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Notes"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Proteïna"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Carbohidrats"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Greix"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1015,197 +1168,219 @@ msgstr "kcal"
msgid "Actions"
msgstr "Accions"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Desactiva l'usuari"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Activa l'usuari"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Reinicialitza contrasenya de l'usuari"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Rols"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Confirmació de reinicialització de la contrasenya"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "No"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Sí"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalls"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Núm."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telèfon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adreça"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registrat"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Darrera connexió"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Estat"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Actiu"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inactiu"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contractes"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documents"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Descarrega"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inclou a la vista general d'inactius"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Connecta amb aquest compte"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Connecta amb aquest compte"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Opcions"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
#, fuzzy
#| msgid "Send emails"
msgid "Verified email"
msgstr "Envia correus"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Canvia la contrasenya"
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Reinicialitza la contrasenya"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
-msgstr "Canvia la contrasenya"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Cancel·la el compte"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Esborrat amb èxit"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Esborrar {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Edita {0}"
@@ -1220,52 +1395,66 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "El compte «{0}» s'ha esborrat amb èxit"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Us heu registrat amb èxit"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Opcions actualitzades amb èxit"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Seleccioneu una de les opcions següents."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "S'ha desactivat l'usuari amb èxit"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "S'ha activat l'usuari amb èxit"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Edita l'usuari"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Nom d'usuari"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Gimnàs"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En llatí, p. e. «Pectoralis major»"
@@ -1299,56 +1488,158 @@ msgstr "%(birthdate)s no és una data de naixement vàlida"
msgid "Equipment list"
msgstr "Llista d'equipaments"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise admin history"
msgstr "Dia d'entrenament"
-#: exercises/templates/history/overview.html:27
+#: exercises/templates/history/overview.html:16
#, fuzzy
-#| msgid "Actions"
-msgid "Action"
-msgstr "Accions"
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Edita sèrie"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Usuari"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Edita sèrie"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Edita sèrie"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Esborra"
-#: exercises/templates/history/overview.html:29
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translate"
+msgid "translations"
+msgstr "Traduïu"
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "View logs"
+msgid "Revert change"
+msgstr "Veure registres"
+
+#: exercises/templates/history/overview.html:187
#, fuzzy
#| msgctxt "As in \"email subject\""
#| msgid "Subject"
-msgid "Object"
+msgid "Open object"
msgstr "Assumpte"
-#: exercises/templates/history/overview.html:31
-#, fuzzy
-#| msgid "Change password"
-msgid "Changes"
-msgstr "Canvia la contrasenya"
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
msgstr ""
-#: exercises/templates/history/overview.html:75
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
#, fuzzy
-#| msgid "View logs"
-msgid "View changes"
-msgstr "Veure registres"
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Feu clic aquí per a més informació"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Nom"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "enrere"
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Cognom"
+
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
msgstr "Vista general del músculs"
@@ -1369,6 +1660,35 @@ msgstr "Afegeix un nou equipament"
msgid "Delete equipment?"
msgstr "Voleu esborrar l'equipament?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Usuari"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Tipus"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Accions"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Afegeix múscul"
@@ -1467,15 +1787,15 @@ msgstr "Data d'inici"
msgid "End date"
msgstr "Data de finalització"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Codi postal"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Ciutat"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Carrer"
@@ -1571,7 +1891,7 @@ msgstr "Llista de gimnasos"
msgid "Global gym configuration"
msgstr "Configuració global de gimnasos"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Afegeix un nou gimnàs"
@@ -1651,11 +1971,11 @@ msgstr ""
"S'ha reinicialitzat la contrasenya de l'usuari. Notifiqueu l'usuari la seva "
"nova contrasenya."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Afegeix nota"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Afegeix contracte"
@@ -1672,15 +1992,15 @@ msgstr "Esborra {0}"
msgid "Add contract type"
msgstr "Afegeix tipus de contracte"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Gènere"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Afegeix usuari al gimnàs"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Edita el gimnàs"
@@ -2111,26 +2431,26 @@ msgstr "Exercici"
msgid "Routine will expire soon"
msgstr "L'entrenament caducarà aviat"
-#: 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ó."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Dolenta"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutra"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Bona"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Si introduïu una hora, heu d'introduir-ne ambdues d'inici i final."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "L'hora d'inici no pot ser posterior a la de finalització."
+
#: manager/templates/routines/email_reminder.tpl:3
#, fuzzy, python-format
#| msgid "Your current workout '%(workout)s' expired %(days)s days ago."
@@ -2195,27 +2515,27 @@ msgstr "Entrenament"
msgid "Workout for %s"
msgstr "Pla d'entrenament per a %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Unitat"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Ingesta energètica bàsica"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
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:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Calories addicionals"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2223,29 +2543,29 @@ msgstr ""
"Calories addicionals a afegir a la base (per a sostreure-les-en, introduïu "
"un número negatiu)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ingredient"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
#, 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
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2289,81 +2609,105 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Variacions"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient"
+msgid "Ingredient pagination"
+msgstr "Ingredient"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Nom"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "enrere"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "següent"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Cerca"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, 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
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Nutrició"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2435,38 +2779,38 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
#, fuzzy
#| msgid "Nutrition plan"
msgid "Nutritional data"
msgstr "Pla nutricional"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2851,35 +3195,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2997,6 +3341,58 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Usada per a reinicialitzar contrasenyes i, opcionalment, recordatoris per "
+#~ "correu."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Recordatoris d'entrenament"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Mostra comentaris dels exercicis"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Marqueu per a mostrar els comentaris dels exercicis a la vista "
+#~ "d'entrenament"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Usa també ingredients en anglès"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Marqueu per a mostrar també els ingredients en anglès quan creeu un pla\n"
+#~ "nutricional. Dits ingredients s'extreuen d'una llista proveïda pel "
+#~ "Departament\n"
+#~ "d'Agricultura dels EUA. És extremadament completa, amb unes 7000 "
+#~ "entrades,\n"
+#~ "però pot ser una mica massa extensa i dificultar les cerques."
+
+#~ msgid "Allow external access"
+#~ msgstr "Permet accés extern"
+
+#~ 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 ""
+#~ "Permet que usuaris externs accedeixin als vostres entrenaments i "
+#~ "registres en mode de només lectura. Cal que ho activeu abans que podeu "
+#~ "compartir vincles p. e. a xarxes socials."
+
+#~ msgid "Your API key"
+#~ msgstr "La vostra clau API"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Us heu registrat amb èxit"
+
#, fuzzy
#~| msgid "Configuration"
#~ msgid "Email verification"
@@ -3275,9 +3671,6 @@ msgstr ""
#~ "for a superset."
#~ msgstr "Podeu cercar més d'un exercici, s'agruparan en un conjunt."
-#~ msgid "Type"
-#~ msgstr "Tipus"
-
#~ msgid "Table"
#~ msgstr "Taula"
@@ -3376,9 +3769,6 @@ msgstr ""
#~ msgid "Log overview"
#~ msgstr "Vista general del registre"
-#~ msgid "Workout session"
-#~ msgstr "Sessió d'entrenament"
-
#~ msgid "Delete with logs"
#~ msgstr "Esborra amb registres"
@@ -3559,9 +3949,6 @@ msgstr ""
#~ "i\n"
#~ "es convertirà automàticament en «4 x 10»."
-#~ msgid "Edit set"
-#~ msgstr "Edita sèrie"
-
#~ msgid "Update"
#~ msgstr "Actualitza"
@@ -3610,9 +3997,6 @@ msgstr ""
#~ msgid "Delete workout log"
#~ msgstr "Esborra registre d'entrenament"
-#~ msgid "Create schedule"
-#~ msgstr "Crea un programa"
-
#~ msgid "Edit workout"
#~ msgstr "Edita el pla d'entrenament"
@@ -3717,9 +4101,6 @@ msgstr ""
#~ msgid "Submission date"
#~ msgstr "Data d'inserció"
-#~ msgid "Please select one of the options below."
-#~ msgstr "Seleccioneu una de les opcions següents."
-
#~ msgid "Accept"
#~ msgstr "Accepta"
diff --git a/wger/locale/cs/LC_MESSAGES/django.po b/wger/locale/cs/LC_MESSAGES/django.po
index e9c6f5b0e..be7adef43 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+0000\n"
"PO-Revision-Date: 2026-04-27 09:09+0000\n"
"Last-Translator: greeenos <[email protected]>\n"
"Language-Team: Czech <https://hosted.weblate.org/projects/wger/web/cs/>\n"
@@ -38,10 +38,10 @@ msgstr ""
"všem nově registrovaným uživatelům a uživatelům, kteří nemají posilovnu "
"zvolenou."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -53,85 +53,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Upravit"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Zabezpečeno službou reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Registrace"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Jméno"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Příjmení"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Email"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Datum narození"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Osobní data"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Připomenutí tréninku"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Další nastavení"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Uložit"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Email"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Tato e-mailová adresa je již používána."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Heslo"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Zadejte prosím vaše současné heslo."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -139,27 +135,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Smazat"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Chybné heslo"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "Zabezpečeno službou reCAPTCHA"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Confirm"
+msgstr "Potvrďte email"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Zaslat"
@@ -233,34 +234,10 @@ msgid "Imperial (pound)"
msgstr "Imperiální (libra)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Zobrazit komentáře ke cviku"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Podívejte se na komentáře ke cviku v zobrazení tréninku"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Použít také složky v Angličtině"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Budou použity také složky jídel v Angličtině během vytváření\n"
-"nutričního plánu. Tyto složky jsou přezvaty z oficiálního seznamu \n"
-"Ministerstva zemědělství USA. Tento seznam je velmi komplexní a \n"
-"obsahuje přes 7000 položek, ale může to vést k těžšímu vyhledávání."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Zapnout připomenutí tréninku"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -268,19 +245,19 @@ msgstr ""
"Zkontrolujte si, jestli máte zapnuté automatické připomenutí tréninku. Je "
"nutné mít zadaný platný email."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Připomenout před expirací"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Počet dní před expirací, kdy bude trénink připomenut."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Základní délka tréninku"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -288,11 +265,11 @@ msgstr ""
"Neníli nastavena běžná délka týdenního tréninku v rozvrhu. Bude použito "
"emailové připomenutí tréninku."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Jazyk notifikací"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -301,96 +278,83 @@ msgstr ""
"připomenutí tréninku. Tohle nebude mít vliv na použitý jazyk na webové "
"stránce."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Věk"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Výška (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Spánek"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Průměrné hodiny spánku za den"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Práce"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Průměrně hodin denně"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Fyzická náročnost"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Přibližně"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Průměrně hodin týdně"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Volný čas"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Celkové denní kalorie"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Celkový příjem kalorií, včetně např. přebytků"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Jednotka váhy"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Povolit externí přístup"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Povolit externím uživatelům přístup k tréninkům a záznamům v režimu pouze "
-"čtení. Je tžřeba nastavit, než budete moci sdílet odkazy, například na "
-"sociální sítě."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Automaticky připomenout zadání váhy"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Počet dní, kdy má být připomenuto provedení vážení a zápisu hodnoty (pro "
"vypnutí napište 0 )"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "Povolit trofeje"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr "Zapnout nebo vypnout systém trofejí pro tohoto uživatele"
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Součet všech hodin musí být 24"
@@ -398,8 +362,7 @@ msgstr "Součet všech hodin musí být 24"
msgid "Repetitions"
msgstr "Opakování"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Čas"
@@ -408,12 +371,12 @@ msgid "Distance"
msgstr "Vzdálenost"
#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:283 core/views/user.py:605
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Název"
@@ -502,6 +465,86 @@ msgstr ""
msgid "the wger Team"
msgstr "Tým wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Emaily"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Aktuální verze"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Odeslat ověřovací email"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Zobrazit změny"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Změny"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Change email"
+msgstr "Potvrďte email"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Přihlášení"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Zapomenuté heslo?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Nemáte účet?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -511,7 +554,7 @@ msgstr ""
"Prohlížíte si tento web jako uživatel „%(current_user)s“; všechny akce se "
"provádějí na jeho datech."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Zpět na \"%(target)s\""
@@ -535,7 +578,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Jazyky"
@@ -544,15 +587,15 @@ msgid "Nothing found."
msgstr "Nic nenalezeno."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -566,14 +609,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Nastavení"
@@ -583,9 +625,9 @@ msgstr "Seznam licencí"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -600,7 +642,7 @@ msgstr "Seznam licencí"
msgid "Nothing found"
msgstr "Nic nenalezeno"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Tiráž"
@@ -612,7 +654,7 @@ msgstr "Trénink"
msgid "Routines"
msgstr "Rutiny"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Kalendář"
@@ -624,7 +666,7 @@ msgstr "Měření"
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr "Trofeje"
@@ -646,7 +688,7 @@ msgstr "Veřejné šablony"
msgid "Exercises"
msgstr "Cviky"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administrace"
@@ -671,7 +713,7 @@ msgstr "Kategorie"
msgid "Nutrition"
msgstr "Výživa"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Nutriční plány"
@@ -692,7 +734,7 @@ msgstr "Přehled jídel"
msgid "Body weight"
msgstr "Tělesná hmotnost"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Přehled váhy"
@@ -708,7 +750,7 @@ msgstr "Podpora a zapojení se"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licence"
@@ -720,42 +762,42 @@ msgstr "Dokumentace vývojáře"
msgid "Get the code"
msgstr "Získejte kód"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Překlad"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Reset hesla"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Odhlásit"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Má nastavení"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licence"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Opakující jednotky"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Jednotka hmostnosti"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Uživatelský seznam"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Posilovny"
@@ -810,34 +852,26 @@ msgstr "Děkujeme, že využíváte naši stránku!"
msgid "The %(site_name)s team"
msgstr "Tým %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "předchozí"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "další"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Zavřít"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Vytvořit nějaké testovací potraviny"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Podmínky služby"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -845,37 +879,170 @@ msgstr ""
msgid "Features"
msgstr "Funkce"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Klíč API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Váš API klíč"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Zatím nemáte žádný klíč API"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Vytvořit nový API klíč"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Vytvořit rozvrh"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Tréninková relace"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Klíč API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Smazat aktuální API klíč a vytvořit jeden nový"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Vytvořit nový API klíč"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Vytvořit nový API klíč"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Zatím nemáte žádný klíč API"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokumentace"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentace"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Smazání účtu"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Jste si jistý?"
@@ -891,102 +1058,94 @@ msgstr ""
"Dojde také k ostranění všech přidružených záznamů (tréninky, záznamy atd.)\n"
"a jedná se o nevratný proces. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Nemáte účet?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Zapomenuté heslo?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "poslední %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Popis"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Počet záznamů (za den)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Poslední aktivita"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Nenalezeny žádné tréninky."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Záznam"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Celkový dojem"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Poznámky"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Bílkoviny"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Sacharidy"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Tuky"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,193 +1154,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "Akce"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Deaktivovat uživatele"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Aktivovat uživatele"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Reset hesla"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Role"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Potvrzení obnovy hesla"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Ne"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Ano"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Podrobnosti"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Č."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresa"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registrován"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Poslední příhlášení"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Stavy"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktivní"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Neaktivní"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Zakázky"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenty"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Stáhnout"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Zahrnout v přehledu neaktivních"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Přihlásit se jako tento uživatel"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Přihlásit se jako tento uživatel"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Nastavení"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Ověřený email"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Neověřený email"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Odeslat ověřovací email"
-
-#: core/templates/user/preferences.html:31
-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:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Změna hesla"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Reset hesla"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Smazání účtu"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Úspěšně smazáno"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Smazat {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Upravit {0}"
@@ -1196,52 +1377,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Účet \"{0}\" byl smazán"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Byl jste úspěšně zaregistrován"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Nastavení bylo aktualizováno"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Vyberte si jednu z možností níže."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Uživatel byl deaktivován"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Uživatel byl aktivován"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Upravit uživatele"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Ano, smazat"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Uživatel"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Posilovna"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "v latině, např. \"Pectoralis major\""
@@ -1271,44 +1468,158 @@ msgstr "Soubor není platným videem"
msgid "Equipment list"
msgstr "Seznam nářadí"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Administrativní historie cvičení"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Akce"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Upravit sérii"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Uživatel"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Upravit sérii"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Upravit sérii"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Smazat"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Překlad"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Ano, smazat"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Zvrátit změny"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Objekt"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Změny"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Zvrátit změny"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Navrátit"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Zobrazit objekt"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Zobrazit změny"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Zvrátit změny"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Klikněte zde pro více informací"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Jméno"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "předchozí"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Příjmení"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1330,6 +1641,33 @@ msgstr "Přidat nové nářadí"
msgid "Delete equipment?"
msgstr "Smazat nářadí?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Uživatel"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Typ"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Akce"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Přidat sval"
@@ -1429,15 +1767,15 @@ msgstr "Datum začátku"
msgid "End date"
msgstr "Upravit datum"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "PSČ"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Město"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Ulice"
@@ -1533,7 +1871,7 @@ msgstr "Seznam posiloven"
msgid "Global gym configuration"
msgstr "Základní nastavení posilovny"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Přidat novou posilovnu"
@@ -1613,11 +1951,11 @@ msgstr ""
"Hesla uživatelů byla obnovena. Prosím, informujte uživatele o nutnosti "
"použití nových hesel."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Přidat poznámku"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Přidat zakázka"
@@ -1634,15 +1972,15 @@ msgstr "Smazat {0}"
msgid "Add contract type"
msgstr "Přidejte typ zakázky"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Pohlaví"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Přidat uživatele do posilovny"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Upravit posilovnu"
@@ -2069,26 +2407,26 @@ msgstr "Cvik"
msgid "Routine will expire soon"
msgstr "Trénink bude brzy expirovat"
-#: 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í."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Špatné"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutrální"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Dobré"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Pokud zadáváte čas, musíte zadat jak čas začátku, tak i čas konce."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Čas začátku nemůže být po čase ukončení."
+
#: manager/templates/routines/email_reminder.tpl:3
#, fuzzy, python-format
#| msgid "Your current workout '%(workout)s' expired %(days)s days ago."
@@ -2154,27 +2492,27 @@ msgstr "Trénink"
msgid "Workout for %s"
msgstr "Trénink pro %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Jednotka"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Základní energetický příjem"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
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:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Přidat kalorie"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2182,27 +2520,27 @@ msgstr ""
"Další kalorie můžete přidat k základní hodnotě (pokud chcete odečíst, "
"zadejte záporné číslo)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Potravina"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Také hledat názvy v angličtině"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2258,83 +2596,107 @@ msgstr ""
"email, budete o dokončení informováni."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Variace"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Bez položek."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Kategorie přísad"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Jméno"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "předchozí"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "další"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Vyhledat"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Makroživiny"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Cukr v sacharidech"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "neuvedeno"
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Nasycené mastné kyseliny"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Další"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Sodík"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Klikněte zde pro více informací"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Výživa"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Přidejte novou jednotku hmostnosti"
@@ -2420,36 +2782,36 @@ 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:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Přidat novou složku"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Nutriční plán"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Nutriční plán pro %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Nutriční data"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Celkem"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Procent z energie"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g na kg tělesné váhy"
@@ -2856,35 +3218,35 @@ msgstr "Zdrojový kód"
msgid "Translation"
msgstr "Překlad"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Ano, smazat"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Původní název tohoto objektu, pokud je dostupný"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Odkaz na původní objekt, pokud je dostupný"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Autoři"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Pokud nejste autorem, zadejte sem název nebo zdroj."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Odkaz na profil autora, pokud je dostupný"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Odkaz na původní zdroj, pokud se jedná o odvozené dílo"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3029,6 +3391,62 @@ msgstr ""
msgid "Re-Submit"
msgstr "Znovu poslat"
+#~ 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."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Připomenutí tréninku"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Zobrazit komentáře ke cviku"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Podívejte se na komentáře ke cviku v zobrazení tréninku"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Použít také složky v Angličtině"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Budou použity také složky jídel v Angličtině během vytváření\n"
+#~ "nutričního plánu. Tyto složky jsou přezvaty z oficiálního seznamu \n"
+#~ "Ministerstva zemědělství USA. Tento seznam je velmi komplexní a \n"
+#~ "obsahuje přes 7000 položek, ale může to vést k těžšímu vyhledávání."
+
+#~ msgid "Allow external access"
+#~ msgstr "Povolit externí přístup"
+
+#~ 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 ""
+#~ "Povolit externím uživatelům přístup k tréninkům a záznamům v režimu pouze "
+#~ "čtení. Je tžřeba nastavit, než budete moci sdílet odkazy, například na "
+#~ "sociální sítě."
+
+#~ msgid "Your API key"
+#~ msgstr "Váš API klíč"
+
+#~ 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"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Byl jste úspěšně zaregistrován"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "Ověřovací e-mail byl zaslán na %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Zobrazit objekt"
+
#~ msgid "Email verification"
#~ msgstr "Ověření e-mailu"
@@ -3203,9 +3621,6 @@ msgstr "Znovu poslat"
#~ msgid "Brand name of product"
#~ msgstr "Značka produktu"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Kategorie přísad"
-
#~ msgid "Amount in grams"
#~ msgstr "Množství v gramech"
@@ -3407,9 +3822,6 @@ msgstr "Znovu poslat"
#~ "Můžete vyhledat více jak jeden cvik. Cviky pak budou zařazeny do "
#~ "supersérie."
-#~ msgid "Type"
-#~ msgstr "Typ"
-
#~ msgid "Table"
#~ msgstr "Tabulka"
@@ -3508,9 +3920,6 @@ msgstr "Znovu poslat"
#~ msgid "Log overview"
#~ msgstr "Záznam přehledu"
-#~ msgid "Workout session"
-#~ msgstr "Tréninková relace"
-
#~ msgid "Delete with logs"
#~ msgstr "Smazat se záznamy"
@@ -3679,9 +4088,6 @@ msgstr "Znovu poslat"
#~ "opakování,\n"
#~ "tím dojde k nastavení automaticky na \"4 x 10\"."
-#~ msgid "Edit set"
-#~ msgstr "Upravit sérii"
-
#~ msgid "Update"
#~ msgstr "Zaktualizovat"
@@ -3730,9 +4136,6 @@ msgstr "Znovu poslat"
#~ msgid "Delete workout log"
#~ msgstr "Smazat záznam tréninku"
-#~ msgid "Create schedule"
-#~ msgstr "Vytvořit rozvrh"
-
#~ msgid "Edit workout"
#~ msgstr "Upravit trénink"
@@ -3926,9 +4329,6 @@ msgstr "Znovu poslat"
#~ "jestli bude zahrnuta v databázi. Do doby, než bude zkontrolována,\n"
#~ "nebude se zobrazovat v přehledu, nebo ve vyhledávání."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Vyberte si jednu z možností níže."
-
#~ msgid "Accept"
#~ msgstr "Povolit"
diff --git a/wger/locale/da/LC_MESSAGES/django.po b/wger/locale/da/LC_MESSAGES/django.po
index 77ee13461..42e75813d 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -33,10 +33,10 @@ msgstr ""
"tilknyttet dette fitnesscenter, og allerede eksisterende brugere der ikke er "
"tilknyttet et center vil tilknyttes dette."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -48,85 +48,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Rediger"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Denne formular er sikret med reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Registrer"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Fornavn"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Efternavn"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Email"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Fødselsdag"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Personlige oplysninger"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Træningspåmindelser"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Andre indstillinger"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Gem"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Email"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "Bruges til kode-nulstilling og, hvis ønsket, email-påmindelser."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Denne emailadresse er allerede i brug."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Kodeord"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Indtast venligst dit nuværende kodeord."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -134,27 +130,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Slet"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Ukorrekt kodeord"
-#: 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:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Email ikke bekræftet"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Indsend"
@@ -228,36 +229,10 @@ msgid "Imperial (pound)"
msgstr "Engelsk (pund)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Vis øvelses-kommentarer"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Marker for at vise øvelseskommentarer i trænings-visningen"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Brug også ingredienser på Engelsk"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Vælg for at også vise ingredienser på engelsk ved oprettelse af "
-"enæringsplan.\n"
-"Disse ingredienser oprinder fra en liste leveret af det amerikanske "
-"landbrugsministerie.\n"
-"Det er meget komplet med omkring 7000 poster, men kan være overvældende og\n"
-"gøre søgning vanskelig."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Aktivér trænings påmindelser"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -265,19 +240,19 @@ msgstr ""
"Vælg for at aktivere automatiske påmindelser for træninger. Du skal angive "
"en valid email for at dette virker."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Påmind før udløbsdato"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Antallet af dage du vil påmindes før en træning udløber."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Standard varighed af træninger"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -285,11 +260,11 @@ msgstr ""
"Standard varighed i uger af træninger ikke i en træningsplan. Brugt til "
"sende emails om træningspåmindelser."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Notifikation sprog"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -298,94 +273,81 @@ msgstr ""
"påmindelser om træninger. Dette har ikke indflydelse på sproget brugt på "
"hjemmesiden."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Alder"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Højde (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Timer af søvn"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Den gennemsnitlige mængde søvn pr. dag"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Arbejde"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Timer i gennemsnit per dag"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Fysisk intensitet"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Cirka"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Timer i gennemsnit per uge"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Fritid"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Total daglige kalorier"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Total kalorieindtag, inklusive eventuelle overskud"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Vægt enhed"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Tillad ekstern adgang"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Tillad eksterne brugere adgang til dine træninger og dine logfiler i "
-"skrivebeskyttet tilstand. Du skal sætte dette før du kan dele link f.eks. på "
-"sociale medier."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Automatisk påmindelse om vægtindskrivning"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Antal dage siden sidste vægtindskrivning (skriv 0 for at deaktivere)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Summen af alle timer skal være 24"
@@ -393,8 +355,7 @@ msgstr "Summen af alle timer skal være 24"
msgid "Repetitions"
msgstr "Repetitioner"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Tid"
@@ -405,12 +366,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Navn"
@@ -504,6 +465,86 @@ msgstr ""
msgid "the wger Team"
msgstr "wger Holdet"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Emails"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Nuværende version"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Send bekræftelsesemail"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Vis ændringer"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Ændringer"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Email ikke bekræftet"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Login"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Glemt kodeord?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Ingen konto?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -513,7 +554,7 @@ msgstr ""
"Du gennemser siden som brugeren \"%(current_user)s\". Alle handlinger "
"udføres med dennes data."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "TIlbage til \"%(target)s\""
@@ -536,7 +577,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Sprog"
@@ -545,15 +586,15 @@ msgid "Nothing found."
msgstr "Intet fundet."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -567,14 +608,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Indstillinger"
@@ -584,9 +624,9 @@ msgstr "Licens liste"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -601,7 +641,7 @@ msgstr "Licens liste"
msgid "Nothing found"
msgstr "Ingenting fundet"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Aftryk"
@@ -614,7 +654,7 @@ msgstr "Træning"
msgid "Routines"
msgstr "Rutiner"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Kaldender"
@@ -626,7 +666,7 @@ msgstr "Målinger"
msgid "Gallery"
msgstr "Galleri"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -648,7 +688,7 @@ msgstr "Offentlige skabeloner"
msgid "Exercises"
msgstr "Øvelser"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administration"
@@ -673,7 +713,7 @@ msgstr "Kategorier"
msgid "Nutrition"
msgstr "Ernæring"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Ernæringsplaner"
@@ -694,7 +734,7 @@ msgstr "Ingrediensoversigt"
msgid "Body weight"
msgstr "Kropsvægt"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Vægt oversigt"
@@ -711,7 +751,7 @@ msgstr "Støt & bidrag til fællesskabet"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licens"
@@ -723,42 +763,42 @@ msgstr "Udviklerdokumentation"
msgid "Get the code"
msgstr "Hent koden"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Oversæt"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Nulstil kodeord"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Log ud"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Mine indstillinger"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenser"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Gentagelsesenheder"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Vægtenheder"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Brugerliste"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Fitnescentre"
@@ -812,35 +852,27 @@ msgstr "Tak fordi du bruger vores side!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s teamet"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "forrige"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "næste"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Luk"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Indtast nogle demo-poster"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Vilkår for brug"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -848,37 +880,168 @@ msgstr ""
msgid "Features"
msgstr "Funktioner"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API nøgle"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Din API nøgle"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Du har ingen API nøgle endnu"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Lav en ny API nøgle"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Creation date"
+msgid "Created"
+msgstr "Oprettelsesdato"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Træningssession"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API nøgle"
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Slet nuværende API nøgle og lav en ny"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Lav en ny API nøgle"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Lav en ny API nøgle"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Du har ingen API nøgle endnu"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokumentation"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentation"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Slet konto"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Er du sikker?"
@@ -895,102 +1058,94 @@ msgstr ""
"logs, osv.)\n"
"og kan ikke fortrydes. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Ingen konto?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Glemt kodeord?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "sidste %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beskrivelse"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Antal logs (dage)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Sidste aktivitet"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Ingen træninger fundet."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Generelt indtryk"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Noter"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energi"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Kulhydrater"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Fedt"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,193 +1154,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "Handlinger"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Deaktiver bruger"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Aktiver bruger"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Nulstil brugerens kodeord"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roller"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Bekræft nulstilling af kodeord"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Nej"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detaljer"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresse"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registreret"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Sidste login"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktiv"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inaktiv"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Kontrakter"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenter"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Hent"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inkluder i inaktiv oversigt"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Log ind som bruger"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Log ind som bruger"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Præferencer"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Bekræftet email"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Email ikke bekræftet"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Send bekræftelsesemail"
-
-#: core/templates/user/preferences.html:31
-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:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Ændre kodeord"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Nulstil kodeord"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Slet konto"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Sletning udført"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Slet {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Rediger {0}"
@@ -1200,52 +1377,64 @@ msgstr ""
"og ernærningsplanposter så du bedre kan se hvad denne hjemmeside kan. Du kan "
"redigere eller slette dem!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Kontoen \"{0}\" blev slettet"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Du er nu registreret"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Indstillinger opdateret"
-#: core/views/user.py:396
+#: core/views/user.py:314
+msgid "Please correct the errors below."
+msgstr ""
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Brugeren blev deaktiveret"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Brugeren blev aktiveret"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Rediger bruger"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Brugernavn"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Fitnescenter"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "På latinsk, f.eks. \"Pectoralis major\""
@@ -1275,44 +1464,154 @@ msgstr "Filen er ikke en valid video"
msgid "Equipment list"
msgstr "Udstyrsliste"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Øvelses administrator historik"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Handlinger"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Rediger sæt"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Bruger"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Rediger sæt"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Rediger sæt"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Slet"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translate"
+msgid "translations"
+msgstr "Oversæt"
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Fortryd ændringer"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Objekt"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Ændringer"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Fortryd ændringer"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Fortryd"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Vis Objekt"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Vis ændringer"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Fortryd ændringer"
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Fornavn"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "forrige"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Efternavn"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1334,6 +1633,35 @@ msgstr "Tilføj nyt udstyr"
msgid "Delete equipment?"
msgstr "Slet udstyr?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Bruger"
+
+#: exercises/views/history.py:117
+#, fuzzy
+#| msgid "Types"
+msgid "Type"
+msgstr "Typer"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Handlinger"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Tilføj muskler"
@@ -1432,15 +1760,15 @@ msgstr "Startdato"
msgid "End date"
msgstr "Slutdato"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Postnummer"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "By"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Vejnavn"
@@ -1536,7 +1864,7 @@ msgstr "Fitnescenterliste"
msgid "Global gym configuration"
msgstr "Global fitnescenter konfiguration"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Tiføj nyt fitnescenter"
@@ -1616,11 +1944,11 @@ msgstr ""
"Denne brugers kodeord er blevet nulstillet. Underret venligst brugeren om "
"deres nye kodeord."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Tilføj note"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Tilføj kontrakt"
@@ -1637,15 +1965,15 @@ msgstr "Slet {0}"
msgid "Add contract type"
msgstr "Tilføj kontrakttype"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Køn"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Tilføj bruger til fitnescenter"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Rediger fitnescenter"
@@ -2067,26 +2395,26 @@ msgstr "Øvelse"
msgid "Routine will expire soon"
msgstr "Træning vil udløbe snart"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Dårlig"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutral"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "God"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Hvis du indtaster en tid, skal du indtaste både start og slut tid."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Startiden kan ikke være efter sluttiden."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2139,53 +2467,53 @@ msgstr "Træning"
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Enhed"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Søg også navne på Engelsk"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2229,79 +2557,103 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Variationer"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
-msgstr ""
+#, fuzzy
+#| msgid "Ingredients pending review"
+msgid "Ingredient pagination"
+msgstr "Ingredienser afventer gennemgang"
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
-msgstr ""
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Fornavn"
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "forrige"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "næste"
+
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Ernæring"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2373,38 +2725,38 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
#, fuzzy
#| msgid "Nutrition plan"
msgid "Nutritional data"
msgstr "Ernæringsplan"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2771,35 +3123,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2917,6 +3269,66 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Bruges til nulstilling af adgangskode og, valgfrit, e-mailpåmindelser."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Træningspåmindelser"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Vis øvelses-kommentarer"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Marker for at vise øvelseskommentarer i trænings-visningen"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Brug også ingredienser på Engelsk"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Vælg for at også vise ingredienser på engelsk ved oprettelse af "
+#~ "enæringsplan.\n"
+#~ "Disse ingredienser oprinder fra en liste leveret af det amerikanske "
+#~ "landbrugsministerie.\n"
+#~ "Det er meget komplet med omkring 7000 poster, men kan være overvældende "
+#~ "og\n"
+#~ "gøre søgning vanskelig."
+
+#~ msgid "Allow external access"
+#~ msgstr "Tillad ekstern adgang"
+
+#~ 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 ""
+#~ "Tillad eksterne brugere adgang til dine træninger og dine logfiler i "
+#~ "skrivebeskyttet tilstand. Du skal sætte dette før du kan dele link f.eks. "
+#~ "på sociale medier."
+
+#~ msgid "Your API key"
+#~ msgstr "Din API nøgle"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "Du skal bekræfte din email for at tilføje øvelser"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Du er nu registreret"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "En bekræftelsesemail blev sendt til %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Vis Objekt"
+
#, fuzzy
#~| msgid "Email verified"
#~ msgid "Email verification"
@@ -3038,9 +3450,6 @@ msgstr ""
#~ msgid "Session"
#~ msgstr "Profession"
-#~ msgid "Creation date"
-#~ msgstr "Oprettelsesdato"
-
#~ msgid "Workout template"
#~ msgstr "Træningsskabelon"
@@ -3281,9 +3690,6 @@ msgstr ""
#~ msgid "Log overview"
#~ msgstr "Logoversigt"
-#~ msgid "Workout session"
-#~ msgstr "Træningssession"
-
#~ msgid "Delete with logs"
#~ msgstr "Slet med logs"
@@ -3445,9 +3851,6 @@ msgstr ""
#~ "repetitionerne.\n"
#~ "Det bliver automatisk til \"4 x 10\"."
-#~ msgid "Edit set"
-#~ msgstr "Rediger sæt"
-
#~ msgid "Update"
#~ msgstr "Opdater"
@@ -3490,9 +3893,6 @@ msgstr ""
#~ msgid "Delete schedule"
#~ msgstr "Slet skema"
-#~ msgid "Ingredients pending review"
-#~ msgstr "Ingredienser afventer gennemgang"
-
#~ msgid "Share"
#~ msgstr "Del"
diff --git a/wger/locale/de/LC_MESSAGES/django.po b/wger/locale/de/LC_MESSAGES/django.po
index 42191d53d..feb6c9b74 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+0000\n"
"PO-Revision-Date: 2026-05-13 13:14+0000\n"
"Last-Translator: Roland Geider <[email protected]>\n"
"Language-Team: German <https://hosted.weblate.org/projects/wger/web/de/>\n"
@@ -35,10 +35,10 @@ msgstr ""
"registrierten Benutzer diesem Studio zuweisen und alle Anwender ohne ein "
"Studio aktualisieren."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -50,89 +50,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Bearbeiten"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Das Formular ist mit reCaptcha gesichert"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Registrieren"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Vorname"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Nachname"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "E-Mail"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Geburtsdatum"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Persönliche Daten"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Trainingsplanerinnerungen"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Andere Einstellungen"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Speichern"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "E-Mail"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Diese E-Mail-Adresse wird bereits verwendet."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Passwort"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Bitte dein aktuelles Passwort eingeben."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -140,27 +134,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Löschen"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Ungültiges Passwort"
-#: 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:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Nicht verifizierte E-Mail-Adresse"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Abschicken"
@@ -234,35 +233,10 @@ msgid "Imperial (pound)"
msgstr "Imperial (Pfund)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Übungskommentare ein/ausblenden"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Auswählen, um Übungskommentare auf der Trainingsplanseite anzuzeigen"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Auch Zutaten auf Englisch anzeigen"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Auswählen, um auch Zutaten auf Englisch anzuzeigen beim Erstellen \n"
-"eines Ernährungsplanes. Diese Zutaten stammen aus einer Liste \n"
-"des US-amerikanischen Landwirtschaftsministeriums. Diese hat etwa 7000 "
-"Einträge und ist extrem vollständig, \n"
-"kann aber die Suche etwas unübersichtlich machen."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Trainingsplanerinnerungen aktivieren"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -270,21 +244,21 @@ msgstr ""
"Auswählen, um automatische Erinnerungen für Trainingspläne zu aktivieren. Du "
"wirst eine korrekte E-Mail-Adresse dafür brauchen."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Vor Ablauf erinnern"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Die Anzahl der Tage, die du vor dem Ablauf des Trainingsplanes erinnert "
"werden möchtest."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Standardwert der Trainingsplandauer"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -292,11 +266,11 @@ msgstr ""
"Standardwert in Wochen für Trainingspläne, die nicht in einem Zeitplan sind. "
"Wird für E-Mail-Erinnerungen benutzt."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Sprache für Benachrichtigungen"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -305,96 +279,83 @@ msgstr ""
"Erinnerungs-E-Mails für Trainingspläne. Diese Angabe beeinflusst die Sprache "
"der Website nicht."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Alter"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Größe (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Stunden Schlaf"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Durschnitliche Stunden Schlaf pro Tag"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Arbeit"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Durschnittliche Stunden pro Tag"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Körperliche Intensität"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Ungefähr"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Durschnittliche Stunden pro Woche"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Freizeit"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Gesamte tägliche Kalorien"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Gesamt Kalorieneinnahme inkl. Überschuss"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Gewichtseinheit"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Externen Zugriff zulassen"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Erlaubt externen Zugriff auf deine Trainingseinheiten und Gewichtslogs im "
-"Lese-Modus. Du musst das aktivieren, bevor du Links z.B. über soziale Medien "
-"freigeben kannst."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Automatische E-Mail-Erinnerungen für Gewichtseinträge"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Anzahl der Tage nach dem letzten Gewichtseintrag (0 eingeben zum "
"deaktivieren)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "Trophäen aktivieren"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr "Aktiviert oder deaktiviert das Trophäensystem für diesen Nutzer"
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Die Summe aller Stunden muss 24 sein"
@@ -402,8 +363,7 @@ msgstr "Die Summe aller Stunden muss 24 sein"
msgid "Repetitions"
msgstr "Wiederholungen"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Zeit"
@@ -412,12 +372,12 @@ msgid "Distance"
msgstr "Entfernung"
#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:283 core/views/user.py:605
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Name"
@@ -505,8 +465,8 @@ 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 ""
-"Der Link ist für %(expire_hours)s Stunden gültg (bis um %(time)s am %(date)s)"
-". Sie können einen neuen Link in den Profil-Einstellungen anfragen."
+"Der Link ist für %(expire_hours)s Stunden gültg (bis um %(time)s am "
+"%(date)s). Sie können einen neuen Link in den Profil-Einstellungen anfragen."
#: core/templates/account/email/email_confirmation_message.html:116
msgid "If the button doesn't work, copy and paste this link into your browser:"
@@ -518,6 +478,86 @@ msgstr ""
msgid "the wger Team"
msgstr "Das wger Team"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "E-Mails"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Aktuelle Version"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Sende Bestätigungs-E-Mail"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Änderungen anzeigen"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Änderungen"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Nicht verifizierte E-Mail-Adresse"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Anmelden"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Passwort vergessen?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Kein Konto?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -527,7 +567,7 @@ msgstr ""
"Du bist als Benutzer „%(current_user)s“ auf der Website unterwegs, alle "
"Aktionen werden mit ihren Daten durchgeführt."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Zurück zu „%(target)s“"
@@ -551,7 +591,7 @@ msgstr ""
"Bist du sicher, dass du das löschen willst? Diese Aktion kann nicht "
"rückgängig gemacht werden."
-#: core/templates/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Sprachen"
@@ -560,15 +600,15 @@ msgid "Nothing found."
msgstr "Nichts gefunden."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -582,14 +622,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Optionen"
@@ -599,9 +638,9 @@ msgstr "Lizenzliste"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -616,7 +655,7 @@ msgstr "Lizenzliste"
msgid "Nothing found"
msgstr "Nichts gefunden"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Impressum"
@@ -628,7 +667,7 @@ msgstr "Training"
msgid "Routines"
msgstr "Routinen"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Kalender"
@@ -640,7 +679,7 @@ msgstr "Messungen"
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -662,7 +701,7 @@ msgstr "Öffentliche Vorlagen"
msgid "Exercises"
msgstr "Übungen"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administration"
@@ -687,7 +726,7 @@ msgstr "Kategorien"
msgid "Nutrition"
msgstr "Ernährung"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Ernährungspläne"
@@ -708,7 +747,7 @@ msgstr "Zutatenübersicht"
msgid "Body weight"
msgstr "Körpergewicht"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Gewichtsübersicht"
@@ -724,7 +763,7 @@ msgstr "Support & Mitmachen"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Lizenz"
@@ -736,42 +775,42 @@ msgstr "Entwickler-Dokumentation"
msgid "Get the code"
msgstr "Quellcode"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Übersetze"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Passwort zurücketzen"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Abmelden"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Meine Einstellungen"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Lizenzen"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Wiederholungs-Einheiten"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Gewichtseinheiten"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Benutzerliste"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Studios"
@@ -825,36 +864,28 @@ msgstr "Vielen Dank, dass du unsere Website benutzt!"
msgid "The %(site_name)s team"
msgstr "Das Team von %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "zurück"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "nächste"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Schließen"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Beispieldaten erstellen"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Allgemeine Nutzungsbedingungen"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -862,37 +893,168 @@ msgstr ""
msgid "Features"
msgstr "Funktionen"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API-Schlüssel"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Dein API-Schlüssel"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Du hast noch keinen API-Schlüssel"
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Generiere einen neuen API-Schlüssel"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Zeitplan erstellen"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Trainingseinheit"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API-Schlüssel"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Lösche aktuellen Schlüssel und generiere einen neuen"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Generiere einen neuen API-Schlüssel"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Generiere einen neuen API-Schlüssel"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Du hast noch keinen API-Schlüssel"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokumentation"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentation"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Konto löschen"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Bist du sicher?"
@@ -909,102 +1071,94 @@ msgstr ""
"Protokolle, usw.), \n"
"die Aktion kann nicht rückgängig gemacht werden. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Kein Konto?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Passwort vergessen?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "letzte %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beschreibung"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Anzahl der Protokolle (Tage)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Letzte Aktivität"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Keine Trainingspläne gefunden."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Tagebucheintrag"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Allgemeiner Eindruck"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Notizen"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Eiweiß"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Kohlenhydrate"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Fett"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1013,193 +1167,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "Aktionen"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Benutzer deaktivieren"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Benutzer aktivieren"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Benutzerpasswort zurücksetzen"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Rollen"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Zurücksetzen des Passworts bestätigen"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Nein"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Details"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresse"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registriert"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Letzter Login"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktiv"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inaktiv"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Verträge"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumente"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Runterladen"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "In Inaktivübersicht aufnehmen"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Als diesen Benutzer einloggen"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Als diesen Benutzer einloggen"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Einstellungen"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Verifizierte E-Mail"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Nicht verifizierte E-Mail-Adresse"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Sende Bestätigungs-E-Mail"
-
-#: core/templates/user/preferences.html:31
-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:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Passwort ändern"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Passwort zurücketzen"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Konto löschen"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Erfolgreich gelöscht"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "{0} löschen?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} bearbeiten"
@@ -1215,52 +1391,68 @@ msgstr ""
"du besser sehen was diese Seite machen kann. Du kannst diese Einträge "
"natürlich bearbeiten oder löschen!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Konto „{0}“ wurde erfolgreich gelöscht"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Du hast dich erfolgreich registriert"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Einstellungen erfolgreich aktualisiert"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Wähle bitte eine der folgenden Optionen."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Der Benutzer wurde erfolgreich deaktiviert"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Der Benutzer wurde erfolgreich aktiviert"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Benutzer bearbeiten"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Löschen bestätigen"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Benutzername"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Studio"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Auf latein, z.B. „Pectoralis major“"
@@ -1290,44 +1482,158 @@ msgstr "Die Datei ist kein gültiges Video"
msgid "Equipment list"
msgstr "Geräteliste"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Übungsadministrationsverlauf"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Aktionen"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Satz bearbeiten"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Benutzer"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Satz bearbeiten"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Satz bearbeiten"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Löschen"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Übersetzung"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Löschen bestätigen"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Änderungen rückgängig machen"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Objekt"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Änderungen"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Änderungen rückgängig machen"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Rückgängig machen"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Objekt anzeigen"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Änderungen anzeigen"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Änderungen rückgängig machen"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Hier klicken für mehr Informationen"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Vorname"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "zurück"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Nachname"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1349,6 +1655,33 @@ msgstr "Neues Gerät hinzufügen"
msgid "Delete equipment?"
msgstr "Gerät löschen?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Benutzer"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Typ"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Aktionen"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Muskel hinzufügen"
@@ -1449,15 +1782,15 @@ msgstr "Startdatum"
msgid "End date"
msgstr "Enddatum"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "PLZ"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Stadt"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Straße"
@@ -1553,7 +1886,7 @@ msgstr "Studioliste"
msgid "Global gym configuration"
msgstr "Globale Studiokonfiguration"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Studio hinzufügen"
@@ -1632,11 +1965,11 @@ msgstr ""
"Das Kennwort des Benutzers wurde zurückgesetzt. Benachrichtige bitte den "
"Benutzer über sein neues Kennwort."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Notiz hinzufügen"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Vertrag hinzufügen"
@@ -1653,15 +1986,15 @@ msgstr "{0} löschen"
msgid "Add contract type"
msgstr "Vertragstyp hinzufügen"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Geschlecht"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Benutzer zu Studio hinzufügen"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Studio bearbeiten"
@@ -2086,26 +2419,26 @@ msgstr "Übung"
msgid "Routine will expire soon"
msgstr "Routine wird bald auslaufen"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Schlecht"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutral"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Gut"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Wenn du eine Zeit eingibst, musst du End- und Endzeit angeben."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Die Startzeit kann nicht vor der Endzeit liegen."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2171,53 +2504,53 @@ msgstr "Trainingsplan"
msgid "Workout for %s"
msgstr "Trainingsplan für %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Einheit"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Basis-Kalorienzufuhr"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Deine Basis-Kalorienzufuhr wird aus deinen Angaben berechnet"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Zusätzliche Kalorien"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr "Zusat"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Zutat"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Auch Zutaten auf Englisch suchen"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2273,83 +2606,107 @@ msgstr ""
"wirst du auch benachrichtigt."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Variationen"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Keine Zutaten."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Zutatenkategorien"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Vorname"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "zurück"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "nächste"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Suchen"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Makronährstoffe"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Davon Zucker"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "k.A."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Davon gesättigte Fettsäuren"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Andere"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Faser"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Hier klicken für mehr Informationen"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Ernährung"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Gewichtseinheit hinzufügen"
@@ -2440,36 +2797,36 @@ 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:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Zutat hinzufügen"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Ernährungsplan"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Ernährungsplan für %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Ernährungswerte"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Gesamt"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Prozent der Energie"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g pro Körper-kg"
@@ -2882,35 +3239,35 @@ msgstr "Quelltext"
msgid "Translation"
msgstr "Übersetzung"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Löschen bestätigen"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Der Originaltitel dieses Objekts, falls verfügbar"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Link zum Originalobjekt, falls vorhanden"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Autor(en)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Wenn du nicht der Urheber bist, gebe den Namen hier ein."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Link zum Profil des Authors, falls vorhanden"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Link zur Originalquelle, wenn es sich um ein abgeleitetes Werk handelt"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3061,6 +3418,66 @@ msgstr ""
msgid "Re-Submit"
msgstr "Wieder abschicken"
+#~ 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."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Trainingsplanerinnerungen"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Übungskommentare ein/ausblenden"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Auswählen, um Übungskommentare auf der Trainingsplanseite anzuzeigen"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Auch Zutaten auf Englisch anzeigen"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Auswählen, um auch Zutaten auf Englisch anzuzeigen beim Erstellen \n"
+#~ "eines Ernährungsplanes. Diese Zutaten stammen aus einer Liste \n"
+#~ "des US-amerikanischen Landwirtschaftsministeriums. Diese hat etwa 7000 "
+#~ "Einträge und ist extrem vollständig, \n"
+#~ "kann aber die Suche etwas unübersichtlich machen."
+
+#~ msgid "Allow external access"
+#~ msgstr "Externen Zugriff zulassen"
+
+#~ 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 ""
+#~ "Erlaubt externen Zugriff auf deine Trainingseinheiten und Gewichtslogs im "
+#~ "Lese-Modus. Du musst das aktivieren, bevor du Links z.B. über soziale "
+#~ "Medien freigeben kannst."
+
+#~ msgid "Your API key"
+#~ msgstr "Dein API-Schlüssel"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "Du musst deine E-Mail-Adresse bestätigen, um Übungen beizutragen"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Du hast dich erfolgreich registriert"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "Eine Bestätigungs-E-Mail wurde an %(email)s gesendet"
+
+#~ msgid "View Object"
+#~ msgstr "Objekt anzeigen"
+
#~ msgid "Email verification"
#~ msgstr "E-Mail-Verifizierung"
@@ -3238,9 +3655,6 @@ msgstr "Wieder abschicken"
#~ msgid "Brand name of product"
#~ msgstr "Markenname des Produkts"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Zutatenkategorien"
-
#~ msgid "Amount in grams"
#~ msgstr "Menge in Gramm"
@@ -3463,9 +3877,6 @@ msgstr "Wieder abschicken"
#~ "Du kannst mehr als eine Übung auswählen/suchen, sie werden dann z.B. für "
#~ "einen Supersatz gruppiert."
-#~ msgid "Type"
-#~ msgstr "Typ"
-
#~ msgid "Table"
#~ msgstr "Tabelle"
@@ -3568,9 +3979,6 @@ msgstr "Wieder abschicken"
#~ msgid "Log overview"
#~ msgstr "Eintragübersicht"
-#~ msgid "Workout session"
-#~ msgstr "Trainingseinheit"
-
#~ msgid "Delete with logs"
#~ msgstr "Mit Logeinträge löschen"
@@ -3734,9 +4142,6 @@ msgstr "Wieder abschicken"
#~ "kannst du einfach einen einzigen Wert angeben: z.B. für 4 Sätze\n"
#~ "und 10 Wiederholungen gebe nur „10“ ein, das wird automatisch zu „4 × 10“."
-#~ msgid "Edit set"
-#~ msgstr "Satz bearbeiten"
-
#~ msgid "Update"
#~ msgstr "Aktualisieren"
@@ -3785,9 +4190,6 @@ msgstr "Wieder abschicken"
#~ msgid "Delete workout log"
#~ msgstr "Logeintrag löschen"
-#~ msgid "Create schedule"
-#~ msgstr "Zeitplan erstellen"
-
#~ msgid "Edit workout"
#~ msgstr "Trainingsplan bearbeiten"
@@ -3985,9 +4387,6 @@ msgstr "Wieder abschicken"
#~ "Diese von einem Benutzer eingereichte Zutat ist noch nicht freigegeben.\n"
#~ "Bis dann, wird sie weder in der Übersicht, noch in der Suche erscheinen."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Wähle bitte eine der folgenden Optionen."
-
#~ msgid "Accept"
#~ msgstr "Freigeben"
diff --git a/wger/locale/el/LC_MESSAGES/django.po b/wger/locale/el/LC_MESSAGES/django.po
index ce396d2d6..a32597da5 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -34,10 +34,10 @@ msgstr ""
"νέα εγγεγραμμένα μέλη και θα ενημερώσει τα υπάρχοντα μέλη που δεν έχουν "
"γυμναστήριο."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -49,89 +49,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Επεξεργασία"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Η φόρμα είναι ασφαλισμένη με reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Εγγραφή"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Όνομα"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Επίθετο"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Email"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr ""
-"Χρησιμοποιείται για επαναφορά κωδικού πρόσβασης και, προαιρετικά, "
-"υπενθυμίσεις ηλεκτρονικού ταχυδρομείου."
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Ημερομηνία Γέννησης"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Προσωπικά δεδομένα"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Υπενθύμιση προπόνησης"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Άλλες ρυθμίσεις"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Αποθήκευση"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Email"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Χρησιμοποιείται για επαναφορά κωδικού πρόσβασης και, προαιρετικά, "
"υπενθυμίσεις ηλεκτρονικού ταχυδρομείου."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Αυτή η διεύθυνση email χρησιμοποιείται ήδη."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Κωδικός"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Παρακαλώ πληκτρολογήστε τον τρέχων κωδικό σας."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -139,27 +133,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Διαγραφή"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Λάθος κωδικός"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "Η φόρμα είναι ασφαλισμένη με reCAPTCHA"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Μη επαληθευμένο ηλεκτρονικό ταχυδρομείο"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Υποβολή"
@@ -235,38 +234,10 @@ msgid "Imperial (pound)"
msgstr "Αγγλικό (λίβρες)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Εμφάνιση σχολίων άσκησης"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Επιλέξτε για την εμφάνιση σχολίων άσκησης στην εμφάνιση της προπόνησης"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Εμφάνιση των συστατικών και στα Αγγλικά"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Επιλέξτε για να εμφανίζονται και τα συστατικά στα Αγγλικά κατά τη "
-"δημιουργία\n"
-"ένος διατροφικού προγράμματος. Αυτά τα συστατικά εξάγονται απο μιά λίστα που "
-"παρέχεται\n"
-"απο το Αμερικάνικο Υπουργείο Αγροτικής Ανάπτυξης. Είναι εξαιρετικά "
-"ολοκληρωμένο, με γύρω\n"
-"στις 7000 συμμετοχές, όμως μπορεί να είναι κάπως δυσβάσταχτο και να κάνει "
-"την αναζήτηση δύσκολη."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Ενεργοποίηση υπενθύμισης προπόνησης"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -274,19 +245,19 @@ msgstr ""
"Επιλογή ενεργοποίησης αυτόματων υπενθυμίσεων για την προπόνηση. Θα πρέπει να "
"παρέχετε ένα email για να λειτουργήσει."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Υπενθύμιση πριν την λήξη"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Ημέρες που θέλετε να σας υπενθυμίσουμε πριν λήξει μια προπόνηση."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Προκαθορισμένη διάρκεια προπόνησης"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -294,11 +265,11 @@ msgstr ""
"Η προκαθορισμένη διάρκεια των προπονήσεων σε εβδομάδες που δεν είναι σε "
"πρόγραμμα. Χρησιμοποιείται στην αποστολή email υπενθυμίσεων προπόνησης."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Γλώσσα ειδοποιήσεων"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -306,97 +277,84 @@ msgstr ""
"Η γλώσσα που θα χρησιμοποιηθεί για την αποστολή email ειδοποιήσεων, π.χ. "
"email υπενθυμίσεων για προπονήσεις. Δεν επηρεάζει την γλώσσα της εφαρμογής."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Ηλικία"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Ύψος (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Ώρες ύπνου"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Οι μέσες ώρες ύπνου ανα μέρα"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Εργασία"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Μέσες ώρες ανα μέρα"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Φυσική ένταση"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Περίπου"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Άθληση"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Μέσες ώρες ανα εβδομάδα"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Ελεύθερη ώρα"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Συνολικές ημερήσιες θερμίδες"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
"Συνολική εισαγωγή θερμίδων, συμπεριλαμβάνοντας π.χ. οποιαδήποτε υπερβολή"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Μονάδα βάρους"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Να επιτρέπεται η εξωτερική πρόσβαση"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Επιτρέψτε σε εξωτερικούς χρήστες να έχουν πρόσβαση στις προπονήσεις και τα "
-"αρχεία καταγραφής σας σε λειτουργία μόνο για ανάγνωση. Πρέπει να το "
-"ρυθμίσετε πριν μοιραστείτε συνδέσμους π.χ. στα μέσα κοινωνικής δικτύωσης."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Αυτόματες υπενθυμίσεις για καταχωρήσεις βάρους"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Αριθμός ημερών μετά την τελευταία καταχώριση βάρους (πληκτρολογήστε 0 για "
"απενεργοποίηση)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Το σύνολο όλων των ωρών θα πρέπει να είναι 24"
@@ -404,8 +362,7 @@ msgstr "Το σύνολο όλων των ωρών θα πρέπει να είν
msgid "Repetitions"
msgstr "Επαναλήψεις"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Ώρα"
@@ -414,12 +371,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Όνομα"
@@ -510,6 +467,86 @@ msgstr ""
msgid "the wger Team"
msgstr "η Ομάδα wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Μηνύματα ηλεκτρονικού ταχυδρομείου"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Τρέχουσα έκδοση"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Στείλτε μήνυμα ηλεκτρονικού ταχυδρομείου επαλήθευσης"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Προβολή αλλαγών"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Αλλαγές"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Μη επαληθευμένο ηλεκτρονικό ταχυδρομείο"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Σύνδεση"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Ξεχάσατε τον κωδικό σας;"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Δεν έχετε λογαριασμό;"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -526,7 +563,7 @@ msgstr ""
"στα δεδομένα τους.\n"
" "
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Πίσω στο \"%(target)s\""
@@ -555,7 +592,7 @@ 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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Γλώσσες"
@@ -564,15 +601,15 @@ msgid "Nothing found."
msgstr "Δεν βρέθηκε τίποτα."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "Προσθήκη τώρα."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -586,14 +623,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Επιλογές"
@@ -603,9 +639,9 @@ msgstr "Λίστα αδειών"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -620,7 +656,7 @@ msgstr "Λίστα αδειών"
msgid "Nothing found"
msgstr "Δεν βρέθηκε τίποτα"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Εκτύπωση"
@@ -632,7 +668,7 @@ msgstr "Εξάσκηση"
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Ημερολόγιο"
@@ -646,7 +682,7 @@ msgstr "Θρεπτικά στοιχεία"
msgid "Gallery"
msgstr "Γκαλερί"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -668,7 +704,7 @@ msgstr "Δημόσια υποδείγματα"
msgid "Exercises"
msgstr "Ασκήσεις"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Διαχείριση"
@@ -693,7 +729,7 @@ msgstr "Κατηγορίες"
msgid "Nutrition"
msgstr "Διατροφή"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Προγράμματα διατροφής"
@@ -714,7 +750,7 @@ msgstr "Επισκόπηση συστατικών"
msgid "Body weight"
msgstr "Σωματικό βάρος"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Επισκόπηση βάρους"
@@ -730,7 +766,7 @@ msgstr ""
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Άδεια"
@@ -742,42 +778,42 @@ msgstr "Τεκμηρίωση προγραμματιστή"
msgid "Get the code"
msgstr "Κατεβάστε τον κώδικα"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Μετάφραση"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Επαναφορά κωδικού"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Έξοδος"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Οι προτιμήσεις μου"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Άδειες"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Μονάδες επανάληψης"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Μονάδες βάρους"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Λίστα χρήστη"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Γυμναστήρια"
@@ -834,36 +870,28 @@ msgstr "Ευχαριστούμε που χρησιμοποιήσατε τις υ
msgid "The %(site_name)s team"
msgstr "Η ομάδα %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "προηγούμενο"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "επόμενο"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Κλείσιμο"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Χρησιμοποιείτε έναν λογαριασμό επισκέπτη. Τα δεδομένα που εισάγετε θα "
"διαγραφούν σε μία εβδομάδα."
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Δημιουργήστε μερικές δοκιμαστικές εγγραφές"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Όροι χρήσης"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -871,37 +899,168 @@ msgstr ""
msgid "Features"
msgstr "Δυνατότητες"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Κλειδί API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Το API κλειδί σας"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Δεν έχετε κανένα API κλειδί ακόμα"
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Δημιουργία νέου API κλειδιού"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Δημιουργία προγράμματος"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Συνεδρία προπόνησης"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Κλειδί API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Διαγραφή τρέχοντος API κλειδιού και δημιουργία ενός νέου"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Δημιουργία νέου API κλειδιού"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Δημιουργία νέου API κλειδιού"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Δεν έχετε κανένα API κλειδί ακόμα"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Βιβλιογραφία"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Βιβλιογραφία"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Διαγραφή λογαριασμού"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Σίγουρα;"
@@ -918,102 +1077,94 @@ msgstr ""
"(προπονήσεις, ιστορικά, κλπ)\n"
"Αυτή η ενέργεια δεν αναιρείται. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Δεν έχετε λογαριασμό;"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Ξεχάσατε τον κωδικό σας;"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "τελευταίο %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Περιγραφή"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Αριθμός ιστορικών (ημέρες)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Τελευταία δραστηριότητα"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Δεν βρέθηκαν προπονήσεις."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Ιστορικό"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Γενική εικόνα"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Σημειώσεις"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Ενέργεια"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Προτεϊνες"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Υδατάνθρακες"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Λιπαρή ύλη"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1022,193 +1173,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "Ενέργειες"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Απενεργοποίηση χρήστη"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Ενεργοποίηση χρήστη"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Επαναφορά κωδικού πρόσβασης χρήστη"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Ρόλοι"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Επιβεβαίωση αλλαγής κωδικού"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr "Θέλετε πραγματικά να αλλάξετε τον κωδικό πρόσβασης αυτού του χρήστη;"
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Οχι"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Ναι"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Λεπτομέρειες"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Νο."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Τηλέφωνο"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Διεύθυνση"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Εγγεγραμμένοι"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Τελευταία είσοδος"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Κατάσταση"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Ενεργό"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Ανενεργό"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Συμβόλαια"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Έγγραφα"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Μεταφόρτωση"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Να συμπεριλαμβάνεται στην μη ενεργή επισκόπηση"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Είσοδος ως αυτόν τον χρήστη"
+
+#: core/templates/user/overview.html:539
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Η σύνδεση διαχειριστή είναι διαθέσιμη μόνο για χρήστες σε%(gym_name)s"
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
-msgstr "Είσοδος ως αυτόν τον χρήστη"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Προτιμήσεις"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Επαληθευμένο ηλεκτρονικό ταχυδρομείο"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Μη επαληθευμένο ηλεκτρονικό ταχυδρομείο"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Στείλτε μήνυμα ηλεκτρονικού ταχυδρομείου επαλήθευσης"
-
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
-msgstr "Πρέπει να επαληθεύσετε το email σας για να συνεισφέρετε σε ασκήσεις"
-
-#: core/templates/user/preferences.html:55 core/views/user.py:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Αλλάξτε κωδικό"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Επαναφορά κωδικού"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Διαγραφή λογαριασμού"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "γρ"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Επιτυχής διαγραφή"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Διαγραφή {0};"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Επεξεργασία {0}"
@@ -1224,52 +1397,68 @@ msgstr ""
"δείτε τι\tμπορεί να κάνει αυτός ο ιστότοπος. Νιώστε ελεύθερος να τις "
"επεξεργαστείτε ή να τις διαγράψετε!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Ο λογαριασμός \"{0}\" διαγράφηκε με επιτυχία"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Εγγραφήκατε με επιτυχία"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Οι ρυθμίσεις ανανεώθηκαν με επιτυχία"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Παρακαλούμε επιλέξτε μια επιλογή απο τις παρακάτω."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Ο χρήστης απενεργοποιήθηκε με επιτυχία"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Ο χρήστης ενεργοποιήθηκε με επιτυχία"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Επεξεργασία χρήστη"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Ναί, διαγραφή"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Όνομα χρήστη"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Γυμναστήριο"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr "Ένα μήνυμα ηλεκτρονικού ταχυδρομείου επαλήθευσης εστάλη στον%(email)s"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Στα λατινικά, π.χ. \"Pectoralis major\""
@@ -1299,44 +1488,158 @@ msgstr "Το αρχείο δεν είναι έγκυρο βίντεο"
msgid "Equipment list"
msgstr "Λίστα οργάνων"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Άσκηση ιστορικό διαχειριστή"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Δράση"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Επεξεργασία σετ"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Χρήστης"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Επεξεργασία σετ"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Επεξεργασία σετ"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Διαγραφή"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Μετάφραση"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Ναί, διαγραφή"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Αναίρεση αλλαγών"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Αντικείμενο"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Αλλαγές"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Αναίρεση αλλαγών"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Αναστρέψτε το"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Προβολή αντικειμένου"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Προβολή αλλαγών"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Αναίρεση αλλαγών"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Κάντε κλίκ εδώ για περισσότερες πληροφορίες"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Όνομα"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "προηγούμενο"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Επίθετο"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1359,6 +1662,33 @@ msgstr "Νέο όργανο"
msgid "Delete equipment?"
msgstr "Διαγραφή εξοπλισμού;"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Χρήστης"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Είδος"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Δράση"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Νέος μύς"
@@ -1460,15 +1790,15 @@ msgstr "Ημερομηνία έναρξης"
msgid "End date"
msgstr "Ημερομηνία λήξης"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Ταχ. Κωδικός"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Πόλη"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Οδός"
@@ -1563,7 +1893,7 @@ msgstr "Λίστα γυμναστηρίων"
msgid "Global gym configuration"
msgstr "Καθολική παραμετροποίηση γυμναστηρίου"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Νέο γυμναστήριο"
@@ -1643,11 +1973,11 @@ msgstr ""
"Ο κωδικός πρόσβασης αυτού του χρήστη έχει επαναφερθεί. Παρακαλώ να "
"ενημερώσετε τον χρήστη για τον νέο του κωδικό πρόσβασης."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Νέα σημείωση"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Προσθήκη συμβολαίου"
@@ -1664,15 +1994,15 @@ msgstr "Διαγραφή {0}"
msgid "Add contract type"
msgstr "Προσθέστε τύπο συμβολαίου"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Φύλο"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Προσθήκη χρήστη στο γυμναστήριο"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Επεξεργασία γυμναστηρίου"
@@ -2101,28 +2431,28 @@ msgstr "Άσκηση"
msgid "Routine will expire soon"
msgstr "Η προπόνηση θα λήξει σε λίγο"
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr "Η ώρα έναρξης δεν μπορεί να είναι μετά την ώρα λήξης."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Κακό"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Ουδέτερο"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Καλό"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
"Αν πληκτρολογήσετε την ώρα, θα πρέπει να πληκτρολογήσετε ώρα έναρξης και "
"λήξης."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Η ώρα έναρξης δεν μπορεί να είναι μετά την ώρα λήξης."
+
#: manager/templates/routines/email_reminder.tpl:3
#, fuzzy, python-format
#| msgid "Your current workout '%(workout)s' expired %(days)s days ago."
@@ -2192,27 +2522,27 @@ msgstr "Προπόνηση"
msgid "Workout for %s"
msgstr "Προπόνηση για %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Μονάδα"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Βασική εισαγωγή θερμίδων"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Η βασική σας εισαγωγή θερμίδων όπως υπολογίστηκε απο τα δεδομένα σας"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Επιπλέον θερμίδες"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2220,27 +2550,27 @@ msgstr ""
"Επιπλέον θερμίδες θα προστεθούν στην βασική τάση (για αφαίρεση, εισάγετε "
"αρνητικό αριθμό)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Συστατικά"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Αναζητήστε επίσης ονόματα στα αγγλικά"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2298,81 +2628,105 @@ msgstr ""
"επιτυχία."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Διαφοροποιήσεις"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Δεν υπάρχουν συστατικά."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Κατηγορίες συστατικών"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Όνομα"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "προηγούμενο"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "επόμενο"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Εύρεση"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Θρεπτικά στοιχεία"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Περιεχόμενο σάκχαρων σε υδατάνθρακες"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "Μη διαθέσιμο"
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Εκ των οποίων κορεσμένα λίπη"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Άλλα"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Νάτριο"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Κάντε κλίκ εδώ για περισσότερες πληροφορίες"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Διατροφή"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Προσθήκη νέας μονάδας βάρους"
@@ -2467,37 +2821,37 @@ msgstr ""
"τον εαυτό σας τις προσεχείς εβδομάδες και αλλάξτε την συνολική ποσότητα αν "
"απαιτείται."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Προσθήκη νέου συστατικού"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Διατροφικό σχέδιο"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Διατροφικό σχέδιο για %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
"<i>Αυτό είναι ένα άδειο πρόγραμμα, τί περιμένατε να δείτε σε αυτό το PDF;</i>"
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Διατροφικά δεδομένα"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Σύνολο"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Ποσοστό ενέργειας"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g ανα kg σώματος"
@@ -2912,35 +3266,35 @@ msgstr "Πηγαίος Κώδικας"
msgid "Translation"
msgstr "Μετάφραση"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Ναί, διαγραφή"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Ο αρχικός τίτλος αυτού του αντικειμένου, εάν είναι διαθέσιμος"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Σύνδεσμος προς το αρχικό αντικείμενο, εάν υπάρχει"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Συγγραφέας(εις)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Εάν δεν είστε ο συγγραφέας, εισαγάγετε το όνομα ή την πηγή εδώ."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Σύνδεσμος στο προφίλ του συγγραφέα, εάν υπάρχει"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Σύνδεσμος στην αρχική πηγή, εάν πρόκειται για παράγωγο έργο"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3090,6 +3444,70 @@ msgstr ""
msgid "Re-Submit"
msgstr "Επανυποβολή"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Χρησιμοποιείται για επαναφορά κωδικού πρόσβασης και, προαιρετικά, "
+#~ "υπενθυμίσεις ηλεκτρονικού ταχυδρομείου."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Υπενθύμιση προπόνησης"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Εμφάνιση σχολίων άσκησης"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Επιλέξτε για την εμφάνιση σχολίων άσκησης στην εμφάνιση της προπόνησης"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Εμφάνιση των συστατικών και στα Αγγλικά"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Επιλέξτε για να εμφανίζονται και τα συστατικά στα Αγγλικά κατά τη "
+#~ "δημιουργία\n"
+#~ "ένος διατροφικού προγράμματος. Αυτά τα συστατικά εξάγονται απο μιά λίστα "
+#~ "που παρέχεται\n"
+#~ "απο το Αμερικάνικο Υπουργείο Αγροτικής Ανάπτυξης. Είναι εξαιρετικά "
+#~ "ολοκληρωμένο, με γύρω\n"
+#~ "στις 7000 συμμετοχές, όμως μπορεί να είναι κάπως δυσβάσταχτο και να κάνει "
+#~ "την αναζήτηση δύσκολη."
+
+#~ msgid "Allow external access"
+#~ msgstr "Να επιτρέπεται η εξωτερική πρόσβαση"
+
+#~ 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 ""
+#~ "Επιτρέψτε σε εξωτερικούς χρήστες να έχουν πρόσβαση στις προπονήσεις και "
+#~ "τα αρχεία καταγραφής σας σε λειτουργία μόνο για ανάγνωση. Πρέπει να το "
+#~ "ρυθμίσετε πριν μοιραστείτε συνδέσμους π.χ. στα μέσα κοινωνικής δικτύωσης."
+
+#~ msgid "Your API key"
+#~ msgstr "Το API κλειδί σας"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "Πρέπει να επαληθεύσετε το email σας για να συνεισφέρετε σε ασκήσεις"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Εγγραφήκατε με επιτυχία"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr ""
+#~ "Ένα μήνυμα ηλεκτρονικού ταχυδρομείου επαλήθευσης εστάλη στον%(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Προβολή αντικειμένου"
+
#, fuzzy
#~| msgid "Email verified"
#~ msgid "Email verification"
@@ -3268,9 +3686,6 @@ msgstr "Επανυποβολή"
#~ msgid "Brand name of product"
#~ msgstr "Επωνυμία του προϊόντος"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Κατηγορίες συστατικών"
-
#~ msgid "Amount in grams"
#~ msgstr "Ποσότητα σε γραμμάρια"
@@ -3474,9 +3889,6 @@ msgstr "Επανυποβολή"
#~ "Μπορείτε να ψάξετε για περισσότερες από μία ασκήσεις, θα ομαδοποιηθούν σε "
#~ "μια ομάδα."
-#~ msgid "Type"
-#~ msgstr "Είδος"
-
#~ msgid "Table"
#~ msgstr "Πίνακας"
@@ -3578,9 +3990,6 @@ msgstr "Επανυποβολή"
#~ msgid "Log overview"
#~ msgstr "Επισκόπηση ιστορικού"
-#~ msgid "Workout session"
-#~ msgstr "Συνεδρία προπόνησης"
-
#~ msgid "Delete with logs"
#~ msgstr "Διαγραφή με αρχεία καταγραφής"
@@ -3745,9 +4154,6 @@ msgstr "Επανυποβολή"
#~ "πληκτρολογήστε \"10\" στις επαναλήψεις, αυτό\n"
#~ "αυτόματα γίνεται \"4 x 10\"."
-#~ msgid "Edit set"
-#~ msgstr "Επεξεργασία σετ"
-
#~ msgid "Update"
#~ msgstr "Ενημέρωση"
@@ -3796,9 +4202,6 @@ msgstr "Επανυποβολή"
#~ msgid "Delete workout log"
#~ msgstr "Διαγραφή ιστορικού προπόνησης"
-#~ msgid "Create schedule"
-#~ msgstr "Δημιουργία προγράμματος"
-
#~ msgid "Edit workout"
#~ msgstr "Επεξεργασία προπόνησης"
@@ -3999,9 +4402,6 @@ msgstr "Επανυποβολή"
#~ "στην βάση δεδομένων. Έως τότε, δεν θα εμφανίζεται στην επισκόπηση ή\n"
#~ "στην αναζήτηση."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Παρακαλούμε επιλέξτε μια επιλογή απο τις παρακάτω."
-
#~ msgid "Accept"
#~ msgstr "Αποδοχή"
diff --git a/wger/locale/es/LC_MESSAGES/django.po b/wger/locale/es/LC_MESSAGES/django.po
index bbbdafb28..1d798f5a1 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -39,10 +39,10 @@ msgstr ""
"todos los nuevos usuarios registrados a este gimnasio y actualizará todos "
"los usuarios existentes sin gimnasio."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -54,89 +54,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Editar"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "El Formulario está asegurado por recaptcha"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Registrarse"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Nombre"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Apellido"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Fecha de cumpleaños"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Datos personales"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Recordatorios de entrenamiento"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Otras configuraciones"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Guardar"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Esta dirección de correo ya está en uso."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Contraseña"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Por favor, ingrese su contraseña actual."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -144,27 +138,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Borrar"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Contraseña incorrecta"
-#: 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:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Correo electrónico no verificado"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Enviar"
@@ -238,37 +237,10 @@ msgid "Imperial (pound)"
msgstr "Imperial (libra)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Muestra los comentarios de los ejercicios"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Activa para mostrar los comentarios para los ejercicios"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Usa también los ingredientes en inglés"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Activa para mostrar también ingredientes en inglés en durante la creación "
-"de\n"
-"planes nutricionales. Estos ingredientes han sido extraídos de una lista "
-"provista\n"
-"por el Departamento de Agricultura de los EE. UU. Es extremadamente "
-"completa,\n"
-"con aproximadamente 7000 elementos, pero puede hacer la búsqueda más difícil."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Activa recordatorios automáticos para rutinas"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -277,21 +249,21 @@ msgstr ""
"proporcionar una dirección de correo electrónico válida para que estos "
"funcionen."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Recordar antes de expiración"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"El número de días que quieres que se te recuerde antes de que un "
"entrenamiento expire."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Duración por defecto de rutinas"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -299,11 +271,11 @@ msgstr ""
"Duración por defecto en semanas para las rutinas que no pertenezcan a una "
"programación. Usado para los recordatorios de rutinas expiradas."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Idioma de notificación"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -312,96 +284,83 @@ msgstr ""
"ejemplo, recordatorios para los entrenamientos. Esto no afecta al idioma "
"utilizado en la web."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Edad"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Altura (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Horas de sueño"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Media de horas por día"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Trabajo"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Horas por día, promedio"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Intensidad física"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Aproximado"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Deporte"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Media de horas por día"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Tiempo libre"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Calorías totales diarias"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Ingesta total de calorías, incluyendo cualquier suplemento"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Unidad de peso"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Permitir acceso externo"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Permite a los usuarios externos acceder a tus entrenamientos y otros datos "
-"en modo de sólo lectura. Es necesario configurar esto antes de que poder "
-"compartir enlaces por ejemplo, en los medios de comunicación social."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Avisos automáticos para las entradas de peso"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Días que han pasado desde el ingreso del último peso (ingrese 0 para "
"desactivar)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "Activar trofeos"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr "Activar o desactivar sistema de trofeos para este usuario"
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "La suma de todas las horas tiene que ser 24"
@@ -409,8 +368,7 @@ msgstr "La suma de todas las horas tiene que ser 24"
msgid "Repetitions"
msgstr "Repeticiones"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Tiempo"
@@ -421,12 +379,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Nombre"
@@ -522,6 +480,86 @@ msgstr ""
msgid "the wger Team"
msgstr "El Equipo Wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Emails"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Versión actual"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Envía un correo electronico de verificación"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Ver cambios"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Cambios"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Correo electrónico no verificado"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Ingresar"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "¿Olvidaste tu contraseña?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "¿No tienes cuenta?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr "¿Tienes ya una cuenta?"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -531,7 +569,7 @@ msgstr ""
"Estás navegando por la página como el usuario \"%(current_user)s\", todas "
"las acciones se realizan sobre tus datos."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Volver a \"%(target)s\""
@@ -554,7 +592,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Idiomas"
@@ -563,15 +601,15 @@ msgid "Nothing found."
msgstr "No se ha encontrado nada."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -585,14 +623,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Opciones"
@@ -602,9 +639,9 @@ msgstr "Listado de licencias"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -619,7 +656,7 @@ msgstr "Listado de licencias"
msgid "Nothing found"
msgstr "No se ha encontrado nada"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Imprimir"
@@ -631,7 +668,7 @@ msgstr "Entrenamiento"
msgid "Routines"
msgstr "Rutinas"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Calendario"
@@ -643,7 +680,7 @@ msgstr "Mediciones"
msgid "Gallery"
msgstr "Galería"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr "Trofeos"
@@ -665,7 +702,7 @@ msgstr "Plantillas públicas"
msgid "Exercises"
msgstr "Ejercicios"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administración"
@@ -690,7 +727,7 @@ msgstr "Categorias"
msgid "Nutrition"
msgstr "Nutrición"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Planes nutritionales"
@@ -711,7 +748,7 @@ msgstr "Índice de ingredientes"
msgid "Body weight"
msgstr "Peso corporal"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Índice de peso"
@@ -727,7 +764,7 @@ msgstr "Apoyo y Participación"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licencia"
@@ -739,42 +776,42 @@ msgstr "Documentación para desarrolladores"
msgid "Get the code"
msgstr "Código fuente"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduce"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Restablecer la contraseña"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Cerrar sesión"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Mis preferencias"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licencias"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetición"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Unidades de peso"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de usuarios"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Gimnasios"
@@ -831,36 +868,28 @@ msgstr "¡Gracias por usar nuestra página!"
msgid "The %(site_name)s team"
msgstr "El equipo de %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "anterior"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "próximo"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Cerrar"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Crear datos de ejemplo"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Términos de servicio"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -868,37 +897,168 @@ msgstr ""
msgid "Features"
msgstr "Funciones"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "LLave de API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Tu llave de API"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Aun no tienes una llave de API"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Generar una nueva llave de API"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Crear programa"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Session de entrenamiento"
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "LLave de API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Eliminar la llave de API actual y generar una nueva"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Generar una nueva llave de API"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Generar una nueva llave de API"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Aun no tienes una llave de API"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Documentación"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentación"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Eliminar cuenta"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "¿Estas seguro?"
@@ -915,102 +1075,94 @@ msgstr ""
"(entrenamientos, registros, etc.). \n"
"y no podrán ser recuperados. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "¿No tienes cuenta?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "¿Olvidaste tu contraseña?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "últimos %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Descripción"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Número de registros (días)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Última actividad"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "No se han encontrado rutinas."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Registro"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Impresión general"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Notas"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energía"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Proteínas"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Hidratos de carbono"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Grasa"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1019,196 +1171,217 @@ msgstr "kcal"
msgid "Actions"
msgstr "Acciones"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Desactivar usuario"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Activar usuario"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Restablecer la contraseña del usuario"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roles"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Confirmación de restablecimiento de contraseña"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "No"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Sí"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalles"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Teléfono"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Dirección"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registrado"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Último inicio de sesión"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Estado"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Activo"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inactivo"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contratos"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documentos"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Bajar"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Incluir en lista de inactivos"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Inicia sesión como este usuario"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Inicia sesión como este usuario"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Preferencias"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Correo electrónico verificado"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Correo electrónico no verificado"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Envía un correo electronico de verificación"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Cambiar contraseña"
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Restablecer la contraseña"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-"Necesitas verificar tu correo electrónico para contribuir con ejercicios"
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
-msgstr "Cambiar contraseña"
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
-msgstr "¿Tienes ya una cuenta?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Eliminar cuenta"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Borrado con éxito"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "¿Borrar {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Editar {0}"
@@ -1223,52 +1396,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "La cuenta \"{0}\" ha sido borrada con éxito"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Te has registrado con éxito"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Preferecias actualizadas con éxito"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Por favor, selecciona una de las opciones de abajo."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "El usuario ha sido desactivado con éxito"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "El usuario ha sido activado con éxito"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Editar usuario"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Sí, eliminar"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Nombre de usuario"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Gimnasio"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En latín, p.ej. \"Pectoralis major\""
@@ -1298,44 +1487,160 @@ msgstr "El archivo no es un video válido"
msgid "Equipment list"
msgstr "Lista de equipos"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Historial de administración de ejercicios"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Acción"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Editar serie"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Usuario"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Editar serie"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Editar serie"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+#, fuzzy
+#| msgid "Dedicated"
+msgid "created"
+msgstr "Dedicado"
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Borrar"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Traducción"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Sí, eliminar"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Revertir cambios"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Objeto"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Cambios"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Revertir cambios"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Revertir"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Ver Objeto"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Ver cambios"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Revertir cambios"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Clic aqui para mas informacion"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Nombre"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "anterior"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Apellido"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1357,6 +1662,33 @@ msgstr "Agregar nuevo equipo"
msgid "Delete equipment?"
msgstr "¿Borrar equipo?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Usuario"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Tipo"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Acción"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Añadir músculo"
@@ -1456,15 +1788,15 @@ msgstr "Fecha de comienzo"
msgid "End date"
msgstr "Fecha final"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Código postal"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Ciudad"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Calle"
@@ -1560,7 +1892,7 @@ msgstr "Lista de gimnasios"
msgid "Global gym configuration"
msgstr "Configuración global de gimnasio"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Añadir nuevo gimnasio"
@@ -1640,11 +1972,11 @@ msgstr ""
"La contraseña de este usuario ha sido cambiada. Por favor notificar al "
"usuario de su nueva contraseña."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Añadir nota"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Añadir contrato"
@@ -1661,15 +1993,15 @@ msgstr "Borrar {0}"
msgid "Add contract type"
msgstr "Añadir tipo de contrato"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Género"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Añadir usuario al gimnasio"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Editar gimnasio"
@@ -2071,28 +2403,28 @@ msgstr "Ejercicio"
msgid "Routine will expire soon"
msgstr "Rutina expirará pronto"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Malo"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutral"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Bueno"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
"Si introduces una hora, debes introducir tanto la de inicio como la de "
"finalización."
+#: manager/models/session.py:152
+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."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2155,27 +2487,27 @@ msgstr "Rutina"
msgid "Workout for %s"
msgstr "Rutina para %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Unidad"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Ingesta básica de calorías"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
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:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Calorias adicionales"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2183,27 +2515,27 @@ msgstr ""
"Calorías adicionales para agregar a la tasa básica (para restar, introduce "
"un número negativo)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ingrediente"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Busque también los nombres en inglés"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2256,83 +2588,107 @@ msgstr ""
"recibirás una notificación cuando el proceso termine con éxito."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Variantes"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "No hay ingredientes."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Categoría de ingredientes"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Nombre"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "anterior"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "próximo"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Buscar"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Macronutrientes"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Azúcar en los hidratos de carbono"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "n.d."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Contenido de grasas saturadas en grasas"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Otros"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Fibra"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Sodio"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Clic aqui para mas informacion"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Nutrición"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Añadir nueva unidad de peso"
@@ -2420,36 +2776,36 @@ 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:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Añadir nuevo ingrediente"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Plan nutricional"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan nutricional para %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Valores nutricionales"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Total"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Porcentaje de la energía"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g por kg peso"
@@ -2857,35 +3213,35 @@ msgstr "Código Fuente"
msgid "Translation"
msgstr "Traducción"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Sí, eliminar"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "El título original de este objeto, si está disponible"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Enlace al objeto original, si está disponible"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Autor(es)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Si no es usted el autor, introduce aquí el nombre o la fuente."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Enlace al perfil del autor, si está disponible"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Enlace a la fuente original, si se trata de una obra derivada"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3031,6 +3387,69 @@ msgstr ""
msgid "Re-Submit"
msgstr "Re-enviar"
+#~ 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."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Recordatorios de entrenamiento"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Muestra los comentarios de los ejercicios"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Activa para mostrar los comentarios para los ejercicios"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Usa también los ingredientes en inglés"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Activa para mostrar también ingredientes en inglés en durante la creación "
+#~ "de\n"
+#~ "planes nutricionales. Estos ingredientes han sido extraídos de una lista "
+#~ "provista\n"
+#~ "por el Departamento de Agricultura de los EE. UU. Es extremadamente "
+#~ "completa,\n"
+#~ "con aproximadamente 7000 elementos, pero puede hacer la búsqueda más "
+#~ "difícil."
+
+#~ msgid "Allow external access"
+#~ msgstr "Permitir acceso externo"
+
+#~ 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 ""
+#~ "Permite a los usuarios externos acceder a tus entrenamientos y otros "
+#~ "datos en modo de sólo lectura. Es necesario configurar esto antes de que "
+#~ "poder compartir enlaces por ejemplo, en los medios de comunicación social."
+
+#~ msgid "Your API key"
+#~ msgstr "Tu llave de API"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr ""
+#~ "Necesitas verificar tu correo electrónico para contribuir con ejercicios"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Te has registrado con éxito"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "Se envió un correo electrónico de verificación a %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Ver Objeto"
+
#~ msgid "Email verification"
#~ msgstr "Verificación del correo electrónico"
@@ -3207,9 +3626,6 @@ msgstr "Re-enviar"
#~ msgid "Brand name of product"
#~ msgstr "Marca del producto"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Categoría de ingredientes"
-
#~ msgid "Amount in grams"
#~ msgstr "Cantidad en gramos"
@@ -3427,9 +3843,6 @@ msgstr "Re-enviar"
#~ "Puedes buscar y seleccionar más de un ejercicio, se agruparán juntos para "
#~ "una superserie."
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
#~ msgid "Table"
#~ msgstr "Tabla"
@@ -3529,9 +3942,6 @@ msgstr "Re-enviar"
#~ msgid "Log overview"
#~ msgstr "Resumen del registro"
-#~ msgid "Workout session"
-#~ msgstr "Session de entrenamiento"
-
#~ msgid "Delete with logs"
#~ msgstr "Eliminar con registros"
@@ -3680,9 +4090,6 @@ msgstr "Re-enviar"
#~ "\"10\" para las repeticiones,\n"
#~ "esto se convertirá automáticamente en \"4 x 10\"."
-#~ msgid "Edit set"
-#~ msgstr "Editar serie"
-
#~ msgid "Update"
#~ msgstr "Actualizar"
@@ -3731,9 +4138,6 @@ msgstr "Re-enviar"
#~ msgid "Delete workout log"
#~ msgstr "Eliminar registro de rutina"
-#~ msgid "Create schedule"
-#~ msgstr "Crear programa"
-
#~ msgid "Edit workout"
#~ msgstr "Editar rutina"
@@ -3929,9 +4333,6 @@ msgstr "Re-enviar"
#~ "de ser incluido en la base de datos. Hasta entonces no se mostrará en el\n"
#~ "índice o la búsqueda."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Por favor, selecciona una de las opciones de abajo."
-
#~ msgid "Accept"
#~ msgstr "Aceptar"
diff --git a/wger/locale/fa/LC_MESSAGES/django.po b/wger/locale/fa/LC_MESSAGES/django.po
index 85de00574..f6a890c78 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -32,10 +32,10 @@ msgstr ""
"کاربران جدید و کاربران قدیدمی که باشگاه پیش فرض ندارند به این باشگاه اضافه "
"میشوند."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -47,86 +47,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "ویرایش"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "این فرم با ریکپچا امن شده است"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "ثبت"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "نام"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "نام خانوادگی"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "ایمیل"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr ""
-"برای بازنشانی رمز عبور استفاده می شود، به صورت اختیاری، یادآوری های ایمیل."
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "تاریخ تولد"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "اطلاعات شخصی"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "یاداوری تمرین"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "تنظیمات دیگر"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "ذخیره"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "ایمیل"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "استفاده شده برای بازیابی رمز عبور و به صورت اختیاری, یادآوری ایمیل"
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "این ایمیل قبلا استفاده شده است."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "پسورد"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "لطفا رمز عبور فعلی خود را وارد کنید."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -134,27 +129,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "حذف"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "رمز نامعتبر"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "این فرم با ریکپچا امن شده است"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm"
+msgstr "تنظیمات"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -228,35 +228,10 @@ msgid "Imperial (pound)"
msgstr "امپریال (پوند)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "نمایش نظرات تمرینات"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "بررسی کنید تا نظرات تمرینات در بخش تمرین نمایش داده شود."
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "همچنین عناصر مورد نیاز را به انگلیسی نمایش بده"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"همچنین عناصر مورد نیاز را در زمان ایجاد برنامه غذایی به زبان انگلیسی نمایش "
-"بده.\n"
-"عناصرخارج شده این لیست، توسط وزارت کشاورزی ایالات متحده تهیه شده است\n"
-"بسیار کامل است و شامل 7000 داده می باشد اما می تواند تا حدودی طاقت فرسا باشد "
-"و جستجو را دشوار کند."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "یاد اوری تمرینات فعال"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -264,19 +239,19 @@ msgstr ""
"یادآور خودکار تمرینات را فعال کنید. برای استفاده از این بخش نیاز است ایمیل "
"معتبر خود را ارائه کنید."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "قبل از انقضا یادآوری کن"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "تعداد روزهایی را که میخواهید یادآوری به شما قبل از تمرین انجام شود"
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "مدت زمان پیش فرض زمان تمرین"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -284,11 +259,11 @@ msgstr ""
"مدت زمان پیش فرض در هفته های تمرین نه در برنامه. برای یادآوری تمرینات ایمیل "
"استفاده می شود."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "زبان اعلان ها"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -297,95 +272,82 @@ msgstr ""
"یادآوری ایمیل برای تمرینات این بر زبان مورد استفاده در وب سایت تأثیر نمی "
"گذارد."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "سن"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "قد (سانتی متر)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "چند ساعت میخوابید"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "میانگین خواب شما در روز"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "کار"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "میانگین زمان کار در روز"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "شدت جسمی"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "تقریبا"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "ورزش"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "میانگین ساعت کار در هفته"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "زمان آزاد"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "مجموع کالری روزانه"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "مصرف کل کالری"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "واحد وزن"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "اجازه دست رسی خارجی"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"اجازه دست رسی خارجی به کاربران دیگر برای مشاهده پیشرف تمرینات. شما باید این "
-"قابلیت را فعال کنید تا بتوانید لابک های خود را در شبکه های اجتماعی به اشتراک "
-"بگذارید."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "یادآوری خودکار برای وزن کشی"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"چند روز از آخرین وزن کشی شما میگذرد (0 را برای غیر فعال کردن وارد کنید)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "مجموع تمام ساعت ها باید 24 باشد"
@@ -393,8 +355,7 @@ msgstr "مجموع تمام ساعت ها باید 24 باشد"
msgid "Repetitions"
msgstr ""
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -403,12 +364,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "نام"
@@ -499,6 +460,80 @@ msgstr ""
msgid "the wger Team"
msgstr "تیم WGER"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Configuration"
+msgid "Current email"
+msgstr "تنظیمات"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Configuration"
+msgid "Resend confirmation email"
+msgstr "تنظیمات"
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Configuration"
+msgid "Change email"
+msgstr "تنظیمات"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "ورود"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -508,7 +543,7 @@ msgstr ""
"شما به عنوان کاربر \"%(current_user)s\" در حال تماشای سایت هستید، تمام "
"اقدامات، روی داده‌های این کاربر انجام می‌شود."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "بازگشت به \"%(target)s\""
@@ -529,7 +564,7 @@ msgstr ""
"آیا مطمئن هستید که میخواهید این کار را انجام دهید؟ بعد پاک کردن قابل برگشت "
"نخواهد بود"
-#: core/templates/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "زبان ها"
@@ -538,15 +573,15 @@ msgid "Nothing found."
msgstr "چیزی یافت نشد!"
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "اضافه کن"
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -560,14 +595,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "امکانات"
@@ -577,9 +611,9 @@ msgstr "لیست مجوز ها"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -594,7 +628,7 @@ msgstr "لیست مجوز ها"
msgid "Nothing found"
msgstr "چیزی یافت نشد"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
#, fuzzy
msgid "Imprint"
msgstr "نشان دادن"
@@ -609,7 +643,7 @@ msgstr "تمرینات"
msgid "Routines"
msgstr "برنامه ها"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "تقویم"
@@ -621,7 +655,7 @@ msgstr "اندازه گیری"
msgid "Gallery"
msgstr "گالری"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -646,7 +680,7 @@ msgstr "الگو های عمومی"
msgid "Exercises"
msgstr "تمرینات"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -673,7 +707,7 @@ msgstr "دسته بندی ها"
msgid "Nutrition"
msgstr "مواد غذایی"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "برنامه های غذایی"
@@ -694,7 +728,7 @@ msgstr "نمای کلی مواد تشکیل دهنده"
msgid "Body weight"
msgstr "وزن بدن"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "بازنگری وزن "
@@ -710,7 +744,7 @@ msgstr "ما را پشتیبانی کنید و در ارتباط باشید"
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "مجوز"
@@ -723,43 +757,43 @@ msgstr "مستندات برنامه نوبیسان"
msgid "Get the code"
msgstr "کد را دریافت کنید"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "ترجمه"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "بازنشانی رمز عبور"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "خروج"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "ترجیحات من"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "مجوز ها"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
#, fuzzy
msgid "Repetition units"
msgstr "واحد تکرار"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "واحد های وزن"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "لیست کاربر"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "باشگاه ها"
@@ -813,34 +847,26 @@ msgstr "از شما برای استفاده از این سایت ممنونیم!
msgid "The %(site_name)s team"
msgstr "تیم %(site_name)s "
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "بستن"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "چند نمونه پر کنید"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -848,37 +874,161 @@ msgstr ""
msgid "Features"
msgstr "امکانات"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete API key"
+msgstr "حذف"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr ""
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+#, fuzzy
+msgid "API documentation"
+msgstr "مستندات برنامه نوبیسان"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -891,102 +1041,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "تمرین یافت نشد"
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "انرژی"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "پروتئین"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "کربوهیدارت ها"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "چربی"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "کیلو کالری"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,114 +1137,112 @@ msgstr "کیلو کالری"
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1110,78 +1250,100 @@ msgid "Preferences"
msgstr "عملکرد"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "بازنشانی رمز عبور"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1193,52 +1355,66 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "بله، حذف"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1270,47 +1446,143 @@ msgstr "%(birthdate)s روز تولد معتبر نمی باشد"
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/history/overview.html:27
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
+msgstr ""
+
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
#, fuzzy
-#| msgid "Options"
-msgid "Action"
-msgstr "امکانات"
+#| msgid "Delete"
+msgid "deleted"
+msgstr "حذف"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
+#: exercises/templates/history/overview.html:100
+msgid "merged"
msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:113
+msgid "into"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:123
+msgid "media"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translate"
+msgid "translations"
+msgstr "ترجمه"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "بله، حذف"
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "نام"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "نام خانوادگی"
+
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
msgstr "بررسی عضله"
@@ -1331,6 +1603,35 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr ""
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+#, fuzzy
+#| msgid "Options"
+msgid "Action"
+msgstr "امکانات"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr ""
@@ -1429,15 +1730,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1529,7 +1830,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1603,11 +1904,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1624,15 +1925,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -2054,26 +2355,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2126,55 +2427,55 @@ msgstr "تمرین"
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "همچنین عناصر مورد نیاز را به انگلیسی نمایش بده"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Nutrition"
msgid "Portion"
@@ -2218,77 +2519,101 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
+#, fuzzy
+#| msgid "Ingredient weight units"
+msgid "Ingredient pagination"
+msgstr "واحدهای وزن مواد تشکیل دهنده"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "نام"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "مواد غذایی"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2360,38 +2685,38 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
#, fuzzy
#| msgid "Nutrition plan"
msgid "Nutritional data"
msgstr "برنامه غذایی"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2756,35 +3081,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "بله، حذف"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2902,6 +3227,48 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "برای بازنشانی رمز عبور استفاده می شود، به صورت اختیاری، یادآوری های ایمیل."
+
+#~ msgid "Workout reminders"
+#~ msgstr "یاداوری تمرین"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "نمایش نظرات تمرینات"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "بررسی کنید تا نظرات تمرینات در بخش تمرین نمایش داده شود."
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "همچنین عناصر مورد نیاز را به انگلیسی نمایش بده"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "همچنین عناصر مورد نیاز را در زمان ایجاد برنامه غذایی به زبان انگلیسی "
+#~ "نمایش بده.\n"
+#~ "عناصرخارج شده این لیست، توسط وزارت کشاورزی ایالات متحده تهیه شده است\n"
+#~ "بسیار کامل است و شامل 7000 داده می باشد اما می تواند تا حدودی طاقت فرسا "
+#~ "باشد و جستجو را دشوار کند."
+
+#~ msgid "Allow external access"
+#~ msgstr "اجازه دست رسی خارجی"
+
+#~ 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 ""
+#~ "اجازه دست رسی خارجی به کاربران دیگر برای مشاهده پیشرف تمرینات. شما باید "
+#~ "این قابلیت را فعال کنید تا بتوانید لابک های خود را در شبکه های اجتماعی به "
+#~ "اشتراک بگذارید."
+
#~ msgid "Email verification"
#~ msgstr "تأیید ایمیل"
@@ -2927,9 +3294,6 @@ msgstr ""
#~ 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 9c0c49069..8e4c47f03 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -33,10 +33,10 @@ msgstr ""
"rekisteröityneet käyttäjät tälle kuntosalille ja päivittää kaikki nykyiset "
"käyttäjät, joilla ei ole kuntosalia."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -48,88 +48,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Muokkaa"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Lomake on suojattu reCAPTCHA:lla"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Rekisteröidy"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Etunimi"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Sukunimi"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Sähköposti"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Syntymäpäivä"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Henkilökohtaiset tiedot"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Harjoittelumuistutukset"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Muut asetukset"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Tallenna"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Sähköposti"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Käytetään uuden salasanan hankkimiseen ja valinnaisesti "
"sähköpostimuistutuksiin."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Tämä sähköpostiosoite on jo käytössä."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Salasana"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Anna nykyinen salasanasi."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -137,27 +132,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Poista"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Väärä salasana"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "Lomake on suojattu reCAPTCHA:lla"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Vahvistamaton sähköpostiosoite"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Lähetä"
@@ -231,37 +231,10 @@ msgid "Imperial (pound)"
msgstr "Brittiläinen (pauna)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Näytä harjoituskommentit"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Valitse tämä näyttääksesi harjoittelukommentit harjoittelunäkymässä"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Näytä raaka-aineet myös englanniksi"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Valitse, jos haluat näyttää ainesosat myös englanniksi, kun luot "
-"ravitsemussuunnitelmaa.\n"
-"Nämä ainesosat on otettu Yhdysvaltain maatalousministeriön tarjoamasta "
-"luettelosta. Se\n"
-"on erittäin täydellinen, ja siinä on noin 7 000 merkintää, mutta se voi olla "
-"jokseenkin\n"
-"ylivoimainen ja vaikeuttaa hakua."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Ota harjoittelumuistutukset käyttöön"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -269,20 +242,20 @@ msgstr ""
"Valitse tämä ottaaksesi automaattiset harjoittelumuistutukset käyttöön. "
"Sinun on tiedotettava kelvollinen sähköpostiosoite, jotta tämä toimii."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Muistuta ennen vanhenemista"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Päivämäärä, jona haluat saada muistutuksen ennen harjoituksen päättymistä."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Harjoitteluiden oletuskesto"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -290,11 +263,11 @@ msgstr ""
"Oletuskesto viikkoina harjoitteluista, jotka eivät ole aikataulussa. "
"Käytetään harjoittelumuistutuksiin sähköpostitse."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Muistutuskieli"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -303,95 +276,82 @@ msgstr ""
"sähköpostimuistutuksia harjoituksista. Tämä ei vaikuta verkkosivustolla "
"käytettyyn kieleen."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Ikä"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Pituus (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Unen määrä"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Keskimääräinen unen määrä päivässä"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Työ"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Keskimääräinen tuntien määrä päivässä"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Fyysinen vaativuus"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Arviolta"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Urheilu"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Keskimäärin tunteja viikossa"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Vapaa-aika"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Päivittäisiä kaloreita yhteensä"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Syötävien kaloreiden määrä, sisältäen mahdolliset lisäkalorit"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Painoyksikkö"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Salli ulkoinen pääsy"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Salli ulkoisten käyttäjien käyttää harjoittelujasi ja lokejasi vain luku "
-"-tilassa. Sinun on asetettava tämä, ennen kuin voit jakaa linkkejä, esim. "
-"sosiaaliseen mediaan."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Automaattiset muistutukset painomerkinnöistä"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Päivien määrä edellisestä painomerkinnästä (aseta 0 ottaaksesi pois päältä)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Tuntien summa tarvitsee olla 24"
@@ -399,8 +359,7 @@ msgstr "Tuntien summa tarvitsee olla 24"
msgid "Repetitions"
msgstr "Toistot"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Aika"
@@ -411,12 +370,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Nimi"
@@ -510,6 +469,86 @@ msgstr ""
msgid "the wger Team"
msgstr "wger-joukkue"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Sähköpostiosoitteet"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Nykyinen versio"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Lähetä vahvistussähköposti"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Näytä muutokset"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Muutokset"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Vahvistamaton sähköpostiosoite"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Kirjaudu sisään"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Salasana unohtunut?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Ei tiliä?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -519,7 +558,7 @@ msgstr ""
"Selaat sivustoa käyttäjän \"%(current_user)s\" näkymässä, kaikki toiminnot "
"kohdistuvat hänen tietoihinsa."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Takaisin \"%(target)s\""
@@ -543,7 +582,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Kielet"
@@ -552,15 +591,15 @@ msgid "Nothing found."
msgstr "Mitään ei löytynyt."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -574,14 +613,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Asetukset"
@@ -591,9 +629,9 @@ msgstr "Lisenssiluettelo"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -608,7 +646,7 @@ msgstr "Lisenssiluettelo"
msgid "Nothing found"
msgstr "Mitään ei löytynyt"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Jälki"
@@ -620,7 +658,7 @@ msgstr "Harjoittelu"
msgid "Routines"
msgstr "Rutiinit"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Kalenteri"
@@ -632,7 +670,7 @@ msgstr "Mittaukset"
msgid "Gallery"
msgstr "Galleria"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -654,7 +692,7 @@ msgstr "Julkiset mallit"
msgid "Exercises"
msgstr "Harjoitukset"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Hallinto"
@@ -679,7 +717,7 @@ msgstr "Luokat"
msgid "Nutrition"
msgstr "Ravitsemus"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Ravitsemussuunnitelmat"
@@ -700,7 +738,7 @@ msgstr "Ainesosien yleiskatsaus"
msgid "Body weight"
msgstr "Kehon paino"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Painon yleiskatsaus"
@@ -716,7 +754,7 @@ msgstr "Tuki ja osallistu"
msgid "REST API"
msgstr "REST-sovellusliittymä"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Lisenssi"
@@ -728,42 +766,42 @@ msgstr "Kehittäjädokumentaatio"
msgid "Get the code"
msgstr "Hanki koodi"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Käännä"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Nollaa salasana"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Kirjaudu ulos"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Mieltymykseni"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Lisenssit"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Toistoyksiköt"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Painoyksiköt"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Käyttäjäluettelo"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Kuntosalit"
@@ -817,34 +855,26 @@ msgstr "Kiitos, että käytät sivustoamme!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s-joukkue"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "edellinen"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "seuraava"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Sulje"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Luo joitain esittelymerkintöjä"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Käyttöehdot"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -852,37 +882,168 @@ msgstr ""
msgid "Features"
msgstr "Ominaisuudet"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API-avain"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "API-avaimesi"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Sinulla ei ole vielä API-avainta"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Luo uusi API-avain"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Creation date"
+msgid "Created"
+msgstr "Luontipäivä"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Session"
+msgid "JWT sessions"
+msgstr "Harjoituskerta"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API-avain"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Poista nykyinen API-avain ja luo uusi"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Luo uusi API-avain"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Luo uusi API-avain"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Sinulla ei ole vielä API-avainta"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokumentaatio"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentaatio"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Poista tili"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Oletko varma?"
@@ -899,102 +1060,94 @@ msgstr ""
"(harjoitukset, lokit jne.),\n"
"eikä sitä voi kumota. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Ei tiliä?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Salasana unohtunut?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "viimeinen %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Kuvaus"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Lokien lukumäärä (päiviä)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Viimeinen toiminta"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Harjoituksia ei löytynyt."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Loki"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Yleisvaikutelma"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Huomautukset"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Proteiini"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Hiilihydraatit"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Rasva"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,196 +1156,217 @@ msgstr "kcal"
msgid "Actions"
msgstr "Toimet"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Poista käyttäjä käytöstä"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Ota käyttäjä käyttöön"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Nollaa käyttäjän salasana"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roolit"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Salasanan nollausvahvistus"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Ei"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Kyllä"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Yksityiskohdat"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nro."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Puhelin"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Osoite"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Rekisteröity"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Viimeinen sisäänkirjautuminen"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Tila"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktiivinen"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Ei-aktiivinen"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Sopimukset"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Asiakirjat"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Lataa"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Sisällytä ei-aktiiviseen yleiskatsaukseen"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Kirjaudu sisään tämän käyttäjänä"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Kirjaudu sisään tämän käyttäjänä"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Mieltymykset"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Vahvistettu sähköpostiosoite"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Vahvistamaton sähköpostiosoite"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Lähetä vahvistussähköposti"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Vaihda salasana"
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Nollaa salasana"
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-"Sinun on vahvistettava sähköpostiosoitteesi osallistuaksesi harjoituksiin"
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
-msgstr "Vaihda salasana"
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Poista tili"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Poistettu onnistuneesti"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Poista {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Muokkaa {0}"
@@ -1207,52 +1381,64 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Tili \"{0}\" poistettiin onnistuneesti"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Rekisteröidyt onnistuneesti"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Asetukset päivitetty onnistuneesti"
-#: core/views/user.py:396
+#: core/views/user.py:314
+msgid "Please correct the errors below."
+msgstr ""
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Käyttäjän poistaminen käytöstä onnistui"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Käyttäjän käyttöönotto onnistui"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Muokkaa käyttäjää"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "Tunnus"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Käyttäjänimi"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Kuntosali"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latinaksi, esim. \"Pectoralis major\""
@@ -1282,44 +1468,148 @@ msgstr "Tiedosto ei ole kelvollinen video"
msgid "Equipment list"
msgstr "Varusteluettelo"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Harjoitusten järjestelmänvalvojan historia"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Toiminta"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
+msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Käyttäjä"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Poista"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translate"
+msgid "translations"
+msgstr "Käännä"
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Palauta muutokset"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Esine"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Muutokset"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Palauta muutokset"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Kumoa"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Näytä esine"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Näytä muutokset"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Palauta muutokset"
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Etunimi"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "edellinen"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Sukunimi"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1341,6 +1631,33 @@ msgstr "Lisää uusi varuste"
msgid "Delete equipment?"
msgstr "Poistetaanko varuste?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Käyttäjä"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Tyyppi"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Toiminta"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Lisää lihas"
@@ -1440,15 +1757,15 @@ msgstr "Aloituspäivämäärä"
msgid "End date"
msgstr "Päättymispäivämäärä"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Postinumero"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Kaupunki"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Katu"
@@ -1544,7 +1861,7 @@ msgstr "Kuntosalien lista"
msgid "Global gym configuration"
msgstr "Yleispätevä kuntosalikokoonpano"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Lisää uusi kuntosali"
@@ -1623,11 +1940,11 @@ msgstr ""
"Tämän käyttäjän salasana on nollattu. Ilmoita käyttäjälle uudesta "
"salasanastaan."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Lisää huomautus"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Lisää sopimus"
@@ -1644,15 +1961,15 @@ msgstr "Poista {0}"
msgid "Add contract type"
msgstr "Lisää sopimustyyppi"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Sukupuoli"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Lisää käyttäjä kuntosalille"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Muokkaa kuntosalia"
@@ -2073,26 +2390,26 @@ msgstr "Harjoitus"
msgid "Routine will expire soon"
msgstr "Rutiini päättyy pian"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Huono"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutraali"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Hyvä"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Jos syötät ajan, sinun on syötettävä sekä alkamis- että päättymisaika."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Aloitusaika ei voi olla päättymisajan jälkeen."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2154,54 +2471,54 @@ msgstr "Harjoittelu"
msgid "Workout for %s"
msgstr "Harjoitus %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Yksikkö"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Perusenergiantarve"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Perusenergiantarpeesi tietojesi perusteella"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Perustarpeeseen lisättävät kalorit"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
"Perustarpeeseen lisättävät kalorit (vähentääksesi, syötä negatiivinen luku)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ainesosa"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Hae myös englanninkieliset nimet"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2245,79 +2562,103 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Muunnelmat"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Ei raaka-aineita."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient"
+msgid "Ingredient pagination"
+msgstr "Ainesosa"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Etunimi"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "edellinen"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "seuraava"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Etsi"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Makroravinteet"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Sokerin osuus hiilihydraateista"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Tyydyttyneen rasvan osuus rasvoista"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Muut"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Kuitu"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Suola"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Ravitsemus"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Lisää uusi painoyksikkö"
@@ -2389,38 +2730,38 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Lisää uusi raaka-aine"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
#, fuzzy
#| msgid "Nutrition"
msgid "Nutritional data"
msgstr "Ravitsemus"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2783,35 +3124,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2929,6 +3270,67 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Käytetään salasanan nollaukseen ja valinnaisesti sähköpostimuistutuksiin."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Harjoittelumuistutukset"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Näytä harjoituskommentit"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Valitse tämä näyttääksesi harjoittelukommentit harjoittelunäkymässä"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Näytä raaka-aineet myös englanniksi"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Valitse, jos haluat näyttää ainesosat myös englanniksi, kun luot "
+#~ "ravitsemussuunnitelmaa.\n"
+#~ "Nämä ainesosat on otettu Yhdysvaltain maatalousministeriön tarjoamasta "
+#~ "luettelosta. Se\n"
+#~ "on erittäin täydellinen, ja siinä on noin 7 000 merkintää, mutta se voi "
+#~ "olla jokseenkin\n"
+#~ "ylivoimainen ja vaikeuttaa hakua."
+
+#~ msgid "Allow external access"
+#~ msgstr "Salli ulkoinen pääsy"
+
+#~ 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 ""
+#~ "Salli ulkoisten käyttäjien käyttää harjoittelujasi ja lokejasi vain luku "
+#~ "-tilassa. Sinun on asetettava tämä, ennen kuin voit jakaa linkkejä, esim. "
+#~ "sosiaaliseen mediaan."
+
+#~ msgid "Your API key"
+#~ msgstr "API-avaimesi"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr ""
+#~ "Sinun on vahvistettava sähköpostiosoitteesi osallistuaksesi harjoituksiin"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Rekisteröidyt onnistuneesti"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "Vahvistussähköposti lähetettiin osoitteeseen %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Näytä esine"
+
#~ msgid "Email verification"
#~ msgstr "Sähköpostivahvistus"
@@ -3048,12 +3450,6 @@ msgstr ""
#~ msgid "Order"
#~ msgstr "Järjestys"
-#~ msgid "Session"
-#~ msgstr "Harjoituskerta"
-
-#~ msgid "Creation date"
-#~ msgstr "Luontipäivä"
-
#~ msgid "Workout template"
#~ msgstr "Harjoitusmalli"
@@ -3223,9 +3619,6 @@ msgstr ""
#~ "Voit hakea useampaa kuin yhtä harjoitusta, ne ryhmitellään yhteen "
#~ "superjoukoksi."
-#~ msgid "Type"
-#~ msgstr "Tyyppi"
-
#~ msgid "Table"
#~ msgstr "Taulukko"
diff --git a/wger/locale/fr/LC_MESSAGES/django.po b/wger/locale/fr/LC_MESSAGES/django.po
index bfc633dba..1dc37839e 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+0000\n"
"PO-Revision-Date: 2026-04-20 14:09+0000\n"
"Last-Translator: Laurent Rousseau <[email protected]>\n"
"Language-Team: French <https://hosted.weblate.org/projects/wger/web/fr/>\n"
@@ -45,10 +45,10 @@ msgstr ""
"sera assignée à chaque utilisateur non enregistré ainsi qu'aux utilisateurs "
"sans salle de sport."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -60,89 +60,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Modifier"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Le formulaire est sécurisé avec reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "S’inscrire"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Prénom"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Nom"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Courriel"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Date de naissance"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Données personnelles"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Rappels d’entraînement"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Autres paramètres"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Sauvegarder"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Courriel"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Cette adresse courriel est déjà utilisée."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Mot de passe"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Veuillez entrer votre mot de passe actuel."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -150,27 +144,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Supprimer"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Mot de passe invalide"
-#: 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:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Email non vérifié"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Envoyer"
@@ -244,37 +243,10 @@ msgid "Imperial (pound)"
msgstr "Impérial (livre)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Afficher les commentaires"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Cochez pour montrer les commentaires sur la vue des séances"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Afficher les ingrédients en anglais"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Cocher pour montrer les ingrédients en anglais lors de la création\n"
-"d’un programme nutritionnel. Ces ingrédients sont extrait d’une liste "
-"fournie\n"
-"par le département états-unien de l’Agriculture. Elle est extrémement "
-"complète,\n"
-"avec près de 7 000 entrées, mais ceci peut être trop et rendre la recherche "
-"difficile."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Activer le rappel de séance"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -282,21 +254,21 @@ msgstr ""
"Cliquez pour activer les rappels automatiques des entraînements. Vous devez "
"fournir une adresse courriel valide pour que ceci fonctionne."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Rappeler avant l’expiration"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Le nombre de jours avant l’expiration d’une séance d’entraînement pour "
"l’envoi d’un rappel."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Durée par défaut des entraînements"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -304,11 +276,11 @@ msgstr ""
"La durée par défaut en semaine des séances, pas dans un calendrier. Utilisé "
"pour les rappels de séance par courriel."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Langue de notification"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -316,96 +288,83 @@ msgstr ""
"Langue à utiliser lors de l’envoi de courriels de notification, par ex. les "
"rappels de séance. Ceci n’affecte pas la langue utilisée sur le site."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Âge"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Taille (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Heures de sommeil"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Le nombre d'heure moyen de sommeil par jour"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Travail"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Nombre d’heures moyen par jour"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Intensité physique"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Environs"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Heures par semaine (moy.)"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Temps libre"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Nombre total de calories par jour"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Total des entrées caloriques, incluant les suppléments"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Unité de poids"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Autoriser les accès extérieurs"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Autoriser les utilisateurs externes d'accèder à vos séances et vos journaux "
-"en mode lecture seule. Vous devez activer cette option avant de pouvoir "
-"partager des liens e.g. sur les réseaux sociaux."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Sauvegarder les poids entrés"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Durée en jour de la sauvegarde à partir de la dernière entrée de poids "
"(mettre 0 pour désactiver)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "Activer les trophées"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
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:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "La somme des heures doit être de 24"
@@ -413,8 +372,7 @@ msgstr "La somme des heures doit être de 24"
msgid "Repetitions"
msgstr "Répétitions"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Temps"
@@ -425,12 +383,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Nom"
@@ -526,6 +484,86 @@ msgstr ""
msgid "the wger Team"
msgstr "L'équipe wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Courriels"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Version actuelle"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Envoyer un email de vérification"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Voir les modifications"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Modifications"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Email non vérifié"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Se connecter"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Mot de passe oublié ?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Pas de compte ?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -535,7 +573,7 @@ msgstr ""
"Vous naviguez sur le site en tant qu'utilisateur \"%(current_user)s\", "
"toutes les actions sont effectuées sur ses données."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Retour vers « %(target)s »"
@@ -559,7 +597,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Langues"
@@ -568,15 +606,15 @@ msgid "Nothing found."
msgstr "Rien trouvé."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -590,14 +628,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Options"
@@ -607,9 +644,9 @@ msgstr "Liste des licences"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -624,7 +661,7 @@ msgstr "Liste des licences"
msgid "Nothing found"
msgstr "Rien trouvé"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Informations légales"
@@ -636,7 +673,7 @@ msgstr "Formation"
msgid "Routines"
msgstr "Routines"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Calendrier"
@@ -648,7 +685,7 @@ msgstr "Macronutriments"
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -670,7 +707,7 @@ msgstr "Modèles publics"
msgid "Exercises"
msgstr "Exercices"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administration"
@@ -695,7 +732,7 @@ msgstr "Catégories"
msgid "Nutrition"
msgstr "Nutrition"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Plans de nutrition"
@@ -716,7 +753,7 @@ msgstr "Aperçu ingrédients"
msgid "Body weight"
msgstr "Poids corporel"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Aperçu poids"
@@ -732,7 +769,7 @@ msgstr "Soutenez et impliquez-vous"
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licence"
@@ -744,42 +781,42 @@ msgstr "Documentation du développeur"
msgid "Get the code"
msgstr "Récupérer le code"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduire"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Se déconnecter"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Mes préférences"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licences"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unités de répétition"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Unité de poids"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Liste des utilisateurs"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Activités"
@@ -836,36 +873,28 @@ msgstr "Merci d’utiliser notre site !"
msgid "The %(site_name)s team"
msgstr "L’équipe de %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "précédent"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "suivant"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Fermer"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Créer des entrées de démo"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Conditions d’utilisation"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -873,37 +902,168 @@ msgstr ""
msgid "Features"
msgstr "Fonctionnalités"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Clé API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Votre clé API"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Vous n'avez pas de clé API"
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Générer votre nouvelle clé API"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Créer un programme"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Séance d'entraînement"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Clé API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Supprimer votre clé API actuel et généré en une nouvelle"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Générer votre nouvelle clé API"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Générer votre nouvelle clé API"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Vous n'avez pas de clé API"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Documentation"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentation"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Supprimer votre compte"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Êtes-vous sûr·e ?"
@@ -920,102 +1080,94 @@ msgstr ""
"associées (entraînements, journaux, etc.)\n"
"et ne peut être annulé. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Pas de compte ?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Mot de passe oublié ?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "dernier %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Description"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Nombre de journaux (jours)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Dernière activité"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Pas de séance trouvée."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Journal"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Impression générale"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Notes"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Énergie"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Protéines"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Glucides"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Lipides"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1024,195 +1176,217 @@ msgstr "kcal"
msgid "Actions"
msgstr "Actions"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Désactiver l'utilisateur"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Activer l'utilisateur"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Réinitialiser le mot de passe utilisateur"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Rôles"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Confirmation de mot de passe réinitialisé"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Non"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Oui"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Détails"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "N°"
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Téléphone"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresse"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Enregistré"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Dernière connexion"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Statut"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Actif"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inactifs"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contrats"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documents"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Télécharger"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inclure dans un aperçu inactif"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Connectez-vous en tant que cet utilisateur"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Connectez-vous en tant que cet utilisateur"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Préférences"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Email vérifié"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Email non vérifié"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Envoyer un email de vérification"
-
-#: core/templates/user/preferences.html:31
-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:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Changer le mot de passe"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Réinitialiser le mot de passe"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Supprimer votre compte"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Supprimé avec succès"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Supprimer {0} ?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Modifier {0}"
@@ -1228,52 +1402,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Le compte « {0} » a été supprimé avec succès"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Vous avez été enregistré·e avec succès"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Paramètres mis à jour"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Merci de choisir une des options suivantes."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "L'utilisateur a été correctement désactivé"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "L'utilisateur a été activé avec succès"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Modifier l’utilisateur"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Oui, supprimer"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Nom d’utilisateur"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Activités"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "En latin, par ex. « Pectoralis major »"
@@ -1303,44 +1493,158 @@ msgstr "Le fichier n'est pas une vidéo valide"
msgid "Equipment list"
msgstr "Liste d'équipement"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Historique d'exercice admin"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Action"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Modifier la série"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Utilisateur"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Modifier la série"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Modifier la série"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Supprimer"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Traduction"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Oui, supprimer"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Annuler les modifications"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Objet"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Modifications"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Annuler les modifications"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Inverser"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Voir l'objet"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Voir les modifications"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Annuler les modifications"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Cliquez ici pour plus d'informations"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Prénom"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "précédent"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Nom"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1362,6 +1666,33 @@ msgstr "Ajouter de nouveaux équipements"
msgid "Delete equipment?"
msgstr "Supprimer équipement ?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Utilisateur"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Type"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Action"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Ajouter un muscle"
@@ -1464,15 +1795,15 @@ msgstr "Date de début"
msgid "End date"
msgstr "Date de fin"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Code postal"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Ville"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Rue"
@@ -1569,7 +1900,7 @@ msgstr "Liste d’activités"
msgid "Global gym configuration"
msgstr "Configuration globale"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Ajouter une nouvelle activité"
@@ -1650,11 +1981,11 @@ msgstr ""
"Le mot de passe de cet utilisateur a été réinitialisé. Veuillez notifier "
"l'utilisateur de son nouveau mot de passe."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Ajouter une note"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Ajouter un contrat"
@@ -1671,15 +2002,15 @@ msgstr "Supprimer {0}"
msgid "Add contract type"
msgstr "Ajouter un type de contrat"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Genre"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Ajouter un utilisateur à l'activité"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Modifier l’activité"
@@ -2105,27 +2436,27 @@ msgstr "Exercice"
msgid "Routine will expire soon"
msgstr "La routine expirera bientôt"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Mauvais"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutre"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Bon"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
"Si vous entrez une heure, vous devez entrer l'heure de début et de fin."
+#: manager/models/session.py:152
+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."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2191,27 +2522,27 @@ msgstr "Séance"
msgid "Workout for %s"
msgstr "Séance pour %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Unité"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Apport calorique de base"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Votre apport calorique de base calculé avec vos données"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Calories supplémentaires"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2219,27 +2550,27 @@ msgstr ""
"Les calories supplémentaires à ajouter au taux de base (pour soustraire, "
"entrez un nombre négatif)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ingrédient"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Chercher aussi le nom des ingrédients en anglais"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2296,83 +2627,107 @@ msgstr ""
"fois le processus fini avec succès."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Variations"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Aucun ingrédient."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Catégories d’ingrédients"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Prénom"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "précédent"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "suivant"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Recherche"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Macronutriments"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Sucre contenu dans les glucides"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Teneur en acides gras saturés dans les acides gras"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Autres"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Fibre"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Sodium"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Cliquez ici pour plus d'informations"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Nutrition"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Ajouter une nouvelle unité de poids"
@@ -2460,37 +2815,37 @@ 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:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Ajouter un nouvel ingrédient"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Plan de nutrition"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan de nutrition pour %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Donnée nutritionnelle"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Total"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Pour cent de l'énergie"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g par kg de masse corporelle"
@@ -2907,35 +3262,35 @@ msgstr "Code source"
msgid "Translation"
msgstr "Traduction"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Oui, supprimer"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Le titre original de cet objet, si disponible"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Lien vers l'objet original, si disponible"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Auteur(s)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Si vous n'êtes pas l'auteur, entrez le nom ou la source ici."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Lien vers le profil de l'auteur, si disponible"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Lien vers la source originale, s'il s'agit d'une œuvre dérivée"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3081,6 +3436,67 @@ msgstr ""
msgid "Re-Submit"
msgstr "Renvoyer"
+#~ 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."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Rappels d’entraînement"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Afficher les commentaires"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Cochez pour montrer les commentaires sur la vue des séances"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Afficher les ingrédients en anglais"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Cocher pour montrer les ingrédients en anglais lors de la création\n"
+#~ "d’un programme nutritionnel. Ces ingrédients sont extrait d’une liste "
+#~ "fournie\n"
+#~ "par le département états-unien de l’Agriculture. Elle est extrémement "
+#~ "complète,\n"
+#~ "avec près de 7 000 entrées, mais ceci peut être trop et rendre la "
+#~ "recherche difficile."
+
+#~ msgid "Allow external access"
+#~ msgstr "Autoriser les accès extérieurs"
+
+#~ 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 ""
+#~ "Autoriser les utilisateurs externes d'accèder à vos séances et vos "
+#~ "journaux en mode lecture seule. Vous devez activer cette option avant de "
+#~ "pouvoir partager des liens e.g. sur les réseaux sociaux."
+
+#~ msgid "Your API key"
+#~ msgstr "Votre clé API"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "Vous devez vérifier votre email pour contribuer aux exercices"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Vous avez été enregistré·e avec succès"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "Un email de vérification a été envoyé à %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Voir l'objet"
+
#~ msgid "Email verification"
#~ msgstr "Vérification du courriel"
@@ -3257,9 +3673,6 @@ msgstr "Renvoyer"
#~ msgid "Brand name of product"
#~ msgstr "Nom de la marque du produit"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Catégories d’ingrédients"
-
#~ msgid "Amount in grams"
#~ msgstr "Quantité en grammes"
@@ -3483,9 +3896,6 @@ msgstr "Renvoyer"
#~ "Vous pouvez rechercher plus d'un exercice à la fois, ils seront groupés "
#~ "ensemble."
-#~ msgid "Type"
-#~ msgstr "Type"
-
#~ msgid "Table"
#~ msgstr "Tableau"
@@ -3584,9 +3994,6 @@ msgstr "Renvoyer"
#~ msgid "Log overview"
#~ msgstr "Vue d'ensemble des journaux"
-#~ msgid "Workout session"
-#~ msgstr "Séance d'entraînement"
-
#~ msgid "Delete with logs"
#~ msgstr "Supprimer avec les journaux"
@@ -3752,9 +4159,6 @@ msgstr "Renvoyer"
#~ "entrez juste une fois « 10 » pour les répétitions,\n"
#~ "ceci deviendra automatiquement « 4 × 10 »."
-#~ msgid "Edit set"
-#~ msgstr "Modifier la série"
-
#~ msgid "Update"
#~ msgstr "Mettre à jour"
@@ -3802,9 +4206,6 @@ msgstr "Renvoyer"
#~ msgid "Delete workout log"
#~ msgstr "Supprimer le journal de la séance"
-#~ msgid "Create schedule"
-#~ msgstr "Créer un programme"
-
#~ msgid "Edit workout"
#~ msgstr "Modifier la séance"
@@ -4006,9 +4407,6 @@ msgstr "Renvoyer"
#~ "décision pour figurer dans la base de données. En attendant, il ne sera "
#~ "pas montré dans la vue d’ensemble ou lors de la recherche."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Merci de choisir une des options suivantes."
-
#~ msgid "Accept"
#~ msgstr "Accepter"
diff --git a/wger/locale/he/LC_MESSAGES/django.po b/wger/locale/he/LC_MESSAGES/django.po
index c0775b7b7..f91dd8760 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -30,10 +30,10 @@ msgstr ""
"בחר את מכון הכושר ברירת המחדל להתקנה זו. פעלה זו תשייך למכון זה את כל "
"המשתמשים הרשומים ותעדכן את כל המשתמשים הקיימים שלא משויכים למכון."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -45,86 +45,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "עריכה"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "טופס זה מאובטח באמצעות reCAPTCHA"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "הרשמה"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "שם פרטי"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "שם משפחה"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "דואר אלקטרוני"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr ""
-"בשימוש עבור איפוס סיסמה וגם, באופן אופציונלי, לתזכורות בדואר האלקטרוני."
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "תאריך לידה"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "נתונים אישיים"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "תזכורות לאימונים"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "הגדרות אחרות"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "שמירה"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "דואר אלקטרוני"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "משמש לשחזור הסיסמה ולתזכורות אופציונליות."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "כתובת דוא״ל זו כבר נמצאת בשימוש."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "סיסמה"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "נא להקליד את סיסמתך הנוכחית."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -132,27 +127,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "מחיקה"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "סיסמה שגויה"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "טופס זה מאובטח באמצעות reCAPTCHA"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm"
+msgstr "הגדרה"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -224,148 +224,118 @@ msgid "Imperial (pound)"
msgstr "השיטה האימפריאליסטית (פאונדים)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "תזכורות פעילוֹת לאימונים"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "משך ברירת מחדל לאימונים"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "שפת ההתראות"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "גיל"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "גובה (ס״מ)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "שעות שינה"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "הכמות הממוצעת של שעות השינה ליממה"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "עבודה"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "ממוצע שעות ביום"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "בערך"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "ספורט"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "ממוצע שעות בשבוע"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "זמן פנוי"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "סה״כ קלוריות ביום"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "יחידת משקל"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "לאפשר גישה חיצונית"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -373,8 +343,7 @@ msgstr ""
msgid "Repetitions"
msgstr "חזרות"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "זמן"
@@ -383,12 +352,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "שם"
@@ -469,6 +438,82 @@ msgstr ""
msgid "the wger Team"
msgstr "צוות wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Address"
+msgid "Email address"
+msgstr "כתובת"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Configuration"
+msgid "Current email"
+msgstr "הגדרה"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Configuration"
+msgid "Resend confirmation email"
+msgstr "הגדרה"
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Configuration"
+msgid "Change email"
+msgstr "הגדרה"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "כניסה"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "שכחת את הסיסמה?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "אין חשבון?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -476,7 +521,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "חזרה לעמוד \"%(target)s\""
@@ -495,7 +540,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "שפות"
@@ -504,15 +549,15 @@ msgid "Nothing found."
msgstr "אין תוצאות."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "להוסיף כעת."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -526,14 +571,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "אפשרויות"
@@ -543,9 +587,9 @@ msgstr "רשימת רישיונות"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -560,7 +604,7 @@ msgstr "רשימת רישיונות"
msgid "Nothing found"
msgstr "לא נמצא דבר"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -572,7 +616,7 @@ msgstr "אימון"
msgid "Routines"
msgstr "שגרות"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "לוח שנה"
@@ -584,7 +628,7 @@ msgstr ""
msgid "Gallery"
msgstr "גלריה"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -606,7 +650,7 @@ msgstr "אימונים ציבוריים"
msgid "Exercises"
msgstr "תרגילים"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "ניהול"
@@ -631,7 +675,7 @@ msgstr "קטגוריות"
msgid "Nutrition"
msgstr "תזונה"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "תכנונים תזונתיים"
@@ -652,7 +696,7 @@ msgstr ""
msgid "Body weight"
msgstr "משקל גוף"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr ""
@@ -668,7 +712,7 @@ msgstr "תמיכה ולקיחת חלק"
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "רישיון"
@@ -680,42 +724,42 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "תרגום"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "איפוס סיסמה"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "התנתקות"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "ההעדפות שלי"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "רישיונות"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "מכוני כושר"
@@ -765,34 +809,26 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr "צוות %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "סגירה"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "תנאי השימוש"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -800,37 +836,162 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
+
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
msgid "API key"
msgstr "מפתח API"
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "מפתח ה־API שלך"
+#: core/templates/user/api_key.html:156
+msgid "Delete current API key and generate new one"
+msgstr ""
+
+#: core/templates/user/api_key.html:158
+msgid "Generate new API key"
+msgstr ""
+
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "API key"
+msgid "Delete API key"
+msgstr "מפתח API"
-#: core/templates/user/api_key.html:21
+#: core/templates/user/api_key.html:184
msgid "You have no API key yet"
msgstr ""
-#: core/templates/user/api_key.html:46
-msgid "Delete current API key and generate new one"
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
msgstr ""
-#: core/templates/user/api_key.html:49
-msgid "Generate new API key"
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "תיעוד"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "תיעוד"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "מחיקת חשבון"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "לבצע פעולה זו?"
@@ -843,102 +1004,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "אין חשבון?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "שכחת את הסיסמה?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "תיאור"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "פעילות אחרונה"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "לא נמצאו אימונים."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "הערות"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "אנרגיה"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "חלבונים"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "שומנים"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "ק׳ קלוריות"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -947,114 +1100,112 @@ msgstr "ק׳ קלוריות"
msgid "Actions"
msgstr "פעולו"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "נטרול חשבון"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "הפעלת חשבון"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "לא"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "כן"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "פרטים"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "טלפון"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "כתובת"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "כניסה אחרונה"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "סטטוס"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "פעיל"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "לא פעיל"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "הורדה"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1062,78 +1213,102 @@ msgid "Preferences"
msgstr "העדפות"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "איפוס סיסמה"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "מחיקת חשבון"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1145,52 +1320,64 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1220,45 +1407,141 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/history/overview.html:27
-msgid "Action"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "מחיקה"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translate"
+msgid "translations"
+msgstr "תרגום"
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "שם פרטי"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "שם משפחה"
+
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
msgstr ""
@@ -1279,6 +1562,33 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr ""
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr ""
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr ""
@@ -1377,15 +1687,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1477,7 +1787,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1551,11 +1861,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1572,15 +1882,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -1992,26 +2302,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2064,53 +2374,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Nutrition"
msgid "Portion"
@@ -2154,77 +2464,99 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
+msgid "Ingredient pagination"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "שם פרטי"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "תזונה"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2296,38 +2628,38 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
#, fuzzy
#| msgid "Sample nutritional plan"
msgid "Nutritional data"
msgstr "דיאטה לדוגמא"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2686,35 +3018,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2832,6 +3164,19 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "בשימוש עבור איפוס סיסמה וגם, באופן אופציונלי, לתזכורות בדואר האלקטרוני."
+
+#~ msgid "Workout reminders"
+#~ msgstr "תזכורות לאימונים"
+
+#~ msgid "Allow external access"
+#~ msgstr "לאפשר גישה חיצונית"
+
+#~ msgid "Your API key"
+#~ msgstr "מפתח ה־API שלך"
+
#~ msgid "Email verification"
#~ msgstr "אימות כתובת דוא״ל"
diff --git a/wger/locale/hi/LC_MESSAGES/django.po b/wger/locale/hi/LC_MESSAGES/django.po
index a6da4fe15..0dbd7279c 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -30,10 +30,10 @@ msgstr ""
"इस इंस्टॉलेशन के लिए डिफ़ॉल्ट जिम चुनें। यह सभी नए पंजीकृत उपयोगकर्ताओं को इस जिम को "
"असाइन करेगा और बिना जिम वाले सभी मौजूदा उपयोगकर्ताओं को अपडेट करेगा।"
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -45,85 +45,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "संपादन"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "फ़ॉर्म reCAPTCHA द्वारा सुरक्षित है"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "रजिस्टर"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "पहला नाम"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "उपनाम"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "ईमेल"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr ""
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "ईमेल"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -131,28 +127,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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
#, fuzzy
msgid "Delete"
msgstr "मितादे"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "अवैध पासवर्ड"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "फ़ॉर्म reCAPTCHA द्वारा सुरक्षित है"
+#: core/forms.py:289
+msgid "Confirm"
+msgstr ""
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -224,148 +223,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -373,8 +342,7 @@ msgstr ""
msgid "Repetitions"
msgstr ""
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -383,12 +351,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -467,6 +435,74 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+msgid "Current email"
+msgstr ""
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+msgid "Resend confirmation email"
+msgstr ""
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+msgid "Change email"
+msgstr ""
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "लॉग इन करें"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -474,7 +510,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr ""
@@ -493,7 +529,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "भाषाएँ"
@@ -502,15 +538,15 @@ msgid "Nothing found."
msgstr "कुछ नहीं मिला"
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "एक नया जोड़ें |"
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -524,14 +560,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr ""
@@ -541,9 +576,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -558,7 +593,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -570,7 +605,7 @@ msgstr ""
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr ""
@@ -582,7 +617,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -604,7 +639,7 @@ msgstr ""
msgid "Exercises"
msgstr "व्यायाम"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -631,7 +666,7 @@ msgstr ""
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr ""
@@ -652,7 +687,7 @@ msgstr ""
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr ""
@@ -668,7 +703,7 @@ msgstr ""
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr ""
@@ -680,42 +715,42 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -765,34 +800,26 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr ""
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -800,37 +827,159 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr ""
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+msgid "Delete API key"
+msgstr "मितादे"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr ""
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+msgid "API documentation"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -843,102 +992,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -947,114 +1088,112 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1062,78 +1201,100 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr ""
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Invalid password"
+msgid "Set password"
+msgstr "अवैध पासवर्ड"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:52
+msgid "Off"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1145,52 +1306,64 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1220,45 +1393,138 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/history/overview.html:27
-msgid "Action"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+msgid "deleted"
+msgstr "मितादे"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+msgid "translations"
+msgstr ""
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "पहला नाम"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
+msgstr ""
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "उपनाम"
+
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
msgstr ""
@@ -1279,6 +1545,33 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr ""
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr ""
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr ""
@@ -1377,15 +1670,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1477,7 +1770,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1551,11 +1844,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1572,15 +1865,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -1990,26 +2283,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2062,53 +2355,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr ""
@@ -2150,77 +2443,99 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
+#, fuzzy
+#| msgid "Ingredients"
+msgid "Ingredient pagination"
+msgstr "सामग्री"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "पहला नाम"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+msgid "Nutri-Score"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2292,38 +2607,38 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
#, fuzzy
#| msgid "Sample nutritional plan"
msgid "Nutritional data"
msgstr "उदाहरणात्मक पोषण योजना"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2682,35 +2997,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2845,6 +3160,3 @@ msgstr ""
#~| msgid "Add one now."
#~ msgid "Add one now"
#~ msgstr "एक नया जोड़ें |"
-
-#~ msgid "Ingredients"
-#~ msgstr "सामग्री"
diff --git a/wger/locale/hr/LC_MESSAGES/django.po b/wger/locale/hr/LC_MESSAGES/django.po
index e2ba23796..811206249 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+0000\n"
"PO-Revision-Date: 2026-05-05 10:11+0000\n"
"Last-Translator: Milo Ivir <[email protected]>\n"
"Language-Team: Croatian <https://hosted.weblate.org/projects/wger/web/hr/>\n"
@@ -32,10 +32,10 @@ msgstr ""
"registrirane korisnike ovoj teretani i aktualizirati sve postojeće korisnike "
"bez teretane."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -47,87 +47,82 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Uredi"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Obrazac je zaštićen pomoću reCAPTCHA"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Registracija"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Ime"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Prezime"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "E-mail adresa"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Datum rođenja"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Osobni podaci"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Podsjetitelji za treninge"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Druge postavke"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Spremi"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "E-mail adresa"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Ova se e-mail adresa već koristi."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Lozinka"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Upiši svoju aktualnu lozinku."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -135,27 +130,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Izbriši"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Nevaljana lozinka"
-#: 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:289
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Confirm"
+msgstr "Potvrdi e-mail adresu"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Pošalji"
@@ -229,34 +229,10 @@ msgid "Imperial (pound)"
msgstr "Britanski (funta)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Pokaži komentare vježbe"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Označi za prikaz komentara vježbe u prikazu treninga"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Također koristi sastojke na engleskom jeziku"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Označi za prikaz sastojaka i na engleskom jeziku prilikom\n"
-"izrade plana prehrane. Ovi sastojci su izvađeni iz popisa Ministarstva\n"
-"poljoprivrede SAD-a. Iznimno je potpun, s oko 7.000 unosa, ali je možda\n"
-"previše i otežava pretragu."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Aktiviraj podsjetnike za treninge"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -264,19 +240,19 @@ msgstr ""
"Označi za aktiviranje automatskih podsjetnika za treninge. Moraš upisati "
"valjanu e-mail adresu."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Podsjeti prije isteka"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Broj dana za podsjećivanje prije isteka treninga."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Standardno trajanje treninga"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -284,11 +260,11 @@ msgstr ""
"Standardno trajanje treninga u tjednima koji nisu u rasporedu. Koristi se za "
"e-mail podsjetnike treninga."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Jezik obavijesti"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -296,94 +272,81 @@ msgstr ""
"Jezik e-mail obavijesti, npr. e-mail podsjetnike za treninge. Ne utječe na "
"jezik koji se koristi na web-stranici."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Dob"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Veličina (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Sati spavanja"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Prosječni broj sati spavanja dnevno"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Posao"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Prosječni broj sati dnevno"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Fizički napor"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Prosječno"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Prosječni broj sati tjedno"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Slobodno vrijeme"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Ukupna dnevna koločina kalorija"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Ukupni dnevni unos kalorija, uključujući npr. višak"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Jedinica težine"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Dozvoli eksterni pristup"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Dopusti eksternim korisnicima pristup tvojim treninzima i zapisima bez "
-"mogućnosti mijenjanja. Ovo moraš postaviti prije dijeljenja poveznica, npr. "
-"na društvene medije."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Automatski podsjenici za unose težine"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Broj dana nakon zadnjeg unosa težine (upiši 0 za deaktiviranje)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "Uključi trofeje"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
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:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Zbroj svih sati mora biti 24"
@@ -391,8 +354,7 @@ msgstr "Zbroj svih sati mora biti 24"
msgid "Repetitions"
msgstr "Ponavljanja"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Vrijeme"
@@ -401,12 +363,12 @@ msgid "Distance"
msgstr "Udaljenost"
#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:283 core/views/user.py:605
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Ime"
@@ -494,6 +456,86 @@ msgstr "Ako gumb ne radi, kopiraj i zalijepi ovu poveznicu u preglednik:"
msgid "the wger Team"
msgstr "wger tim"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "E-mail adrese"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Trenutačna verzija"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Pošalji e-mail za ovjeru"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Prikaži promjene"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Promjene"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Change email"
+msgstr "Potvrdi e-mail adresu"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Prijava"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Zaboravio/la si lozinku?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Nemaš račun?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr "Već imaš korisnički račun?"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -503,7 +545,7 @@ msgstr ""
"Pregledavaš stranicu kao korisnik „%(current_user)s”, sve radnje se izvode s "
"njegovim podacima."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Natrag na „%(target)s”"
@@ -527,7 +569,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Jezici"
@@ -536,15 +578,15 @@ msgid "Nothing found."
msgstr "Ništa nije pronađeno."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -558,14 +600,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Opcije"
@@ -575,9 +616,9 @@ msgstr "Popis licenca"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -592,7 +633,7 @@ msgstr "Popis licenca"
msgid "Nothing found"
msgstr "Ništa nije pronađeno"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Impresum"
@@ -604,7 +645,7 @@ msgstr "Treniranje"
msgid "Routines"
msgstr "Rutine"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Kalendar"
@@ -616,7 +657,7 @@ msgstr "Mjerenja"
msgid "Gallery"
msgstr "Galerija"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr "Trofeje"
@@ -638,7 +679,7 @@ msgstr "Javni predlošci"
msgid "Exercises"
msgstr "Vježbe"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administracija"
@@ -663,7 +704,7 @@ msgstr "Kategorije"
msgid "Nutrition"
msgstr "Prehrana"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Planovi prehrane"
@@ -684,7 +725,7 @@ msgstr "Pregled sastojaka"
msgid "Body weight"
msgstr "Tjelesna težina"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Pregled težine"
@@ -700,7 +741,7 @@ msgstr "Podrška i sudjelovanje"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licenca"
@@ -712,42 +753,42 @@ msgstr "Dokumentacija za programere"
msgid "Get the code"
msgstr "Nabavi izvorni kod"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Prevedi"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Obnovi lozinku"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Odjava"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Moje postavke"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licence"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Jedinice ponavljanja"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Jedinice težine"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Popis korisnika"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Teretane"
@@ -801,35 +842,27 @@ msgstr "Hvala što koristiš našu stranicu!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s tim"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "prethodno"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "dalje"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Zatvori"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Stvori neke demo snimke"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Uvjeti usluge"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr "Jezik preglednika"
@@ -837,37 +870,169 @@ msgstr "Jezik preglednika"
msgid "Features"
msgstr "Značajke"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API ključ"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Tvoj API ključ"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Još nemaš API ključ"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Generiraj novi API ključ"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Stvori raspored"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Sesija treninga"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API ključ"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Izbriši aktualni API ključ i generiraj novi"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Generiraj novi API ključ"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Generiraj novi API ključ"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Još nemaš API ključ"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokumentacija"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentacija"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Izbriši račun"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Jesi li siguran/na?"
@@ -884,102 +1049,94 @@ msgstr ""
"dnevnike, itd.)\n"
"i ne može se poništiti. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Nemaš račun?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Zaboravio/la si lozinku?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "zadnjih %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Opis"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Broj dnevnika (dani)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Zadnja aktivnost"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Nije pronađen nijedan trening."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Zapis"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Opći dojam"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Bilješke"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energija"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Proteini"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Ugljikohidrati"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Mast"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,193 +1145,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "Radnje"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Deaktiviraj korisnika"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Aktiviraj korisnika"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Obnovi korisničku lozinku"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Uloge"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Potvrda obnavljanja lozinke"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr "Stvarno želiš promijeniti lozinku ovog korisnika?"
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Ne"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Da"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalji"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Br."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresa"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registriran/a"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Zadnja prijava"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Stanje"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktivno"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Neaktivno"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Ugovori"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenti"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Preuzimanje"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Uključi u neaktivni pregled"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Prijavi se kao ovaj korisnik"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Prijavi se kao ovaj korisnik"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Postavke"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Ovjerena e-mail adresa"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Neovjerena e-mail adresa"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Pošalji e-mail za ovjeru"
-
-#: core/templates/user/preferences.html:31
-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:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Promjeni lozinku"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
-msgstr "Već imaš korisnički račun?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Obnovi lozinku"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Izbriši račun"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "unca"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Uspješno izbrisano"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Izbrisati {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Uredi {0}"
@@ -1189,52 +1368,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Račun „{0}” je uspješno izbrisan"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Uspješno si registriran/a"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Postavke su uspješno aktualizirane"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Odaberi jednu od donjih opcija."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Korisnik je uspješno deaktiviran"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Korisnik je uspješno aktiviran"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Uredi korisnika"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Da, izbriši"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Korisničko ime"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Teretana"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Na latinskom, npr. „Pectoralis major”"
@@ -1264,44 +1459,160 @@ msgstr "Datoteka nije valjana video datoteka"
msgid "Equipment list"
msgstr "Popis opreme"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Povijest administratora vježbe"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Radnja"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Uredi set"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Korisnik"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Uredi set"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Uredi set"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr "Primijeni"
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr "Resetiraj"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+#, fuzzy
+#| msgid "Dedicated"
+msgid "created"
+msgstr "Posvećen"
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Izbriši"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Prijevod"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Da, izbriši"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Obnovi promjene"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Objekt"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Promjene"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Obnovi promjene"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Obnovi"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Prikaži objekt"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Prikaži promjene"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Obnovi promjene"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Dietary information"
+msgid "History pagination"
+msgstr "Informacije o prehrani"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Ime"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "prethodno"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Prezime"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1323,6 +1634,33 @@ msgstr "Dodaj novu opremu"
msgid "Delete equipment?"
msgstr "Izbrisati opremu?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Korisnik"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Vrsta"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Radnja"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Dodaj mičić"
@@ -1423,15 +1761,15 @@ msgstr "Datum početka"
msgid "End date"
msgstr "Datum kraja"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Poštanski broj"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Grad"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Ulica"
@@ -1523,7 +1861,7 @@ msgstr "Popis teretana"
msgid "Global gym configuration"
msgstr "Globalna konfiguracija teretane"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Dodaj novu teretanu"
@@ -1602,11 +1940,11 @@ msgstr ""
"Lozinka ovog korisnika je obnovljena. Obavijesti korisnika o njegovoj novoj "
"lozinci."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Dodaj bilješku"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Dodaj ugovor"
@@ -1623,15 +1961,15 @@ msgstr "Izbriši {0}"
msgid "Add contract type"
msgstr "Dodaj vrstu ugovora"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Spol"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Dodaj korisnika teretani"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Uredi teretanu"
@@ -2031,26 +2369,26 @@ msgstr "Vježba"
msgid "Routine will expire soon"
msgstr "Rutina će uskoro isteći"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Loše"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutralno"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Dobro"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Ako upišeš vrijeme, moraš upisati vrijeme početka i vrijeme kraja."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Vrijeme početka ne može biti prije vremena kraja."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2110,27 +2448,27 @@ msgstr "Trening"
msgid "Workout for %s"
msgstr "Trening za %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr "Porcija"
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Jedinica"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Osnovni unos kalorija"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Osnovni unos kalorija izračunat za tvoje podatke"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Dodatne kalorije"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2138,27 +2476,27 @@ msgstr ""
"Dodatne kalorije za dodavanje osnovnoj stopi (za oduzimanje upiši negativan "
"broj)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr "grama (g)"
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Sastojak"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Također traži imena na engleskom jeziku"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr "Količina"
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr "Unesi količinu i odaberi grame (g) ili jednu od jedinica porcija."
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr "Porcija"
@@ -2210,77 +2548,101 @@ msgstr ""
"prilikom registracije, dobit ćeš obavijest kada postupak uspješno završi."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr "Veganski"
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr "Vegetarijanski"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Nema satojaka."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Kategorije sastojaka"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Ime"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "prethodno"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "dalje"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Traži"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
msgid "Filter"
msgstr "Filtar"
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
-msgstr "Primijeni"
-
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
-msgstr "Resetiraj"
-
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Makronutrijenti"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Količina šećera u ugljikohidratima"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "--"
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Količina zasićene masti u mastima"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Drugi"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Vlakna"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Natrij"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr "Informacije o prehrani"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Prehrana"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Dodaj novu jedinicu težine"
@@ -2368,36 +2730,36 @@ msgstr ""
"temeljiš na ovim vrijednostima, prati razvoj par tjedana i\n"
"po potrebi promijeni ukupnu količinu."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Dodaj novi sastojak"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Plan prehrane"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan prehrane za %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Podaci prehrane"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Ukupno"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Postotak energije"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g po tjelesnim kg"
@@ -2799,35 +3161,35 @@ msgstr "Izvorni kod"
msgid "Translation"
msgstr "Prijevod"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Da, izbriši"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Izvorni naslov ovog objekta, ako postoji"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Poveznica na izvorni objekt, ako postoji"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Autori"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Ako nisi autor, ovdje upiši ime ili izvor."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Poveznica na profil autora, ako postoji"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Poveznica na izvorni izvor, ako je ovo izvedeno djelo"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2970,6 +3332,64 @@ msgstr ""
msgid "Re-Submit"
msgstr "Pošalji ponovo"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Koristi se za obnavljanje lozinki i opcionalno za podsjetnike putem e-"
+#~ "pošte."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Podsjetitelji za treninge"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Pokaži komentare vježbe"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Označi za prikaz komentara vježbe u prikazu treninga"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Također koristi sastojke na engleskom jeziku"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Označi za prikaz sastojaka i na engleskom jeziku prilikom\n"
+#~ "izrade plana prehrane. Ovi sastojci su izvađeni iz popisa Ministarstva\n"
+#~ "poljoprivrede SAD-a. Iznimno je potpun, s oko 7.000 unosa, ali je možda\n"
+#~ "previše i otežava pretragu."
+
+#~ msgid "Allow external access"
+#~ msgstr "Dozvoli eksterni pristup"
+
+#~ 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 ""
+#~ "Dopusti eksternim korisnicima pristup tvojim treninzima i zapisima bez "
+#~ "mogućnosti mijenjanja. Ovo moraš postaviti prije dijeljenja poveznica, "
+#~ "npr. na društvene medije."
+
+#~ msgid "Your API key"
+#~ msgstr "Tvoj API ključ"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "Za dodavanje vježbi moraš ovjeriti tvoju e-mail adresu"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Uspješno si registriran/a"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "E-mail za ovjeru je poslan na %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Prikaži objekt"
+
#~ msgid "Email verification"
#~ msgstr "Ovjeravanje e-mail adrese"
@@ -3145,9 +3565,6 @@ msgstr "Pošalji ponovo"
#~ msgid "Brand name of product"
#~ msgstr "Ime proizvoda"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Kategorije sastojaka"
-
#~ msgid "Amount in grams"
#~ msgstr "Količina u gramima"
@@ -3358,9 +3775,6 @@ msgstr "Pošalji ponovo"
#~ "Možeš tražiti više od jedne vježbe. Vježbe će se grupirati u jedan "
#~ "nadskup."
-#~ msgid "Type"
-#~ msgstr "Vrsta"
-
#~ msgid "Table"
#~ msgstr "Tablica"
@@ -3459,9 +3873,6 @@ msgstr "Pošalji ponovo"
#~ msgid "Log overview"
#~ msgstr "Pregled zapisa"
-#~ msgid "Workout session"
-#~ msgstr "Sesija treninga"
-
#~ msgid "Delete with logs"
#~ msgstr "Izbriži sa zapisima"
@@ -3613,9 +4024,6 @@ msgstr "Pošalji ponovo"
#~ "ponavljanja, to\n"
#~ "automatski postaje „4 × 10”."
-#~ msgid "Edit set"
-#~ msgstr "Uredi set"
-
#~ msgid "Update"
#~ msgstr "Aktualiziraj"
@@ -3662,9 +4070,6 @@ msgstr "Pošalji ponovo"
#~ msgid "Delete workout log"
#~ msgstr "Izbriši zapis treninga"
-#~ msgid "Create schedule"
-#~ msgstr "Stvori raspored"
-
#~ msgid "Edit workout"
#~ msgstr "Uredi trening"
@@ -3856,9 +4261,6 @@ msgstr "Pošalji ponovo"
#~ "bazu podataka. Sve dok se ne pregleda, neće se vidjeti u pregledu ili\n"
#~ "pretrazi."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Odaberi jednu od donjih opcija."
-
#~ msgid "Accept"
#~ msgstr "Prihvati"
diff --git a/wger/locale/hu/LC_MESSAGES/django.po b/wger/locale/hu/LC_MESSAGES/django.po
index c7b8819d5..5e9cc8083 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -33,10 +33,10 @@ msgstr ""
"hozzárendeli az összes újonnan regisztrált felhasználót ehhez az "
"edzőteremhez, és frissíti az összes meglévő edzőterem nélküli felhasználót."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -48,87 +48,82 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Módosítás"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Ez az űrlap reCAPTCHA-val van biztosítva"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Regisztráció"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Keresztnév"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Vezetéknév"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Email"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Születés Időpontja"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Személyes adat"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Edzés emlékeztetők"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Egyéb beállítások"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Mentés"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Email"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Ez az e-mail cím már használatban van."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Jelszó"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Kérlek írd be a jelenlegi jelszavad."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -136,27 +131,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Törlés"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Érvénytelen jelszó"
-#: 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:289
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm"
+msgstr "Beállítás"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -230,31 +230,10 @@ msgid "Imperial (pound)"
msgstr "Birodalmi (font)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Gyakorlat hozzászólások megjelenítése"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-"Jelöld be, hogy megjelenjenek a gyakorlatok hozzászólásai az edzések nézetben"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Használjon hozzávalókat Angolul is"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Edzés emlékeztetők aktiválása"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -262,29 +241,29 @@ msgstr ""
"Jelöld be, hogy aktiváljuk az automatikus emlékeztetőket az edzésekhez. "
"Ennek a működéséhez meg kell adnod egy érvényes email címet."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Emlékeztess a lejárat előtt"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "A napok száma, amivel az edzés lejárta előtt értesítsünk."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Edzések alapértelmezett időtartama"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Értesítési nyelv"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -292,91 +271,81 @@ msgstr ""
"A nyelv amit használunk az email értesítésekhez, pl.: edzés email "
"emlékeztetők. Ez nem befolyásolj a weboldalon használt nyelvet."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Kor"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Magasság (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Napi alvás órában"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Az átlag alvás órában per nap"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Munka"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Átlag órák száma per nap"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Fizikai megterhelés mértéke"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Megközelítőleg"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Átlag órák száma per hét"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Szabadidő"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Teljes napi kalória"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Teljes kalória bevitel, beleérve pl: bármilyen többlet"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Súly egység"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Külső hozzáférés engedélyezése"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Az órák összegének meg kell egyeznie 24-el"
@@ -384,8 +353,7 @@ msgstr "Az órák összegének meg kell egyeznie 24-el"
msgid "Repetitions"
msgstr "Ismétlések"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Idő"
@@ -394,12 +362,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Név"
@@ -480,6 +448,86 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Address"
+msgid "Email address"
+msgstr "Cím"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Configuration"
+msgid "Current email"
+msgstr "Beállítás"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Configuration"
+msgid "Resend confirmation email"
+msgstr "Beállítás"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "Change password"
+msgid "Cancel change"
+msgstr "Jelszó megváltoztatása"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Change password"
+msgid "Change to"
+msgstr "Jelszó megváltoztatása"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Configuration"
+msgid "Change email"
+msgstr "Beállítás"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Bejelentkezés"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Elfelejtett jelszó?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Nincs fiókod?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -487,7 +535,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Vissza \"%(target)s\""
@@ -506,7 +554,7 @@ msgstr ""
msgid "Are you sure you want to delete this? This action cannot be undone."
msgstr "Biztosan törölni akarod? Ez a művelet nem visszavonható."
-#: core/templates/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Nyelvek"
@@ -515,15 +563,15 @@ msgid "Nothing found."
msgstr "Nincs találat."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -537,14 +585,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Beállítások"
@@ -554,9 +601,9 @@ msgstr "Licenc lista"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -571,7 +618,7 @@ msgstr "Licenc lista"
msgid "Nothing found"
msgstr "Nincs találat"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -583,7 +630,7 @@ msgstr ""
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Naptár"
@@ -595,7 +642,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -621,7 +668,7 @@ msgstr ""
msgid "Exercises"
msgstr "Gyakorlatok"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Adminisztráció"
@@ -648,7 +695,7 @@ msgstr "Kategóriák"
msgid "Nutrition"
msgstr "Táplálkozás"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Táplálkozási tervek"
@@ -669,7 +716,7 @@ msgstr "Összetevő áttekintés"
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Súly áttekintés"
@@ -685,7 +732,7 @@ msgstr ""
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licenc"
@@ -697,42 +744,42 @@ msgstr ""
msgid "Get the code"
msgstr "Szerezd meg a kódot"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Lefordítás"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Új jelszó igénylése"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Kijelentkezés"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Beállításaim"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licencek"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Edzőtermek"
@@ -782,36 +829,28 @@ msgstr "Köszönjük, hogy használod az oldalunkat!"
msgid "The %(site_name)s team"
msgstr "A %(site_name)s csapat"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "előző"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "következő"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Bezárás"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Készíts egy pár demó bejegyzést"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -819,37 +858,166 @@ msgstr ""
msgid "Features"
msgstr "Funkciók"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API kulcs"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Az API kulcsod"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Még nincs API kulcsod"
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Új API kulcs generálása"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Ütemterv létrehozása"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API kulcs"
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Jelenlegi API kulcs törlése és új generálása"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Új API kulcs generálása"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Új API kulcs generálása"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Még nincs API kulcsod"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokumentáció"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentáció"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Fiók törlése"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Biztos vagy benne?"
@@ -862,102 +1030,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Nincs fiókod?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Elfelejtett jelszó?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "utolsó %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Leírás"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Bejegyzések száma (napok)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Utolsó tevékenység"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Nem található edzés."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Bejegyzések"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Általános benyomás"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Megjegyzések"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Fehérje"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Szénhidrát"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Zsír"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -966,193 +1126,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "Műveletek"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Felhasználó deaktiviálása"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Felhasználó aktiválása"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Szerepek"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Jelszó igénylés megerősítése"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Részletek"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "sz."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Cím"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Regisztrálva"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Utolsó bejelentkezés"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Státusz"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktív"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inaktív"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumentumok"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Letöltés"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Bejelentkezés mint ez a felhasználó"
+
+#: core/templates/user/overview.html:539
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
-msgstr "Bejelentkezés mint ez a felhasználó"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Beállítások"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Jelszó megváltoztatása"
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Új jelszó igénylése"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:52
+msgid "Off"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
-msgstr "Jelszó megváltoztatása"
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Fiók törlése"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Sikeresen törölve"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Töröljem {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} módosítása"
@@ -1164,52 +1346,68 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "A \"{0}\" fiók sikeresen törölve"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Sikeresen regisztráltál"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Beállítások sikeresen frissítve"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Kérlek válassz egyet az alábbi lehetőség közül."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "A felhasználó sikeresen deaktiválva"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "A felhasználó sikeresen aktiválva"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Felhasználó módosítása"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Igen, töröld"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Felhasználónév"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Edzőterem"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latinul, pl.: \"Pectoralis major\""
@@ -1241,51 +1439,147 @@ msgstr ""
msgid "Equipment list"
msgstr "Felszerelés lista"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
#, fuzzy
#| msgid "Exercise Categories"
msgid "Exercise admin history"
msgstr "Gyakorlati kategóriák"
-#: exercises/templates/history/overview.html:27
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
+msgstr ""
+
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
#, fuzzy
-#| msgid "Actions"
-msgid "Action"
-msgstr "Műveletek"
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Törlés"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Felhasználó"
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:113
+msgid "into"
msgstr ""
-#: exercises/templates/history/overview.html:31
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
#, fuzzy
-#| msgid "Change password"
-msgid "Changes"
-msgstr "Jelszó megváltoztatása"
+#| msgid "Translate"
+msgid "translations"
+msgstr "Lefordítás"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Igen, töröld"
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
msgstr ""
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Keresztnév"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "előző"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Vezetéknév"
+
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
msgstr "Izom áttekintés"
@@ -1306,6 +1600,35 @@ msgstr "Új felszerelés hozzáadása"
msgid "Delete equipment?"
msgstr "Felszerelés törlése?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Felhasználó"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Műveletek"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Izom hozzáadása"
@@ -1408,15 +1731,15 @@ msgstr "Kezdés dátuma"
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Irányítószám"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Város"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Utca"
@@ -1508,7 +1831,7 @@ msgstr "Edzőterem lista"
msgid "Global gym configuration"
msgstr "Globális edzőterem beállítás"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Új edzőterem hozzáadása"
@@ -1582,11 +1905,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Új megjegyzés hozzáadása"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1603,15 +1926,15 @@ msgstr "Töröljem {0}"
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Felhasználó hozzáadása az edzőteremhez"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Edzőterem módosítása"
@@ -2031,26 +2354,26 @@ msgstr "Gyakorlat"
msgid "Routine will expire soon"
msgstr ""
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Rossz"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Semleges"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Jó"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "A kezdő időpont nem lehet a vég időpont után."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2103,55 +2426,55 @@ msgstr "Edzés"
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
#, 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
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Duration"
msgid "Portion"
@@ -2195,77 +2518,101 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Nincs összetevő."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "ingredient name"
+msgid "Ingredient pagination"
+msgstr "összetevő neve"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Keresztnév"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "előző"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "következő"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Keresés"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Táplálkozás"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2337,38 +2684,38 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
#, fuzzy
#| msgid "Nutrition plan"
msgid "Nutritional data"
msgstr "Táplálkozási terv"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2751,35 +3098,35 @@ msgstr ""
msgid "Translation"
msgstr "Lefordítás"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Igen, töröld"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2897,6 +3244,34 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ 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."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Edzés emlékeztetők"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Gyakorlat hozzászólások megjelenítése"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Jelöld be, hogy megjelenjenek a gyakorlatok hozzászólásai az edzések "
+#~ "nézetben"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Használjon hozzávalókat Angolul is"
+
+#~ msgid "Allow external access"
+#~ msgstr "Külső hozzáférés engedélyezése"
+
+#~ msgid "Your API key"
+#~ msgstr "Az API kulcsod"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Sikeresen regisztráltál"
+
#, fuzzy
#~| msgid "Configuration"
#~ msgid "Email verification"
@@ -3134,9 +3509,6 @@ msgstr ""
#~ msgid "Mark as workout"
#~ msgstr "Edzéseid"
-#~ msgid "Create schedule"
-#~ msgstr "Ütemterv létrehozása"
-
#~ msgid "Edit workout"
#~ msgstr "Edzés módosítása"
@@ -3177,9 +3549,6 @@ msgstr ""
#~ msgid "Submission date"
#~ msgstr "Beküldési dátum"
-#~ msgid "Please select one of the options below."
-#~ msgstr "Kérlek válassz egyet az alábbi lehetőség közül."
-
#~ msgid "Accept"
#~ msgstr "Elfogad"
@@ -3201,9 +3570,6 @@ msgstr ""
#~ msgid "This workout is part of a schedule:"
#~ msgstr "Ez az edzés egy ütemterv része:"
-#~ msgid "ingredient name"
-#~ msgstr "összetevő neve"
-
#~ msgid "Only registered users can do this"
#~ msgstr "Csak regisztrált felhasználók láthatják"
diff --git a/wger/locale/it/LC_MESSAGES/django.po b/wger/locale/it/LC_MESSAGES/django.po
index 9dd6e71d8..69d2615f0 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+0000\n"
"PO-Revision-Date: 2026-05-23 22:11+0000\n"
"Last-Translator: Dario Coltri <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/wger/web/it/>\n"
@@ -39,10 +39,10 @@ msgstr ""
"sarà assegnata a tutti i nuovi utenti e a tutti gli utenti già registrati "
"che non ne hanno una."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -54,89 +54,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Modifica"
-#: 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 "Accedi"
+#: core/forms.py:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Questo modulo è protetto con reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Registrati"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Nome"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Cognome"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Email"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data di nascita"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Dati personali"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Promemoria allenamento"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Altre impostazioni"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Salva"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Email"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Questo indirizzo e-mail è già in uso."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Password"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Si prega di inserire la tua password attuale."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -144,27 +138,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Elimina"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Password non valida"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "Questo modulo è protetto con reCAPTCHA"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Confirm"
+msgstr "Conferma email"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Invia"
@@ -238,37 +237,10 @@ msgid "Imperial (pound)"
msgstr "Imperiali (libbra)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Mostra commenti sugli esercizi"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-"Spunta per vedere i commenti sugli esercizi nel programma di allenamento"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Usa anche gli ingredienti in inglese"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Spunta per mostrare gli ingredienti in Inglese durante la creazione\n"
-"di un piano nutrizionale. Questi ingredienti sono prelevati da un elenco "
-"fornito\n"
-"dal Dipartimento dell'Agricoltura degli Stati Uniti. È estremamente "
-"completo, con circa\n"
-"7000 voci, ma può risultare un po' snervante e rendere la ricerca difficile."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Attiva i promemoria per l'allenamento"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -276,21 +248,21 @@ msgstr ""
"Spunta per attivare i promemoria automatici per gli allenamenti. Devi "
"inserire una e-mail valida affinchè funzioni."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Ricorda prima della scadenza"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Il numero di giorni per cui desideri ricevere un promemoria prima della "
"scadenza di un allenamento."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Durata predefinita dell'allenamento"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -298,11 +270,11 @@ msgstr ""
"Durata predefinita in settimane di allenamenti non in programma. Utilizzato "
"per i promemoria dell'allenamento tramite e-mail."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Lingua di notifica"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -311,96 +283,83 @@ msgstr ""
"promemoria per l'allenamento. Questo non modifica il linguaggio usato nel "
"sito web."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Età"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Altezza (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Ore di sonno"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "La media delle ore di sonno giornaliere"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Lavoro"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Media ore per giorno"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Intensità fisica"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Circa"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Media ore per settimana"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Tempo libero"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Totale giornaliero calorico"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totale calorico, incluso es. qualsiasi eccesso calorico"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Unità"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Permetti accessi esterni"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Consenti agli utenti esterni di accedere ai tuoi allenamenti e registri in "
-"modalità di sola lettura. È necessario impostarlo prima di poter condividere "
-"i collegamenti, ad es. sui social media."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Promemoria automatici per le registrazioni del peso"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Numero di giorni dopo l'ultima registrazione del peso (immettere 0 per "
"disattivare)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "Abilita trofei"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr "Abilita o disabilita il sistema dei trofei per questo utente"
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "La somma di tutte le ore deve essere 24"
@@ -408,8 +367,7 @@ msgstr "La somma di tutte le ore deve essere 24"
msgid "Repetitions"
msgstr "Ripetizioni"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Tempo"
@@ -418,12 +376,12 @@ msgid "Distance"
msgstr "Distanza"
#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:283 core/views/user.py:605
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Nome"
@@ -513,6 +471,86 @@ msgstr ""
msgid "the wger Team"
msgstr "Il team wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "E-mail"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Versione attuale"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Invia email di verifica"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Guarda cambiamenti"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Variazioni"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Change email"
+msgstr "Conferma email"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Accedi"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Password dimenticata?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Nessun account?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr "Hai già un account?"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -522,7 +560,7 @@ msgstr ""
"Stai visitando il sito come \"%(current_user)s\", tutte le azioni sono "
"effettuate sui suoi dati."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Ritorna a «%(target)s»"
@@ -546,7 +584,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Lingue"
@@ -555,15 +593,15 @@ msgid "Nothing found."
msgstr "Nessun risultato."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -577,14 +615,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Opzioni"
@@ -594,9 +631,9 @@ msgstr "Elenco delle licenze"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -611,7 +648,7 @@ msgstr "Elenco delle licenze"
msgid "Nothing found"
msgstr "Trovato niente"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Impressum"
@@ -623,7 +660,7 @@ msgstr "Allenamento"
msgid "Routines"
msgstr "Programmi"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Calendario"
@@ -635,7 +672,7 @@ msgstr "Misure"
msgid "Gallery"
msgstr "Galleria"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr "Trofei"
@@ -657,7 +694,7 @@ msgstr "Modelli pubblici"
msgid "Exercises"
msgstr "Esercizi"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Amministrazione"
@@ -682,7 +719,7 @@ msgstr "Categorie"
msgid "Nutrition"
msgstr "Piano nutrizionale"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Piani nutrizionali"
@@ -703,7 +740,7 @@ msgstr "Panoramica alimenti"
msgid "Body weight"
msgstr "Peso corporeo"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Panoramica peso corporeo"
@@ -719,7 +756,7 @@ msgstr "Sostieni e partecipa"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licenza"
@@ -731,42 +768,42 @@ msgstr "Documentazione dello sviluppatore"
msgid "Get the code"
msgstr "Ottieni il codice"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduci"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Reimposta la password"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Esci"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Preferenze"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenza"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unità di ripetizione"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Unità peso"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista utenti"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Palestre"
@@ -821,36 +858,28 @@ msgstr "Grazie per aver usato il nostro sito!"
msgid "The %(site_name)s team"
msgstr "I creatori di %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "precedente"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "successivo"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Chiudi"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Crea alcune voci demo"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termini di servizio"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr "Lingua del browser"
@@ -858,37 +887,168 @@ msgstr "Lingua del browser"
msgid "Features"
msgstr "Caratteristiche"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Chiave API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "La tua chiave API"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Non hai ancora una chiave API"
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Genera una nuova chiave API"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Crea programmazione"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Sessione di allenamento"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Chiave API"
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Elimina la chiave API corrente e generane una nuova"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Genera una nuova chiave API"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Genera una nuova chiave API"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Non hai ancora una chiave API"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Documentazione"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentazione"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Cancella account"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Sei sicuro/a?"
@@ -905,102 +1065,94 @@ msgstr ""
"(allenamenti, registri, ecc.)\n"
"e non può essere annullato. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Nessun account?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Password dimenticata?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "ultimo %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Descrizione"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Numero di registri (giorni)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Ultima attività"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Nessun allenamento trovato."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Diario"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Impressioni generali"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Note"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Proteine"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Carboidrati"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Grassi"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1009,193 +1161,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "Azioni"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Disattiva utente"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Attiva utente"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Reset password utente"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Ruoli"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Reset password confermato"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "No"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Si"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Dettagli"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Numero"
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Numero"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Via"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registrato"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Ultimo login"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Stato"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Attivo"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inattivo"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contratti"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documenti"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Scarica"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Includi in una panoramica inattiva"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Entra come questo utente"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Entra come questo utente"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Preferenze"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Email verificata"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Email non verificata"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Invia email di verifica"
-
-#: core/templates/user/preferences.html:31
-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:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Cambia la password"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
-msgstr "Hai già un account?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Reimposta la password"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Cancella account"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Eliminato con successo"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Eliminare {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Modifica {0}"
@@ -1211,52 +1385,68 @@ msgstr ""
"vedere meglio ciò che questo sito può fare. Sentiti libero di modificarli o "
"cancellarli!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "L'account «{0}» è stato eliminato con successo"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Ti sei registrato/a con successo"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Impostazioni aggiornate con successo"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Per favore seleziona una delle opzione specificate."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Utente è stato disattivato con successo"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Utente è stato attivato con successo"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Modifica utente"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Sì, elimina"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Nome utente"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Palestra"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "In latino es. «Pectoralis major»"
@@ -1286,44 +1476,160 @@ msgstr "Il file non è un video valido"
msgid "Equipment list"
msgstr "Lista attrezzatura"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Storico allenamenti admin"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Azione"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Modifica serie"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Utente"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Modifica serie"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Modifica serie"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr "Applica"
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr "Reset"
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+#, fuzzy
+#| msgid "Dedicated"
+msgid "created"
+msgstr "Impegnato"
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Elimina"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Traduzione"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Sì, elimina"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Ripristina cambiamenti"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Oggetto"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Variazioni"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Ripristina cambiamenti"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Ripristina"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Vedi Oggetto"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Guarda cambiamenti"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Ripristina cambiamenti"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Dietary information"
+msgid "History pagination"
+msgstr "Informazioni nutrizionali"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Nome"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "precedente"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Cognome"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1345,6 +1651,33 @@ msgstr "Aggiungi nuova attrezzatura"
msgid "Delete equipment?"
msgstr "Cancella attrezzatura?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Utente"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Tipo"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Azione"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Aggiungi muscolo"
@@ -1443,15 +1776,15 @@ msgstr "Data di partenza"
msgid "End date"
msgstr "Data fine"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Codice postale"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Città"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Via"
@@ -1547,7 +1880,7 @@ msgstr "Lista palestre"
msgid "Global gym configuration"
msgstr "Configurazione globale"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Aggiungi nuova palestra"
@@ -1627,11 +1960,11 @@ msgstr ""
"La password di questo utente è stata ripristinata. Si prega di avvisare "
"l'utente della sua nuova password."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Aggiungi nota"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Aggiungi contratto"
@@ -1648,15 +1981,15 @@ msgstr "Elimina {0}"
msgid "Add contract type"
msgstr "Aggiunti tipo del contratto"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Sesso"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Aggiungi membro alla palestra"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Modifica palestra"
@@ -2056,27 +2389,27 @@ msgstr "Esercizio"
msgid "Routine will expire soon"
msgstr "Il programma scadrà presto"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Cattivo"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutrale"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Buono"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
"Se inserisci un'ora, devi inserire sia l'ora di inizio che quella di fine."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "L'ora di inizio non può essere successiva all'ora di fine."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2140,27 +2473,27 @@ msgstr "Allenamento"
msgid "Workout for %s"
msgstr "Allenamento per %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr "Dose"
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Unità"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Assunzione calorica di base"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
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:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Calorie aggiuntive"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2168,29 +2501,29 @@ msgstr ""
"Calorie aggiuntive da aggiungere alla tariffa base (per sottrarre, inserire "
"un numero negativo)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr "grammi (g)"
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Alimenti"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Usa anche i nomi in inglese"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr "Quantità"
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
"Inserisci una quantità e scegli grammi (g) o una delle unità di misura per "
"porzione."
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr "Porzione"
@@ -2246,77 +2579,101 @@ msgstr ""
"successo."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr "Vegano"
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr "Vegetariano"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Nessun ingrediente."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Categorie ingredienti"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Nome"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "precedente"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "successivo"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Ricerca"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
msgid "Filter"
msgstr "Filtro"
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
-msgstr "Applica"
-
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
-msgstr "Reset"
-
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Macronutrienti"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Zuccheri contenuti nei carboidrati"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "n.D."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Grassi saturi contenuti nei grassi"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Altri"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Fibra"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Sodio"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr "Informazioni nutrizionali"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Piano nutrizionale"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Aggiungi una nuova unità di peso"
@@ -2407,36 +2764,36 @@ msgstr ""
"osserva\n"
"te stesso per alcune settimane e modificare l'importo totale, se necessario."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Aggiungi un nuovo ingrediente"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Piano nutrizionale"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Piano nutrizionale per %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Dati nutrizionali"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Totale"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Percentuale di energia"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g per peso in kg"
@@ -2849,35 +3206,35 @@ msgstr "Codice Sorgente"
msgid "Translation"
msgstr "Traduzione"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Sì, elimina"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Il titolo originale di questo progetto, se disponibile"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Link all'oggetto originale, se disponibile"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Autore(i)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Se non sei l'autore, inserisci qui il nome o la fonte."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Link al profilo dell'autore, se disponibile"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Link alla risorsa originale, se si tratta di un'opera derivata"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3024,6 +3381,68 @@ msgstr ""
msgid "Re-Submit"
msgstr "Re-Invia"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Usato per reimpostare la password e, opzionalmente, per i promemoria via "
+#~ "e-mail."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Promemoria allenamento"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Mostra commenti sugli esercizi"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Spunta per vedere i commenti sugli esercizi nel programma di allenamento"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Usa anche gli ingredienti in inglese"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Spunta per mostrare gli ingredienti in Inglese durante la creazione\n"
+#~ "di un piano nutrizionale. Questi ingredienti sono prelevati da un elenco "
+#~ "fornito\n"
+#~ "dal Dipartimento dell'Agricoltura degli Stati Uniti. È estremamente "
+#~ "completo, con circa\n"
+#~ "7000 voci, ma può risultare un po' snervante e rendere la ricerca "
+#~ "difficile."
+
+#~ msgid "Allow external access"
+#~ msgstr "Permetti accessi esterni"
+
+#~ 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 ""
+#~ "Consenti agli utenti esterni di accedere ai tuoi allenamenti e registri "
+#~ "in modalità di sola lettura. È necessario impostarlo prima di poter "
+#~ "condividere i collegamenti, ad es. sui social media."
+
+#~ msgid "Your API key"
+#~ msgstr "La tua chiave API"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "Devi confermare l'email per contribuire agli esercizi"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Ti sei registrato/a con successo"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "Un'email di verifica è stata inviata a %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Vedi Oggetto"
+
#~ msgid "Email verification"
#~ msgstr "Verifica email"
@@ -3201,9 +3620,6 @@ msgstr "Re-Invia"
#~ msgid "Brand name of product"
#~ msgstr "Nome del produttore"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Categorie ingredienti"
-
#~ msgid "Amount in grams"
#~ msgstr "Quantità in grammi"
@@ -3407,9 +3823,6 @@ msgstr "Re-Invia"
#~ msgstr ""
#~ "Puoi cercare più di un esercizio, saranno raggruppati in un Superset."
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
#~ msgid "Table"
#~ msgstr "Tabella"
@@ -3511,9 +3924,6 @@ msgstr "Re-Invia"
#~ msgid "Log overview"
#~ msgstr "Panoramica del registro"
-#~ msgid "Workout session"
-#~ msgstr "Sessione di allenamento"
-
#~ msgid "Delete with logs"
#~ msgstr "Elimina con i registri"
@@ -3677,9 +4087,6 @@ msgstr "Re-Invia"
#~ "le ripetizioni, questo\n"
#~ "diventa automaticamente «4 × 10»."
-#~ msgid "Edit set"
-#~ msgstr "Modifica serie"
-
#~ msgid "Update"
#~ msgstr "Aggiorna"
@@ -3728,9 +4135,6 @@ msgstr "Re-Invia"
#~ msgid "Delete workout log"
#~ msgstr "Elimina registro allenamento"
-#~ msgid "Create schedule"
-#~ msgstr "Crea programmazione"
-
#~ msgid "Edit workout"
#~ msgstr "Modifica allenamento"
@@ -3928,9 +4332,6 @@ msgstr "Re-Invia"
#~ "o\n"
#~ "la ricerca."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Per favore seleziona una delle opzione specificate."
-
#~ msgid "Accept"
#~ msgstr "Accetta"
diff --git a/wger/locale/ja/LC_MESSAGES/django.po b/wger/locale/ja/LC_MESSAGES/django.po
index a890ff07a..3ce3a1708 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -35,10 +35,10 @@ msgstr ""
"新規ユーザーがこのジムに割り当てられ、ジムを利用していない全ての既存ユーザー"
"を更新します。"
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -50,89 +50,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "編集"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "このフォームはreCAPTCHAによって保護されています"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "登録"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "名前"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "姓"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "メール"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr ""
-"パスワードの再設定、またはオプションとしてメールのリマインダー通知に使用され"
-"ます。"
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "生年月日"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "パーソナルデータ"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "ワークアウトリマインダー通知"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "その他の設定"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "保存"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "メール"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "パスワードのリセットと、メールでのリマインドに使われます。"
-#: core/forms.py:238
+#: core/forms.py:234
#, fuzzy
#| msgid "This email is already used."
msgid "This e-mail address is already in use."
msgstr "このメールアドレスは既に登録済みです。"
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "パスワード"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "現在のパスワードを入力してください。"
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -140,27 +134,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "削除"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "パスワードは無効です。"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "このフォームはreCAPTCHAによって保護されています"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm"
+msgstr "設定"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -234,148 +233,118 @@ msgid "Imperial (pound)"
msgstr "ヤード・ポンド法(ポンド)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "通知言語"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "年齢"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "身長(cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "睡眠時間"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "一日あたりの平均睡眠時間"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "スポーツ"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "体重の単位"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -383,8 +352,7 @@ msgstr ""
msgid "Repetitions"
msgstr "回数"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -393,12 +361,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -481,6 +449,80 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Configuration"
+msgid "Current email"
+msgstr "設定"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Configuration"
+msgid "Resend confirmation email"
+msgstr "設定"
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Configuration"
+msgid "Change email"
+msgstr "設定"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "ログイン"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -488,7 +530,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr ""
@@ -507,7 +549,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "言語"
@@ -516,15 +558,15 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "今すぐ追加する"
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -538,14 +580,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "オプション"
@@ -555,9 +596,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -572,7 +613,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -584,7 +625,7 @@ msgstr ""
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "カレンダー"
@@ -596,7 +637,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -618,7 +659,7 @@ msgstr ""
msgid "Exercises"
msgstr "運動"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -645,7 +686,7 @@ msgstr ""
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr ""
@@ -666,7 +707,7 @@ msgstr ""
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr ""
@@ -682,7 +723,7 @@ msgstr ""
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "ライセンス"
@@ -694,42 +735,42 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "翻訳"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "パスワード再設定"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "ロッグアウト"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -779,34 +820,26 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "閉じる"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "使用条件"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -814,37 +847,159 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
+
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
msgid "API key"
msgstr "APIキー"
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:156
+msgid "Delete current API key and generate new one"
+msgstr ""
+
+#: core/templates/user/api_key.html:158
+msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:21
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "API key"
+msgid "Delete API key"
+msgstr "APIキー"
+
+#: core/templates/user/api_key.html:184
msgid "You have no API key yet"
msgstr ""
-#: core/templates/user/api_key.html:46
-msgid "Delete current API key and generate new one"
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
msgstr ""
-#: core/templates/user/api_key.html:49
-msgid "Generate new API key"
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+msgid "API documentation"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -857,102 +1012,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "エネルギー"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "タンパク質"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "炭水化物"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "脂肪質"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -961,114 +1108,112 @@ msgstr "kcal"
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "ダウンロード"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1076,78 +1221,100 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "パスワード再設定"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1159,52 +1326,64 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1234,47 +1413,141 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/history/overview.html:27
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
+msgstr ""
+
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
#, fuzzy
-#| msgid "Options"
-msgid "Action"
-msgstr "オプション"
+#| msgid "Delete"
+msgid "deleted"
+msgstr "削除"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
+#: exercises/templates/history/overview.html:100
+msgid "merged"
msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:113
+msgid "into"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:123
+msgid "media"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translate"
+msgid "translations"
+msgstr "翻訳"
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "名前"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "姓"
+
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
msgstr ""
@@ -1295,6 +1568,37 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr ""
+
+#: exercises/views/history.py:117
+#, fuzzy
+#| msgid "Unit"
+msgid "Type"
+msgstr "単位"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+#, fuzzy
+#| msgid "Options"
+msgid "Action"
+msgstr "オプション"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr ""
@@ -1395,15 +1699,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "郵便番号"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "市"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "住所"
@@ -1495,7 +1799,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1569,11 +1873,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "ノート追加"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1590,15 +1894,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "性別"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -2006,26 +2310,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2078,53 +2382,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "単位"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "基礎カロリー摂取量"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "材料"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Options"
msgid "Portion"
@@ -2168,77 +2472,99 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
+#, fuzzy
+#| msgid "Ingredient"
+msgid "Ingredient pagination"
+msgstr "材料"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "名前"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "ナトリウム"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+msgid "Nutri-Score"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2310,38 +2636,38 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
#, fuzzy
#| msgid "Personal data"
msgid "Nutritional data"
msgstr "パーソナルデータ"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2710,35 +3036,35 @@ msgstr ""
msgid "Translation"
msgstr "翻訳"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2856,6 +3182,14 @@ msgstr ""
msgid "Re-Submit"
msgstr ""
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "パスワードの再設定、またはオプションとしてメールのリマインダー通知に使用さ"
+#~ "れます。"
+
+#~ msgid "Workout reminders"
+#~ msgstr "ワークアウトリマインダー通知"
+
#, fuzzy
#~| msgid "Configuration"
#~ msgid "Email verification"
diff --git a/wger/locale/ko/LC_MESSAGES/django.po b/wger/locale/ko/LC_MESSAGES/django.po
index 34cb22dd6..f482ad507 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+0000\n"
"PO-Revision-Date: 2026-03-22 19:09+0000\n"
"Last-Translator: Hosted Weblate user 141821 "
@@ -32,10 +32,10 @@ msgstr ""
"이 설치에 대한 기본 Gym을 선택하십시오. 새로 등록된 모든 사용자가 이 Gym에 할"
"당되고, Gym이 없는 모든 기존 사용자가 업데이트됩니다."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -47,85 +47,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "편집"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "양식은 reCAPTCHA로 보호됩니다"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "등록"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "이름"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "성"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "이메일"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr "비밀번호 재설정 및 이메일 알람(option)에 사용됩니다."
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "생일"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "개인 정보"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Workout 리마인더"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "기타 설정"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "저장"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "이메일"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "비밀번호 재설정 및 이메일 알람(option)에 사용됩니다."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "이 이메일 주소는 이미 사용중입니다."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "비밀번호"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "현재 비밀번호를 입력해주세요."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -133,27 +129,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "삭제"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "유효하지 않은 비밀번호"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "양식은 reCAPTCHA로 보호됩니다"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "확인되지 않은 이메일"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "보내기"
@@ -227,34 +228,10 @@ msgid "Imperial (pound)"
msgstr "야드파운드법 (pound)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "운동 코멘트 표시"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "workout 보기에 운동 코멘트를 표시하려면 이 항목을 선택하세요"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "원료를 영어로도 함께 표기하세요"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"영양 계획을 작성할 때 재료를 영어로도 표시하려면 체크하세요.\n"
-"이러한 재료는 미국 농무부에서 제공하는 목록에서 추출한 것입니다.\n"
-"약 7,000개의 항목이 포함되어 매우 완벽하지만,\n"
-"너무 많아서 검색이 어려울 수 있습니다."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Workout 리마인더 활성화"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -262,29 +239,29 @@ msgstr ""
"운동 자동 알림을 활성화하려면 체크하세요. 이 기능을 사용하려면 유효한 이메일 "
"주소를 입력해야 합니다."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "만료 전에 알림"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "운동이 만료되기 전에 알림을 받을 일수입니다."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "운동의 기본 기간"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr "일정에 없는 운동의 기본 기간(주)입니다. 이메일 운동 알림에 사용됩니다."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "알람 언어"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -292,93 +269,81 @@ msgstr ""
"이메일 알림을 보낼 때 사용할 언어(예: 운동 관련 이메일 알림). 웹사이트에서 사"
"용되는 언어에는 영향을 미치지 않습니다."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "나이"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "키 (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "수면시간"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "일 평균 수면시간"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "운동"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "하루 평균 시간"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "육체적 강도"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "약"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "스포츠"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "주당 평균 시간"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "자유 시간"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "총 일일 칼로리"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "예를 들어 잉여분을 포함한 총 칼로리 섭취량"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "몸무게 단위"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "외부 접근 허용"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"외부 사용자가 운동 및 로그에 읽기 전용 모드로 접근할 수 있도록 허용합니다. 소"
-"셜 미디어 등에 링크를 공유하려면 먼저 이 설정을 해야 합니다."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "체중 입력에 대한 자동 알림"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "마지막 체중 입력 후 경과 일수(비활성화하려면 0 입력)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "모든 시간의 합은 24이어야 합니다"
@@ -386,8 +351,7 @@ msgstr "모든 시간의 합은 24이어야 합니다"
msgid "Repetitions"
msgstr "반복"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "시간"
@@ -396,12 +360,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "이름"
@@ -494,6 +458,86 @@ msgstr ""
msgid "the wger Team"
msgstr "wger 팀"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "이메일"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "현재 버젼"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "확인 이메일 보내기"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "변경 보기"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "변경"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "확인되지 않은 이메일"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "로그인"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "비밀번호를 잊었나요?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "계정이 없나요?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -503,7 +547,7 @@ msgstr ""
"\"%(current_user)s\" 계정으로 사이트를 탐색하고 있습니다, 모든 작업은 해당 데"
"이터를 대상으로 수행됩니다."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "\"%(target)s\"로 이동"
@@ -526,7 +570,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "언어"
@@ -535,15 +579,15 @@ msgid "Nothing found."
msgstr "찾을 수 없음."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "추가하세요."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -557,14 +601,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "옵션"
@@ -574,9 +617,9 @@ msgstr "라이센스 리스트"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -591,7 +634,7 @@ msgstr "라이센스 리스트"
msgid "Nothing found"
msgstr "데이터가 없습니다"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "날인"
@@ -603,7 +646,7 @@ msgstr "트레이닝"
msgid "Routines"
msgstr "루틴"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "달력"
@@ -615,7 +658,7 @@ msgstr "측정"
msgid "Gallery"
msgstr "갤러리"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -637,7 +680,7 @@ msgstr "공용 템플릿"
msgid "Exercises"
msgstr "운동"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "관리"
@@ -662,7 +705,7 @@ msgstr "카테고리"
msgid "Nutrition"
msgstr "영양"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "영양소 섭취 계획"
@@ -683,7 +726,7 @@ msgstr "성분 개요"
msgid "Body weight"
msgstr "체중"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "체중 개요"
@@ -699,7 +742,7 @@ msgstr "지원 및 참여"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "라이선스"
@@ -711,42 +754,42 @@ msgstr "개발 가이드"
msgid "Get the code"
msgstr "코드 정보"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "번역"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "비밀번호 변경"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "로그아웃"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "내 환경설정"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "라이선스"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "반복 단위"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "무게 단위"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "사용자 리스트"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "체육관"
@@ -800,36 +843,28 @@ msgstr "저희 사이트를 이용해 주셔서 감사합니다!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s 팀"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "이전"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "다음"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "닫기"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"귀하는 게스트 계정을 사용하고 계시므로, 입력하신 데이터는 일주일 후 삭제됩니"
"다."
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "데모용 계정 만들기"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "서비스 약관"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -837,37 +872,167 @@ msgstr ""
msgid "Features"
msgstr "특징"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "아직 API key가 없습니다"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "새로운 API key 생성"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "일정 생성"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Session"
+msgid "JWT sessions"
+msgstr "세션"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API key"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "현재 API key 삭제하고 새 키를 생성하세요"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "새로운 API key 생성"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "새로운 API key 생성"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "아직 API key가 없습니다"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "문서"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "문서"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "계정 삭제"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "확실합니까?"
@@ -883,102 +1048,94 @@ msgstr ""
"또한 관련된 모든 데이터(Workout, 로그 등)를 완전히 제거하며, 취소할 수 없습"
"니다. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "계정이 없나요?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "비밀번호를 잊었나요?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "마지막 %(number)s 개"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "설명"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "로그 수(일)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "최종 활동"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Workout을 찾을 수 없음."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "로그"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "일반적인 인상"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "메모"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "에너지"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "단백질"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "탄수화물"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "지방"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,193 +1144,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "활동"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "사용자 비활성화"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "사용자 활성화"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "사용자 비밀번호 변경"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "권한"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "비밀번호 변경 확인"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr "정말로 이 사용자의 비밀번호를 변경하시겠습니까?"
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "아니요"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "예"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "세부정보"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "핸드폰"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "주소"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "등록"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "최종 로그인"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "상태"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "활성"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "비활성"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "계약"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "문서"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "다운로드"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "비활성 개요에 포함"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "이 사용자로 로그인하세요"
+
+#: core/templates/user/overview.html:539
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "관리자 로그인은 %(gym_name)s의 사용자만 사용할 수 있습니다"
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
-msgstr "이 사용자로 로그인하세요"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "환경설정"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "확인된 이메일"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "확인되지 않은 이메일"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "확인 이메일 보내기"
-
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
-msgstr "운동에 참여하려면 이메일을 확인해야 합니다"
-
-#: core/templates/user/preferences.html:55 core/views/user.py:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "비밀번호 변경"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "비밀번호 변경"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "계정 삭제"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "삭제 성공"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "{0} 삭제하시겠어요?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} 편집"
@@ -1187,52 +1366,66 @@ msgstr ""
"이 사이트의 기능을 더 잘 확인하실 수 있도록 샘플 운동, 운동 일정, 체중 기록, "
"(신체) 체중 및 영양 계획 항목을 만들었습니다. 자유롭게 수정하거나 삭제하세요!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "계정 \"{0}\"이 성공적으로 삭제되었습니다"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "성공적으로 등록되었습니다"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "설정이 업데이트 되었습니다"
-#: core/views/user.py:396
+#: core/views/user.py:314
+msgid "Please correct the errors below."
+msgstr ""
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "사용자가 성공적으로 비활성화되었습니다"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "사용자가 성공적으로 활성화되었습니다"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "사용자 편집"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "예, 삭제합니다"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "사용자이름"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "짐"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr "%(email)s로 확인 이메일이 전송되었습니다"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "라틴어로 예를 들어 \"Pectoralis major\""
@@ -1262,44 +1455,152 @@ msgstr "파일이 유효한 비디오가 아닙니다"
msgid "Equipment list"
msgstr "장비 리스트"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "운동 관리 기록"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "활동"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
+msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "사용자"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "삭제"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "번역"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "예, 삭제합니다"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "변경사항 되돌리기"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "오브젝트"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "변경"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "변경사항 되돌리기"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "되돌리기"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "오브젝트 보기"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "변경 보기"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "변경사항 되돌리기"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Date format"
+msgid "History pagination"
+msgstr "날짜 포맷"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "이름"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "이전"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "성"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1321,6 +1622,35 @@ msgstr "새 장비 추가"
msgid "Delete equipment?"
msgstr "장비를 삭제하시겠습니까?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "사용자"
+
+#: exercises/views/history.py:117
+#, fuzzy
+#| msgid "Types"
+msgid "Type"
+msgstr "유형"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "활동"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "근육 추가"
@@ -1419,15 +1749,15 @@ msgstr "시작 날짜"
msgid "End date"
msgstr "종료 날짜"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "우편번호"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "시(도)"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "주소"
@@ -1521,7 +1851,7 @@ msgstr "Gym 리스트"
msgid "Global gym configuration"
msgstr "기본 Gym 환경설정"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "새 Gym 추가"
@@ -1600,11 +1930,11 @@ msgid ""
msgstr ""
"이 사용자의 비밀번호가 재설정되었습니다. 사용자에게 새 비밀번호를 알려주세요."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "노트 추가"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "계약 추가"
@@ -1621,15 +1951,15 @@ msgstr "{0} 삭제"
msgid "Add contract type"
msgstr "계약 유형 추가"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "성별"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Gym에 사용자 추가"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "gym 편집"
@@ -2049,26 +2379,26 @@ msgstr "예시"
msgid "Routine will expire soon"
msgstr "루틴이 곧 만료됩니다"
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr "시작 시간은 종료 시간 이후일 수 없습니다."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "나쁜"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "중립적"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "좋은"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "시간을 입력하는 경우 시작 시간과 종료 시간을 모두 입력해야 합니다."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "시작 시간은 종료 시간 이후일 수 없습니다."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2128,53 +2458,53 @@ msgstr "운동"
msgid "Workout for %s"
msgstr "%s 를 위한 운동"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "단위"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "기본 칼로리 섭취량"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "귀하의 데이터에 따라 계산된 기본 칼로리 섭취량"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "추가적인 칼로리"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr "기본에 추가할 칼로리 (빼려면 음수 입력)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "성분"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "영어 이름도 검색해 보세요"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2228,83 +2558,107 @@ msgstr ""
"등록할 때 이메일을 추가한 경우, 성공적으로 완료되면 알림을 받습니다."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "변형"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "성분이 없습니다."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "성분 카테고리"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "이름"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "이전"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "다음"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "검색"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "다량 영양소"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "탄수화물의 당 함량"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "지방의 포화지방 함량"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "기타"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "섬유질"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "나트륨"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Date format"
msgid "Dietary information"
msgstr "날짜 포맷"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "영양"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "새로운 체중 단위 추가"
@@ -2391,36 +2745,36 @@ msgstr ""
"이 값을 기준으로 영양 계획을 세우는 경우, 몇 주 동안 자신의 상태를 관찰하고\n"
"필요에 따라 총량을 변경하세요."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "새로운 성분 추가"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "영양 계획"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "%s의 영양 계획"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>이건 빈 계획인데, PDF에서 무엇을 기대하셨나요?</i>"
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "영양 데이터"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "총"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "에너지 비율"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g 몸당 kg"
@@ -2818,35 +3172,35 @@ msgstr "소스코드"
msgid "Translation"
msgstr "번역"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "예, 삭제합니다"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "이 객체의 원래 제목(있는 경우)"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "가능한 경우 원본 객체에 대한 링크"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "작성자"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "본인이 저자가 아닌 경우, 여기에 이름이나 출처를 입력하세요."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "가능한 경우 작성자 프로필에 대한 링크"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "이것이 파생 작품인 경우 원본 소스에 대한 링크를 제공하십시오"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2989,6 +3343,61 @@ msgstr ""
msgid "Re-Submit"
msgstr "다시 제출"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr "비밀번호 재설정 및 이메일 알람(option)에 사용됩니다."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Workout 리마인더"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "운동 코멘트 표시"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "workout 보기에 운동 코멘트를 표시하려면 이 항목을 선택하세요"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "원료를 영어로도 함께 표기하세요"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "영양 계획을 작성할 때 재료를 영어로도 표시하려면 체크하세요.\n"
+#~ "이러한 재료는 미국 농무부에서 제공하는 목록에서 추출한 것입니다.\n"
+#~ "약 7,000개의 항목이 포함되어 매우 완벽하지만,\n"
+#~ "너무 많아서 검색이 어려울 수 있습니다."
+
+#~ msgid "Allow external access"
+#~ msgstr "외부 접근 허용"
+
+#~ 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 ""
+#~ "외부 사용자가 운동 및 로그에 읽기 전용 모드로 접근할 수 있도록 허용합니"
+#~ "다. 소셜 미디어 등에 링크를 공유하려면 먼저 이 설정을 해야 합니다."
+
+#~ msgid "Your API key"
+#~ msgstr "API key"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "운동에 참여하려면 이메일을 확인해야 합니다"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "성공적으로 등록되었습니다"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "%(email)s로 확인 이메일이 전송되었습니다"
+
+#~ msgid "View Object"
+#~ msgstr "오브젝트 보기"
+
#~ msgid "Email verification"
#~ msgstr "이메일 인증 설정"
@@ -3107,9 +3516,6 @@ msgstr "다시 제출"
#~ msgid "Order"
#~ msgstr "주문"
-#~ msgid "Session"
-#~ msgstr "세션"
-
#~ msgid "Creation date"
#~ msgstr "생성일"
@@ -3160,9 +3566,6 @@ msgstr "다시 제출"
#~ msgid "Brand name of product"
#~ msgstr "제품의 브랜드 이름"
-#~ msgid "Ingredient Categories"
-#~ msgstr "성분 카테고리"
-
#~ msgid "Amount in grams"
#~ msgstr "그램당 함유량"
@@ -3371,9 +3774,6 @@ msgstr "다시 제출"
#~ msgid "Export this workout as a calendar file."
#~ msgstr "이 Workout을 달력파일로 내보내기"
-#~ msgid "Create schedule"
-#~ msgstr "일정 생성"
-
#~ msgid "Successfully deleted."
#~ msgstr "삭제되었습니다."
diff --git a/wger/locale/mk/LC_MESSAGES/django.po b/wger/locale/mk/LC_MESSAGES/django.po
index 28a7ad895..18cfa9c14 100644
--- a/wger/locale/mk/LC_MESSAGES/django.po
+++ b/wger/locale/mk/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-05-22 09:11+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -48,46 +48,46 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: core/forms.py:91 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"
+#: core/forms.py:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr ""
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
msgstr ""
-#: core/forms.py:130 core/forms.py:247 gym/views/export.py:62
-#: gym/views/gym.py:219
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr ""
-#: core/forms.py:131 core/forms.py:248 core/templates/user/overview.html:310
-#: gym/views/export.py:63 gym/views/gym.py:219
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr ""
-#: core/forms.py:133 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:188
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:195
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: core/forms.py:203 core/views/user.py:667 core/views/user.py:691
-#: core/views/user.py:705 gym/forms.py:73 utils/generic_views.py:132
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:218 core/templates/user/overview.html:314
+#: core/forms.py:210 core/templates/user/overview.html:314
#: 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:61
@@ -97,24 +97,24 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:219
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:242
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:264 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:219
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:266
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:275 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
#: core/templates/user/overview.html:259
@@ -130,22 +130,25 @@ msgstr ""
msgid "Delete"
msgstr ""
-#: core/forms.py:284
+#: core/forms.py:276
msgid "Invalid password"
msgstr ""
-#: core/forms.py:296 core/forms.py:364
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: core/forms.py:322 core/forms.py:354 core/templates/navigation.html:269
-#: core/templates/navigation.html:282 core/templates/template.html:114
-#: core/templates/user/login.html:21 core/views/user.py:319
-#: software/templates/features.html:87 software/templates/features.html:442
-msgid "Register"
+#: core/forms.py:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
msgstr ""
-#: core/forms.py:375 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -217,148 +220,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:65
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -375,12 +348,12 @@ msgid "Distance"
msgstr ""
#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:306 core/views/user.py:642
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:160 nutrition/templates/ingredient/view.html:242
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -460,7 +433,7 @@ msgid "the wger Team"
msgstr ""
#: core/templates/account/email_change.html:4
-#: core/templates/user/preferences.html:56
+#: core/templates/user/preferences.html:25
msgid "Email address"
msgstr ""
@@ -496,6 +469,37 @@ msgstr ""
msgid "Change email"
msgstr ""
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr ""
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -522,7 +526,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -557,9 +561,8 @@ msgstr ""
msgid "Add"
msgstr ""
-#: core/templates/language/view.html:61 core/templates/user/preferences.html:51
-#: gym/models/contract.py:203 gym/templates/contract/view.html:41
-#: gym/templates/gym/member_list.html:270
+#: core/templates/language/view.html:61 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr ""
@@ -611,7 +614,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -633,7 +636,7 @@ msgstr ""
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -712,37 +715,37 @@ msgstr ""
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -831,14 +834,61 @@ msgid ""
msgstr ""
#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
msgid "JWT sessions"
msgstr ""
-#: core/templates/user/api_key.html:29
+#: core/templates/user/api_key.html:123
msgid "Revoke all JWT sessions"
msgstr ""
-#: core/templates/user/api_key.html:35
+#: core/templates/user/api_key.html:129
#, python-format
msgid ""
"\n"
@@ -853,33 +903,33 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/templates/user/api_key.html:44
+#: core/templates/user/api_key.html:138
msgid ""
"Revoking JWT sessions logs out every device that obtained a refresh token "
"via the JWT login endpoint."
msgstr ""
-#: core/templates/user/api_key.html:49 core/templates/user/preferences.html:64
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
msgid "API key"
msgstr ""
-#: core/templates/user/api_key.html:62
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:64
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:80
+#: core/templates/user/api_key.html:174
msgid "Delete API key"
msgstr ""
-#: core/templates/user/api_key.html:90
+#: core/templates/user/api_key.html:184
msgid "You have no API key yet"
msgstr ""
-#: core/templates/user/api_key.html:96
+#: core/templates/user/api_key.html:190
#, python-format
msgid ""
"\n"
@@ -888,20 +938,38 @@ msgid ""
" "
msgstr ""
-#: core/templates/user/api_key.html:102
+#: core/templates/user/api_key.html:196
msgid "Example with curl:"
msgstr ""
-#: core/templates/user/api_key.html:116 software/templates/features.html:533
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
-#: core/templates/user/api_key.html:119
+#: core/templates/user/api_key.html:213
msgid "API documentation"
msgstr ""
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:67
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
@@ -918,14 +986,6 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
@@ -959,8 +1019,8 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:43 core/views/user.py:643
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:160
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
@@ -987,22 +1047,22 @@ msgid "Weight"
msgstr ""
#: core/templates/user/overview.html:176
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:244
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
#: core/templates/user/overview.html:177
-#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:250
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
#: core/templates/user/overview.html:178
-#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:258
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
#: core/templates/user/overview.html:179
-#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:272
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
@@ -1063,8 +1123,8 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:302 gym/views/export.py:58
-#: manager/helpers.py:89 nutrition/views/plan.py:150
-#: nutrition/views/plan.py:156
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
@@ -1135,27 +1195,47 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:28
-msgid "Manage email address"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr ""
+
+#: core/templates/user/preferences.html:42
+msgid "Set password"
msgstr ""
-#: core/templates/user/preferences.html:32
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:60 core/views/user.py:654
-msgid "Change password"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
#: core/templatetags/wger_extras.py:108 i18n.tpl:39
@@ -1193,20 +1273,20 @@ msgstr ""
#: 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:207 gym/views/gym.py:483
+#: gym/views/document.py:207 gym/views/gym.py:489
#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
#: core/views/languages.py:118 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:505
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:187 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:172
-#: gym/views/gym.py:465 nutrition/views/ingredient.py:238
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1218,56 +1298,61 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:152
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:313
-msgid "You were successfully registered"
-msgstr ""
-
-#: core/views/user.py:341
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:344
+#: core/views/user.py:314
msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:406
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:458
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:473
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:531
+#: core/views/user.py:503
msgid "API key was deleted"
msgstr ""
-#: core/views/user.py:536
+#: core/views/user.py:508
msgid "All API sessions were revoked"
msgstr ""
-#: core/views/user.py:640 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:160
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: core/views/user.py:641 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
-#: gym/views/gym.py:160 gym/views/gym.py:219
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:644 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:59 gym/views/gym.py:219
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
@@ -1672,7 +1757,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:173
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1771,11 +1856,11 @@ msgstr ""
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:346
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:445
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -2173,23 +2258,23 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/session.py:37
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:38
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:39
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:139
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:152
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2249,49 +2334,49 @@ msgstr ""
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:472
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr ""
@@ -2375,7 +2460,7 @@ msgstr ""
msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
@@ -2383,7 +2468,7 @@ msgstr ""
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
@@ -2397,7 +2482,7 @@ msgstr ""
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
@@ -2405,11 +2490,11 @@ msgstr ""
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
@@ -2497,32 +2582,32 @@ msgstr ""
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
diff --git a/wger/locale/nl/LC_MESSAGES/django.po b/wger/locale/nl/LC_MESSAGES/django.po
index 9f68f59e9..6df391525 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -38,10 +38,10 @@ msgstr ""
"nieuwe geregistreerde gebruikers aan deze sportschool toevoegen en alle "
"bestaande gebruikers zonder sportschool bijwerken."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -53,89 +53,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Bewerk"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Dit formulier is beveiligd met reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Registreer"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Voornaam"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Achternaam"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "E-mail"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Geboortedatum"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Persoonlijke gegevens"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Workout-herinneringen"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Overige instellingen"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Opslaan"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "E-mail"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Dit e-mailadres wordt al gebruikt."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Wachtwoord"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Gelieve je huidige wachtwoord in te geven."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -143,27 +137,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Verwijder"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Ongeldig wachtwoord"
-#: 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:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Niet geverifieerde email"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Insturen"
@@ -238,37 +237,10 @@ msgid "Imperial (pound)"
msgstr "Imperiaal (pond)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Toon opmerkingen oefening"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-"Vink aan om de opmerkingen bij de oefeningen te tonen in de workout view"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Gebruik ook Engelstalige ingrediënten"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Vink aan om ook ingrediënten in het Engels te tonen bij het aanmaken van\n"
-"een voedingsschema. Deze ingrediënten worden uit een lijst gehaald die\n"
-"aangeboden wordt door het Amerikaanse Departement voor Landbouw. Deze lijst "
-"is bijzonder\n"
-"compleet, met ongeveer 7000 ingrediënten, maar kan ook overweldigend zijn en "
-"je zoektocht bemoeilijken"
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Activeer workout-herinneringen"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -276,20 +248,20 @@ msgstr ""
"Aanvinken om automatische herinneringen voor je workouts te activeren. Je "
"moet een geldig e-mailadres invoeren om hiervan gebruik te maken."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Herinner voor vervaldatum"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Het aantal dagen dat je wil herinnerd worden vooraleer een workout vervalt."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Standaard duurtijd van workouts"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -297,11 +269,11 @@ msgstr ""
"Standaard duurtijd in weken voor workouts die geen deel uitmaken van een "
"schema. Gebruikt voor e-mailherinneringen."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Taal meldingen"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -310,95 +282,82 @@ msgstr ""
"herinneringen voor workouts. Dit beïnvloedt niet de taal die wordt gebruikt "
"op de website."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Leeftijd"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Hoogte (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Uren slaap"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "De gemiddelde uren slaap per dag"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Werk"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Gemiddelde uren per dag"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Fysieke intensiteit"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Ongeveer"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Gemiddeld aantal uren per week"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Vrije tijd"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Totale dagelijkse calorieën"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totale calorie-inname, inclusief bvb. enige surplus"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Gewichteenheid"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Externe toegang toestaan"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Geef externe gebruikers toegang tot jouw workouts en logs in een alleen-"
-"lezen modus. Je moet dit instellen voordat je links kan delen in "
-"bijvoorbeeld social media."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Automatische herinneringen voor gewichtsingave"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Aantal dagen na de laatste gewichtsingave ( geef 0 in om te deactiveren )"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Het toaal van alle uren moet 24 zijn"
@@ -406,8 +365,7 @@ msgstr "Het toaal van alle uren moet 24 zijn"
msgid "Repetitions"
msgstr "Herhalingen"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Tijd"
@@ -418,12 +376,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Naam"
@@ -516,6 +474,86 @@ msgstr ""
msgid "the wger Team"
msgstr "het wger Team"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "E-mails"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Huidige versie"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Verzend verificatie email"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Bekijk wijzigingen"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Wijzigingen"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Niet geverifieerde email"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Aanmelden"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Wachtwoord vergeten?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Geen account?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -525,7 +563,7 @@ msgstr ""
"Je bezoekt de website als gebruiker \"%(current_user)s\", alle acties worden "
"uitgevoerd op eigen data."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Terug naar \"%(target)s\""
@@ -551,7 +589,7 @@ msgstr ""
"Weet je zeker dit je d wil verwijderen? Deze actie kan niet ongedaan worden "
"gemaakt."
-#: core/templates/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Talen"
@@ -560,15 +598,15 @@ msgid "Nothing found."
msgstr "Niets gevonden."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -582,14 +620,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Opties"
@@ -599,9 +636,9 @@ msgstr "Licentielijst"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -616,7 +653,7 @@ msgstr "Licentielijst"
msgid "Nothing found"
msgstr "Niets gevonden"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Afdruk"
@@ -628,7 +665,7 @@ msgstr "Training"
msgid "Routines"
msgstr "Routines"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Kalender"
@@ -640,7 +677,7 @@ msgstr "Metingen"
msgid "Gallery"
msgstr "Gallerij"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -662,7 +699,7 @@ msgstr "Publieke schemas"
msgid "Exercises"
msgstr "Oefeningen"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administratie"
@@ -687,7 +724,7 @@ msgstr "Categorieën"
msgid "Nutrition"
msgstr "Voeding"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Voedingsplannen"
@@ -708,7 +745,7 @@ msgstr "Ingrediëntenoverzicht"
msgid "Body weight"
msgstr "Lichaamsgewicht"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Gewichtsoverzicht"
@@ -724,7 +761,7 @@ msgstr "Help & doe mee"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licentie"
@@ -736,42 +773,42 @@ msgstr "Developer documentatie"
msgid "Get the code"
msgstr "Download de code"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Vertaal"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Reset wachtwoord"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Afmelden"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Mijn voorkeuren"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenties"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Herhalingen"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Gewichteenheden"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Gebruikerslijst"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Gyms"
@@ -826,35 +863,27 @@ msgstr "Bedankt voor het gebruiken van onze site!"
msgid "The %(site_name)s team"
msgstr "Het %(site_name)s team"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "vorige"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "volgende"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Sluit"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Maak wat demo-ingaven aan"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Algemene voorwaarden"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -862,37 +891,168 @@ msgstr ""
msgid "Features"
msgstr "Functies"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API sleutel"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Je API-sleutel"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Je hebt nog geen API-sleutel"
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Genereer nieuwe API-sleutel"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Schema aanmaken"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Trainingssessie"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API sleutel"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Verwijder huidige API-sleutel en genereer een nieuwe"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Genereer nieuwe API-sleutel"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Genereer nieuwe API-sleutel"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Je hebt nog geen API-sleutel"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Documentatie"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentatie"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Verwijder account"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Ben je zeker?"
@@ -907,102 +1067,94 @@ msgstr ""
"Deze actie zal de gebruikersaccount \"%(username)s\" verwijderen. Alle "
"gerelateerde data (workouts, logs, etc.) zullen onomkeerbaar worden gewist. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Geen account?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Wachtwoord vergeten?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "laatste %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beschrijving"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Aantal logs (dagen)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Laatste activiteit"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Geen workouts gevonden."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Algemene indruk"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Notities"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Proteïnen"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Koolhydraten"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Vet"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1011,193 +1163,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "Acties"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Gebruiker deactiveren"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Activeer gebruiker"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Reset gebruikers wachtwoord"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Rollen"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Bevestiging wachtwoord-reset"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Nee"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Details"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefoon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adres"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Geregistreerd"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Laatste aanmelding"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Actief"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inactief"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contracten"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documenten"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Download"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Opnemen in inactief overzicht"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Aanmelden als deze gebruiker"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Aanmelden als deze gebruiker"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Voorkeuren"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Geverifieerd email adres"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Niet geverifieerde email"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Verzend verificatie email"
-
-#: core/templates/user/preferences.html:31
-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:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Verander wachtwoord"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Reset wachtwoord"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Verwijder account"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Met succes verwijderd"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Verwijder {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Bewerk {0}"
@@ -1212,52 +1386,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Account \"{0}\" werd met succes verwijderd"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Je bent met succes geregistreerd"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Instellingen met succes aangepast"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Gelieve één van de opties hieronder te kiezen."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "De gebruiker werd met succes gedeactiveerd"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "De gebruiker werd met succes geactiveerd"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Bewerk gebruiker"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Ja, verwijder"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Gebruikersnaam"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Gym"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latijns, bvb. \"Pectoralis major\""
@@ -1287,44 +1477,158 @@ msgstr "Bestand is geen geldige video"
msgid "Equipment list"
msgstr "Materiaallijst"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Admin oefening geschiedenis"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Actie"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Bewerk set"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Gebruiker"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Bewerk set"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Bewerk set"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Verwijder"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Vertaling"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Ja, verwijder"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Draai veranderingen terug"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Onderwerp"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Wijzigingen"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Draai veranderingen terug"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Terugzetten"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Bekijk Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Bekijk wijzigingen"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Draai veranderingen terug"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Klik hier voor meer informatie"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Voornaam"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "vorige"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Achternaam"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1346,6 +1650,33 @@ msgstr "Materiaal toevoegen"
msgid "Delete equipment?"
msgstr "Materiaal verwijderen?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Gebruiker"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Type"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Actie"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Creëer spier"
@@ -1445,15 +1776,15 @@ msgstr "Startdatum"
msgid "End date"
msgstr "Einddatum"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Postcode"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Stad"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Straat"
@@ -1547,7 +1878,7 @@ msgstr "Gym-lijst"
msgid "Global gym configuration"
msgstr "Globale gym-configuratie"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Nieuwe gym toevoegen"
@@ -1627,11 +1958,11 @@ msgstr ""
"Het wachtwoord van deze gebruiker werd gereset. Breng de gebruiker "
"alsjeblieft op de hoogte van zijn nieuwe wachtwoord."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Notitie toevoegen"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Contract toevoegen"
@@ -1648,15 +1979,15 @@ msgstr "Verwijder {0}"
msgid "Add contract type"
msgstr "Contracttype toevoegen"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Geslacht"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Gebruiker aan gym toevoegen"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Gym bewerken"
@@ -2081,26 +2412,26 @@ msgstr "Oefening"
msgid "Routine will expire soon"
msgstr "Routine zal spoedig vervallen"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Slecht"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutraal"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Goed"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Als je een tijd ingeeft, moet je zowel start- als eindtijd ingeven."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "De startijd kan niet na de eindtijd liggen."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2164,27 +2495,27 @@ msgstr "Workout"
msgid "Workout for %s"
msgstr "Workout voor %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Eenheid"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Basis calorie-inname"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Je basis calorie-inname zoals berekend voor je data"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Bijkomende calorieën"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2192,27 +2523,27 @@ msgstr ""
"Bijkomende calorieën om toe te voegen aan het basisaantal (om af te trekken, "
"voer een negatief cijfer in)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ingrediënt"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Zoek ook in Engelse namen"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2270,83 +2601,107 @@ msgstr ""
"succesvol is afgerond."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Variaties"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Geen ingrediënten."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Ingrediënt Categorieën"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Voornaam"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "vorige"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "volgende"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Zoek"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Macrovoedingstoffen"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Suikerinhoud in koolhydraten"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "Nvt."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Verzadigde vetinhoud in vetten"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Anderen"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Vezels"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Klik hier voor meer informatie"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Voeding"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Voeg gewichteenheid toe"
@@ -2436,36 +2791,36 @@ msgstr ""
"observeer jezelf dan voor enkele weken en verander de totale hoeveelheid "
"indien nodig."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Nieuw ingrediënt toevoegen"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Voedingsplan"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Voedingsplan voor %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Voedingsgegevens"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Taal"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Percentage energie"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g per kg lichaamsgewicht"
@@ -2874,35 +3229,35 @@ msgstr "Broncode"
msgid "Translation"
msgstr "Vertaling"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Ja, verwijder"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "De oorspronkelijke titel van dit object, indien beschikbaar"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Link naar het originele object, indien beschikbaar"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Auteur(s)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Als je niet de auteur bent, voeg dan de naam of bron hier toe."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Link naar het profiel van de auteur, indien beschikbaar"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Link naar de originele bron als dit een afgeleid werk is"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3047,6 +3402,67 @@ msgstr ""
msgid "Re-Submit"
msgstr "Her-indienen"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Gebruikt voor het opnieuw-instellen van wachtwoorden en, optioneel, e-"
+#~ "mailherinneringen."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Workout-herinneringen"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Toon opmerkingen oefening"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Vink aan om de opmerkingen bij de oefeningen te tonen in de workout view"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Gebruik ook Engelstalige ingrediënten"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Vink aan om ook ingrediënten in het Engels te tonen bij het aanmaken van\n"
+#~ "een voedingsschema. Deze ingrediënten worden uit een lijst gehaald die\n"
+#~ "aangeboden wordt door het Amerikaanse Departement voor Landbouw. Deze "
+#~ "lijst is bijzonder\n"
+#~ "compleet, met ongeveer 7000 ingrediënten, maar kan ook overweldigend zijn "
+#~ "en je zoektocht bemoeilijken"
+
+#~ msgid "Allow external access"
+#~ msgstr "Externe toegang toestaan"
+
+#~ 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 ""
+#~ "Geef externe gebruikers toegang tot jouw workouts en logs in een alleen-"
+#~ "lezen modus. Je moet dit instellen voordat je links kan delen in "
+#~ "bijvoorbeeld social media."
+
+#~ msgid "Your API key"
+#~ msgstr "Je API-sleutel"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "Je moet jouw email nog bevestigen om oefeningen te plaatsen"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Je bent met succes geregistreerd"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "Een verificatie email is verstuurd naar %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Bekijk Object"
+
#~ msgid "Email verification"
#~ msgstr "Email verificatie"
@@ -3221,9 +3637,6 @@ msgstr "Her-indienen"
#~ msgid "Brand name of product"
#~ msgstr "Merknaam van product"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Ingrediënt Categorieën"
-
#~ msgid "Amount in grams"
#~ msgstr "Hoeveelheid in grammen"
@@ -3393,9 +3806,6 @@ msgstr "Her-indienen"
#~ "Je kan zoeken naar meer dan één oefening, ze zullen gegroepeerd worden in "
#~ "een supserset."
-#~ msgid "Type"
-#~ msgstr "Type"
-
#~ msgid "Table"
#~ msgstr "Tabel"
@@ -3496,9 +3906,6 @@ msgstr "Her-indienen"
#~ msgid "Log overview"
#~ msgstr "Logoverzicht"
-#~ msgid "Workout session"
-#~ msgstr "Trainingssessie"
-
#~ msgid "Add workout impression"
#~ msgstr "Voeg workout-sessie toe"
@@ -3634,9 +4041,6 @@ msgstr "Her-indienen"
#~ "invullen: bvb. voor 4 sets slechts éénmaal 10 invoeren voor de "
#~ "herhalingen. Dit wordt dan automatisch 4 x 10."
-#~ msgid "Edit set"
-#~ msgstr "Bewerk set"
-
#~ msgid "Update"
#~ msgstr "Bijwerken"
@@ -3688,9 +4092,6 @@ msgstr "Her-indienen"
#~ msgid "Delete workout log"
#~ msgstr "Verwijder workout-log"
-#~ msgid "Create schedule"
-#~ msgstr "Schema aanmaken"
-
#~ msgid "Edit workout"
#~ msgstr "Bewerk workout"
@@ -3862,9 +4263,6 @@ msgstr "Her-indienen"
#~ "een goedkeuring om toegevoegd te worden aan de databank. Tot dat moment\n"
#~ "zal deze niet worden getoond in het overzicht of de zoekresultaten."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Gelieve één van de opties hieronder te kiezen."
-
#~ msgid "Accept"
#~ msgstr "Aanvaard"
diff --git a/wger/locale/no/LC_MESSAGES/django.po b/wger/locale/no/LC_MESSAGES/django.po
index 7b1e0ee6a..1a515482f 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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/"
@@ -37,10 +37,10 @@ msgstr ""
"brukere som ikke er tildelt et treningsstudio vil også bli tildelt dette "
"treningsstudioet."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -52,85 +52,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Rediger"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Skjemaet er sikret med reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Registrer"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Fornavn"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Etternavn"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "E-post"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Fødselsdato"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Personlig data"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Treningsvarsler"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Andre innstillinger"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Lagre"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "E-post"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "Brukes for passordtilbakestillinger og eventuelt e-postpåminnelser."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Denne e-posten er allerede i bruk."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Passord"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Skriv inn ditt nåværende passord."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -138,27 +134,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Slett"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Ugyldig passord"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "Skjemaet er sikret med reCAPTCHA"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm"
+msgstr "Konfiguarsjon"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Send"
@@ -232,34 +233,10 @@ msgid "Imperial (pound)"
msgstr "Britisk enhetssystem (pund)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Vis øvelseskommentarer"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Kryss av for å vise øvelseskommentarer i trenings-visning"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Bruk også ingredienser på engelsk"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Kryss av for å også vise ingredienser på engelsk når du lager en "
-"ernæringsplan. Disse ingrediensene er hentet fra en liste laget av det "
-"amerikanske landbruksdepartementet. Denne listen er veldig utfyllende, med "
-"ca. 7000 oppføringer, men kan bli litt overveldende og gjøre søket vanskelig."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Aktiver treningsvarsler"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -267,19 +244,19 @@ msgstr ""
"Kryss av for å aktivere automatiske påminnelser for treningsøkter. Du må "
"legge inn en gyldig e-post for at dette skal fungere."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Påminnelse før utløp"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Antall dager i forveien å varsle om at en trening utløper."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Standard varighet på treningsøkter"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -287,11 +264,11 @@ msgstr ""
"Standard varighet i uker for treningsøkter som ikke er med i en plan. Dette "
"blir brukt for treningsvarsler."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Varslingsspråk"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -300,95 +277,82 @@ msgstr ""
"påminnelser for treningsøkter. Dette påvirker ikke språket som blir brukt på "
"hjemmesiden."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Alder"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Høyde (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Timer med søvn"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Antall timer med søvn per dag, i gjennomsnitt."
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Arbeid"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Gjennomsnittstimer per dag"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Fysisk intensitet"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Omtrent"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Gjennomsnittstimer per uke"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Ledig tid"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Antall kalorier daglig"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totalt kaloriinntak, inkludert f.eks. overskudd"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Vektenhet"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Tilltatt ekstern tilgang"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Tillat eksterne brukere å få tilgang til treningsøktene dine og logger i en "
-"skrivebeskyttet modus. Du må sette dette før du kan dele linker f.eks til "
-"sosiale medier."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Automatiske påminnelser for vekt oppføringer"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Antall dager etter den siste vekten oppføringen (skriv 0 for å deaktivere)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Summen av antall timer må bli 24"
@@ -396,8 +360,7 @@ msgstr "Summen av antall timer må bli 24"
msgid "Repetitions"
msgstr "Repetisjoner"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Tid"
@@ -406,12 +369,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Navn"
@@ -505,6 +468,87 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "E-poster"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Gjeldene versjon"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Configuration"
+msgid "Resend confirmation email"
+msgstr "Konfiguarsjon"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View logs"
+msgid "Cancel change"
+msgstr "Vis logger"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Change to"
+msgstr "Endre"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Configuration"
+msgid "Change email"
+msgstr "Konfiguarsjon"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Logg inn"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Glemt passord?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Ingen konto?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -521,7 +565,7 @@ msgstr ""
"handlinger utføres på vedkommendes data.\n"
" "
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Tilbake til \"%(target)s\""
@@ -550,7 +594,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Språk"
@@ -559,15 +603,15 @@ msgid "Nothing found."
msgstr "Resultatløst."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -581,14 +625,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Alternativer"
@@ -598,9 +641,9 @@ msgstr "Lisensliste"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -615,7 +658,7 @@ msgstr "Lisensliste"
msgid "Nothing found"
msgstr "Ingenting funnet"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Inntrykk"
@@ -627,7 +670,7 @@ msgstr "Trening"
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Kalender"
@@ -641,7 +684,7 @@ msgstr "Makronæringsstoffer"
msgid "Gallery"
msgstr "Galleri"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -667,7 +710,7 @@ msgstr "Offentlige maler"
msgid "Exercises"
msgstr "Øvelser"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administrasjon"
@@ -694,7 +737,7 @@ msgstr "Kategorier"
msgid "Nutrition"
msgstr "Ernæring"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Ernæringsplaner"
@@ -715,7 +758,7 @@ msgstr "Ingrediensoversikt"
msgid "Body weight"
msgstr "Kropsvekt"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Vektoversikt"
@@ -731,7 +774,7 @@ msgstr ""
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Lisens"
@@ -743,42 +786,42 @@ msgstr "Utvikler dokumentasjon"
msgid "Get the code"
msgstr "Få koden"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Oversett"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Tilbakestill passord"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Logg ut"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Mine innstillinger"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Lisenser"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetisjonsenheter"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Vektenheter"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Brukerliste"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Treningsstudioer"
@@ -832,34 +875,26 @@ msgstr "Takk for at du bruker vår side!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s teamet"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "forrige"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "neste"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Lukk"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Lag noen demo oppføringer"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Vilkår for bruk"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -867,37 +902,168 @@ msgstr ""
msgid "Features"
msgstr "Funksjoner"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API kode"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Din API kode"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Du har ingen API koder enda"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Generer ny API kode"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Opprett timeplan"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Treningsøkt"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API kode"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Slett gjeldende API-kode og generer en ny."
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Generer ny API kode"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Generer ny API kode"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Du har ingen API koder enda"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokumentasjon"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentasjon"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Slett konto"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Er du sikker?"
@@ -913,102 +1079,94 @@ msgstr ""
"Det vil også fjerne alle data knyttet til den (trening, logger, osv)\n"
"og kan ikke omgjøres. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Ingen konto?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Glemt passord?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "sist %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beskrivelse"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Antall logger (dager)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Siste aktivitet"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Ingen treningsøkter funnet."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Logg"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Generelt inntrykk"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Notater"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energi"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Karbohydrater"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Fett"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1017,195 +1175,217 @@ msgstr "kcal"
msgid "Actions"
msgstr "Handlinger"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Deaktiver bruker"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Aktiver bruker"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Tilbakestill brukerpassord"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roller"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Bekreftelse av tilbakestilling av passord"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Nei"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detaljer"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresse"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registrert"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Sist innlogget"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktiv"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inaktiv"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Kontrakter"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenter"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Last ned"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inkluder i inaktiv oversikt"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Logg inn som denne brukeren"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Logg inn som denne brukeren"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Preferanser"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
#, fuzzy
#| msgid "Send emails"
msgid "Verified email"
msgstr "Sende e-poster"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Endre passord"
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Tilbakestill passord"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
-msgstr "Endre passord"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Slett konto"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Slettingen var vellykket"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Slett {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Rediger {0}"
@@ -1220,52 +1400,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Slettingen av konto \"{0}\" var vellykket"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Din registrering var vellykket"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Innstillinger ble vellykket oppdatert"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Velg ett av alternativene nedenfor."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Brukeren ble vellykket deaktivert"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Brukeren ble vellykket aktivert"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Rediger bruker"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Ja, slett det"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Brukernavn"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "treningsstudio"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "I latin, f.eks \"Pectoralis major\""
@@ -1299,57 +1495,160 @@ msgstr "%(birthdate)s er ikke en gyldig fødselsdato"
msgid "Equipment list"
msgstr "Utstyrsliste"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise admin history"
msgstr "Treningsdag"
-#: exercises/templates/history/overview.html:27
+#: exercises/templates/history/overview.html:16
#, fuzzy
-#| msgid "Actions"
-msgid "Action"
-msgstr "Handlinger"
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Endre sett"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Bruker"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Endre sett"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Endre sett"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Slett"
-#: exercises/templates/history/overview.html:29
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Oversettelse"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Ja, slett det"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "View logs"
+msgid "Revert change"
+msgstr "Vis logger"
+
+#: exercises/templates/history/overview.html:187
#, fuzzy
#| msgctxt "As in \"email subject\""
#| msgid "Subject"
-msgid "Object"
+msgid "Open object"
msgstr "Subjekt"
-#: exercises/templates/history/overview.html:31
-#, fuzzy
-#| msgctxt "Noun, not verb"
-#| msgid "Change"
-msgid "Changes"
-msgstr "Endre"
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
msgstr ""
-#: exercises/templates/history/overview.html:75
+#: exercises/templates/history/overview.html:246
#, fuzzy
-#| msgid "View logs"
-msgid "View changes"
-msgstr "Vis logger"
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Klikk her for mer informasjon"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Fornavn"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "forrige"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Etternavn"
+
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
msgstr "Muskeloversikt"
@@ -1370,6 +1669,35 @@ msgstr "Legg til nytt utstyr"
msgid "Delete equipment?"
msgstr "Slett utstyr?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Bruker"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Type"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Handlinger"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Legg til muskel"
@@ -1468,15 +1796,15 @@ msgstr "Startdato"
msgid "End date"
msgstr "Sluttdato"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Postnummer"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "By"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Gate"
@@ -1571,7 +1899,7 @@ msgstr "Liste over alle treningsstudio"
msgid "Global gym configuration"
msgstr "Globale innstillinger for treningsstudio"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Legg til et nytt treningstudio"
@@ -1651,11 +1979,11 @@ msgstr ""
"Denne brukerens passord har blitt tilbakestilt . Vennligst gi beskjed til "
"brukeren om deres nye passord."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Legg til notat"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Legg til kontrakt"
@@ -1672,15 +2000,15 @@ msgstr "Slett {0}"
msgid "Add contract type"
msgstr "Legg til kontraktstype"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Kjønn"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Legg til brukere til treningsstudio"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Rediger treningsstudio"
@@ -2117,26 +2445,26 @@ msgstr "Øvelse"
msgid "Routine will expire soon"
msgstr "Treningen vil utløpe snart"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Dårlig"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Nøytral"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "God"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Hvis du skriver inn en tid, må du angi både start- og sluttidspunkt ."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Starttiden kan ikke være etter sluttiden."
+
#: manager/templates/routines/email_reminder.tpl:3
#, fuzzy, python-format
#| msgid "Your current workout '%(workout)s' expired %(days)s days ago."
@@ -2201,27 +2529,27 @@ msgstr "Treningsøkt"
msgid "Workout for %s"
msgstr "Treningsøkt for %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Enhet"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Grunnleggende kaloriinntak"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Din grunnleggende kaloriinntak beregnet med din data"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Ekstra kalorier"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2229,29 +2557,29 @@ msgstr ""
"Ekstra kalorier for å legge til base rate (for å trekke fra, legg inn et "
"negativt tall)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ingrediens"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
#, fuzzy
#| msgid "Also use ingredients in English"
msgid "Also search for names in English"
msgstr "Bruk også ingredienser på engelsk"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2306,83 +2634,107 @@ msgstr ""
"vellykket."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Variasjoner"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Ingen ingredienser."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Ingredienskategorier"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Fornavn"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "forrige"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "neste"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Søk"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Makronæringsstoffer"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Sukkerinnholdet i karbohydrater"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Mettet fett i fett"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Andre"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Klikk her for mer informasjon"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Ernæring"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Legg til vekt enhet"
@@ -2471,36 +2823,36 @@ msgstr ""
"nødvendig\n"
"selv i noen uker om det totale beløpet må endres."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Legg til ny ingrediens"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Ernæringsplan"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Ernæringsplan for %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Ernæringsmessige data"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Totalt"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Prosent av energien"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g per kropps kg"
@@ -2913,25 +3265,25 @@ msgstr "Kildekode"
msgid "Translation"
msgstr "Oversettelse"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Ja, slett det"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
#, fuzzy
#| msgid "Author"
msgid "Author(s)"
msgstr "Forfatter"
-#: utils/models.py:67
+#: utils/models.py:91
#, fuzzy
#| msgid ""
#| "If you are not the author, enter the name or source here. This is needed "
@@ -2941,15 +3293,15 @@ msgstr ""
"Hvis du ikke er forfatteren, skriver du inn navnet eller kilden her. Dette "
"er nødvendig for noen lisenser f.eks CC-BY-SA."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3093,6 +3445,53 @@ msgstr ""
msgid "Re-Submit"
msgstr "Send på nytt"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr "Brukes for passordtilbakestillinger og eventuelt e-postpåminnelser."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Treningsvarsler"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Vis øvelseskommentarer"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Kryss av for å vise øvelseskommentarer i trenings-visning"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Bruk også ingredienser på engelsk"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Kryss av for å også vise ingredienser på engelsk når du lager en "
+#~ "ernæringsplan. Disse ingrediensene er hentet fra en liste laget av det "
+#~ "amerikanske landbruksdepartementet. Denne listen er veldig utfyllende, "
+#~ "med ca. 7000 oppføringer, men kan bli litt overveldende og gjøre søket "
+#~ "vanskelig."
+
+#~ msgid "Allow external access"
+#~ msgstr "Tilltatt ekstern tilgang"
+
+#~ 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 ""
+#~ "Tillat eksterne brukere å få tilgang til treningsøktene dine og logger i "
+#~ "en skrivebeskyttet modus. Du må sette dette før du kan dele linker f.eks "
+#~ "til sosiale medier."
+
+#~ msgid "Your API key"
+#~ msgstr "Din API kode"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Din registrering var vellykket"
+
#~ msgid "Email verification"
#~ msgstr "Epost verifisering"
@@ -3241,9 +3640,6 @@ msgstr "Send på nytt"
#~ msgid "Brand name of product"
#~ msgstr "Merkenavn for produkt"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Ingredienskategorier"
-
#~ msgid "Amount in grams"
#~ msgstr "Mengde i gram"
@@ -3423,9 +3819,6 @@ msgstr "Send på nytt"
#~ "Du kan søke etter mer enn en øvelse, de vil bli gruppert sammen til et "
#~ "supersett."
-#~ msgid "Type"
-#~ msgstr "Type"
-
#~ msgid "Table"
#~ msgstr "Tabell"
@@ -3525,9 +3918,6 @@ msgstr "Send på nytt"
#~ msgid "Log overview"
#~ msgstr "Logg oversikt"
-#~ msgid "Workout session"
-#~ msgstr "Treningsøkt"
-
#~ msgid "Delete with logs"
#~ msgstr "Slett med logger"
@@ -3711,9 +4101,6 @@ msgstr "Send på nytt"
#~ "gjentakelser, dette\n"
#~ "vil automatisk bli \"4 x 10\"."
-#~ msgid "Edit set"
-#~ msgstr "Endre sett"
-
#~ msgid "Update"
#~ msgstr "Oppdater"
@@ -3760,9 +4147,6 @@ msgstr "Send på nytt"
#~ msgid "Delete workout log"
#~ msgstr "Slett treningslogg"
-#~ msgid "Create schedule"
-#~ msgstr "Opprett timeplan"
-
#~ msgid "Edit workout"
#~ msgstr "Endre treningsøkt"
@@ -3954,9 +4338,6 @@ msgstr "Send på nytt"
#~ "eller\n"
#~ "søket."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Velg ett av alternativene nedenfor."
-
#~ msgid "Accept"
#~ msgstr "Godta"
diff --git a/wger/locale/os/LC_MESSAGES/django.po b/wger/locale/os/LC_MESSAGES/django.po
index f2219942d..4301c28d8 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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/"
@@ -29,10 +29,10 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -44,85 +44,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Ивын"
-#: 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"
+#: core/forms.py:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
-msgid "First name"
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
msgstr ""
-#: 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"
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
+msgid "First name"
msgstr ""
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Email"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
+msgid "Last name"
msgstr ""
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Email"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -130,27 +126,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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Схафын"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr ""
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: 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"
+#: core/forms.py:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -224,148 +223,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -373,8 +342,7 @@ msgstr ""
msgid "Repetitions"
msgstr ""
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -383,12 +351,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Ном"
@@ -467,6 +435,74 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+msgid "Current email"
+msgstr ""
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+msgid "Resend confirmation email"
+msgstr ""
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+msgid "Change email"
+msgstr ""
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr ""
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -474,7 +510,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr ""
@@ -493,7 +529,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -502,15 +538,15 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -524,14 +560,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Фадӕттӕ"
@@ -541,9 +576,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -558,7 +593,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -570,7 +605,7 @@ msgstr "Фӕлтӕрд"
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr ""
@@ -582,7 +617,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -604,7 +639,7 @@ msgstr ""
msgid "Exercises"
msgstr "Фӕлтӕрӕнтӕ"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Администраци"
@@ -631,7 +666,7 @@ msgstr ""
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr ""
@@ -652,7 +687,7 @@ msgstr ""
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr ""
@@ -668,7 +703,7 @@ msgstr ""
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr ""
@@ -680,42 +715,42 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -765,34 +800,26 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr ""
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -800,37 +827,162 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr ""
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete API key"
+msgstr "Схафын"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr ""
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Administration"
+msgid "API documentation"
+msgstr "Администраци"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -843,102 +995,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Ӕмбарынгӕнӕн"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -947,114 +1091,112 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Н."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1062,78 +1204,98 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+msgid "Set password"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1145,52 +1307,64 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1222,47 +1396,135 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
#, fuzzy
#| msgid "Exercise Categories"
msgid "Exercise admin history"
msgstr "Фӕлтӕрӕнты ӕмбырд"
-#: exercises/templates/history/overview.html:27
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
+msgstr ""
+
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
#, fuzzy
-#| msgid "Options"
-msgid "Action"
-msgstr "Фадӕттӕ"
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Схафын"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Архайӕг"
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:113
+msgid "into"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:123
+msgid "media"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:126
+msgid "translations"
+msgstr ""
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+msgid "First"
+msgstr ""
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
+msgstr ""
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+msgid "Last"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
@@ -1285,6 +1547,35 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Архайӕг"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+#, fuzzy
+#| msgid "Options"
+msgid "Action"
+msgstr "Фадӕттӕ"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Мускул бафтауын"
@@ -1385,15 +1676,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1485,7 +1776,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1559,11 +1850,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1580,15 +1871,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -1986,26 +2277,26 @@ msgstr "Фӕлтӕрӕн"
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2058,53 +2349,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Options"
msgid "Portion"
@@ -2148,77 +2439,95 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
-msgstr "Агурын"
+msgid "Ingredient pagination"
+msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:59
+msgid "First page"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
+msgstr "Агурын"
+
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+msgid "Nutri-Score"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2290,36 +2599,36 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2682,35 +2991,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
diff --git a/wger/locale/pl/LC_MESSAGES/django.po b/wger/locale/pl/LC_MESSAGES/django.po
index 46dd569ac..180009fab 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -40,10 +40,10 @@ msgstr ""
"przypisywani wszyscy nowi użytkownicy oraz obecni użytkownicy bez określonej "
"siłowni."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -55,85 +55,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Edytuj"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Formularz jest chroniony przez reCaptcha"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Zarejestruj"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Imię"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Nazwisko"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Email"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data urodzenia"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Dane personalne"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Przypomnienia treningowe"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Inne ustawienia"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Zapisz"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Email"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "Używany do resetowania hasła i przypomnień."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Ten adres e-mail jest już zajęty."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Hasło"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Wprowadź swoje aktualne hasło."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -141,27 +137,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Usuń"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Hasło nieprawidłowe"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "Formularz jest chroniony przez reCaptcha"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Niezweryfikowany adres e-mail"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Zapisz"
@@ -235,36 +236,10 @@ msgid "Imperial (pound)"
msgstr "Imperialny (funty)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Pokaż komentarze ćwiczenia"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Zaznacz, by pokazać komentarze do ćwiczeń na podglądzie treningu"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Używaj także nazw składników po angielsku"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Zaznacz, aby podczas tworzenia planu żywieniowego pokazać również składniki "
-"w języku angielskim.\n"
-"Te składniki są ekstrahowane z dostarczonej listy\n"
-"przez Departament Rolnictwa Stanów Zjednoczonych. Jest niezwykle kompletny, "
-"z około\n"
-"7000 wpisów, ale może być nieco przytłaczająca i utrudniać wyszukiwanie."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Aktywuj powiadomienia treningowe"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -272,19 +247,19 @@ msgstr ""
"Zaznacz, by aktywować automatyczne powiadomienia dla treningów. Aby wszystko "
"działało poprawnie, musisz podać poprawny adres email."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Przypomnij przed wygaśnięciem"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Ile dni przed wygaśnięciem treningu chcesz być o tym powiadomiony."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Domyślna długość treningu"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -292,11 +267,11 @@ msgstr ""
"Domyślna długość treningu (w tygodniach) niewpisanych do harmonogramu. "
"Używane dla powiadomień e-mailowych."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Język powiadomień"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -304,94 +279,81 @@ msgstr ""
"Język używany w e-mailach, np. powiadomieniach o treningach. Ustawienie nie "
"wpływa na język strony."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Wiek"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Wzrost (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Godzin snu"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Średnia długość snu w ciągu dnia"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Praca"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Średnia ilość godzin w ciągu dnia"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Natężenie fizyczne"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "W przybliżeniu"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Średnia liczba godzin na tydzień"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Czas wolny"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Dzienna całkowita liczba kalorii"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Pełne spożycie kalorii, włączając surplus"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Jednostka wagi"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Pozwól na dostęp zewnętrzny"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Udostępnij do odczytu swoje treningi i logi treningowe użytkownikom "
-"zewnętrznym. Musisz to włączyć zanim będziesz mógł dzielić się linkami np. "
-"na mediach społecznościowych."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Przypominanie o uzupełnieniu aktualnej wagi"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Liczba dni od ostatniego wpisu wagi (wpisz 0 by deaktywować)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Godziny muszą sumować się do wartości 24"
@@ -399,8 +361,7 @@ msgstr "Godziny muszą sumować się do wartości 24"
msgid "Repetitions"
msgstr "Powtórzenia"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Czas"
@@ -409,12 +370,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Nazwa"
@@ -508,6 +469,86 @@ msgstr ""
msgid "the wger Team"
msgstr "Drużyna Wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Emaile"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Aktualna wersja"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Wyślij email weryfikacyjny"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Zobacz zmiany"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Zmiany"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Niezweryfikowany adres e-mail"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Zaloguj"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Zapomniałeś hasła?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Brak konta?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -524,7 +565,7 @@ msgstr ""
"dokonywane są na jego danych.\n"
" "
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Wróć do \"%(target)s\""
@@ -552,7 +593,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Języki"
@@ -561,15 +602,15 @@ msgid "Nothing found."
msgstr "Nie znaleziono."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -583,14 +624,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Opcje"
@@ -600,9 +640,9 @@ msgstr "Lista licencji"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -617,7 +657,7 @@ msgstr "Lista licencji"
msgid "Nothing found"
msgstr "Nic nie znaleziono"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Odcisk"
@@ -629,7 +669,7 @@ msgstr "Trening"
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Kalendarz"
@@ -641,7 +681,7 @@ msgstr "Pomiary"
msgid "Gallery"
msgstr "Galeria"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -663,7 +703,7 @@ msgstr "Publiczne szablony"
msgid "Exercises"
msgstr "Ćwiczenia"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Zarządzanie"
@@ -688,7 +728,7 @@ msgstr "Kategorie"
msgid "Nutrition"
msgstr "Żywienie"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Plany żywienia"
@@ -709,7 +749,7 @@ msgstr "Rozpiska składników"
msgid "Body weight"
msgstr "Waga ciała"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Wykres masy ciała"
@@ -725,7 +765,7 @@ msgstr ""
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licencja"
@@ -737,42 +777,42 @@ msgstr "Dokumentacja"
msgid "Get the code"
msgstr "Pobierz kod źródłowy"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Tłumacz"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Resetuj hasło"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Wyloguj"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Moje preferencje"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licencje"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Jednostki potwórzeń"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Jednostki wagi"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista użytkowników"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Siłownie"
@@ -826,36 +866,28 @@ msgstr "Dziękujemy za korzystanie z naszej strony!"
msgid "The %(site_name)s team"
msgstr "Zespół %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "poprzednie"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "następne"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Zamknij"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Utwórz kilka przykładowych wpisów"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Warunki świadczenia usługi"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -863,37 +895,170 @@ msgstr ""
msgid "Features"
msgstr "Cechy"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Klucz API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Twój klucz API"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Nie masz jeszcze klucza API"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Generuj nowy klucz API"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Utwórz harmonogram"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Sesja treningowa"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Klucz API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Usuń swój klucz API i wygeneruj nowy"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Generuj nowy klucz API"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Generuj nowy klucz API"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Nie masz jeszcze klucza API"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokumentacja"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentacja"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Usuń konto"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Czy na pewno?"
@@ -909,102 +1074,94 @@ msgstr ""
"Usunie także wszelkie jego dane (treningi, logi, itd.).\n"
"ta czynność nie może zostać cofnięta "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Brak konta?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Zapomniałeś hasła?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "ostatnie %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Opis"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Liczba logów (dni)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Ostatnia aktywność"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Nie znaleziono treningu."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Ogólna ocena"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Notatki"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Białko"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Węglowodany"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Tłuszcz"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1013,195 +1170,217 @@ msgstr "kcal"
msgid "Actions"
msgstr "Akcje"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Deaktywuj użytkownika"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Aktywuj użytkownika"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Resetuj hasło użytkownika"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Role"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Potwierdzenie resetu hasła"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Nie"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Tak"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Szczegóły"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adres"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Zarejestrowano"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Zalogowany ostatnio"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktywny"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Nieaktywny"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Kontrakty"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokumenty"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Pobierz"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Uwzględnij w podglądzie nieaktywnych"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Zaloguj się jako ten użytkownik"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Zaloguj się jako ten użytkownik"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Preferencje"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Zweryfikowany adres e-mail"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Niezweryfikowany adres e-mail"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Wyślij email weryfikacyjny"
-
-#: core/templates/user/preferences.html:31
-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:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Zmień hasło"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Resetuj hasło"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Usuń konto"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Pomyślnie usunięto"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Usunąć {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Edytuj {0}"
@@ -1216,52 +1395,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Konto \"{0}\" zostało poprawnie skasowane"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Zostałeś poprawnie zarejestrowany"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Ustawienia pomyślnie zaktualizowane"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Wybierz jedną z opcji poniżej."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Użytkownik pomyślnie zdezaktywowany"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Użytkownik pomyślnie aktywowany"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Edytuj użytkownika"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Tak, usuń"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Nazwa użytkownika"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Siłownia"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Po łacinie, np. \"Pectoralis major\""
@@ -1291,44 +1486,158 @@ msgstr "Plik nie jest prawidłowym filmem"
msgid "Equipment list"
msgstr "Lista sprzętu"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Historia administratora ćwiczeń"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Akcja"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Edytuj serię"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Użytkownik"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Edytuj serię"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Edytuj serię"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Usuń"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Tłumaczenie"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Tak, usuń"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Przywróć zmiany"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Obiekt"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Zmiany"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Przywróć zmiany"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Odwracać"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Zobacz obiekt"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Zobacz zmiany"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Przywróć zmiany"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Kliknij tutaj aby uzyskać więcej informacji"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Imię"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "poprzednie"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Nazwisko"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1350,6 +1659,33 @@ msgstr "Dodaj nowy sprzęt"
msgid "Delete equipment?"
msgstr "Usunąć sprzęt?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Użytkownik"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Typ"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Akcja"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Dodaj mięsień"
@@ -1448,15 +1784,15 @@ msgstr "Data rozpoczęcia"
msgid "End date"
msgstr "Data zakończenia"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Kod pocztowy"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Miasto"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Ulica"
@@ -1551,7 +1887,7 @@ msgstr "Lista siłowni"
msgid "Global gym configuration"
msgstr "Globalna konfiguracja siłowni"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Dodaj nową siłownię"
@@ -1630,11 +1966,11 @@ msgstr ""
"Hasło użytkownika zostało pomyślnie zresetowane. Poinformuj użytkownika o "
"jego nowym haśle."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Dodaj notatkę"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Dodaj kontrakt"
@@ -1651,15 +1987,15 @@ msgstr "Usuń {0}"
msgid "Add contract type"
msgstr "Dodaj typ kontraktu"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Płeć"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Dodaj członka do siłowni"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Edytuj siłownię"
@@ -2084,28 +2420,28 @@ msgstr "Ćwiczenie"
msgid "Routine will expire soon"
msgstr "Trening wkrótce wygaśnie"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Źle"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Średnio"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Dobrze"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
"Jeżeli wpiszesz czas, musisz wpisać czas rozpoczęcia i zakończenia "
"jednocześnie."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Czas rozpoczęcia nie może być po czasie zakończenia."
+
#: manager/templates/routines/email_reminder.tpl:3
#, fuzzy, python-format
#| msgid "Your current workout '%(workout)s' expired %(days)s days ago."
@@ -2171,27 +2507,27 @@ msgstr "Trening"
msgid "Workout for %s"
msgstr "Trening dla %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Jednostka"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Podstawowe spożycie kalorii"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Twoje podstawowe spożycie kalorii obliczone na podstawie danych"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Dodatkowe kalorie"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2199,27 +2535,27 @@ msgstr ""
"Dodatkowe kalorie modyfikujące bazową wartość (by odjąć, wpisz ujemną "
"wartość)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Składnik"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Szukaj również w języku angielskim"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2274,83 +2610,107 @@ msgstr ""
"zostaniesz powiadomiony o zakończonej procedurze."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Możliwości"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Brak składników."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Kategorie składników"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Imię"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "poprzednie"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "następne"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Szukaj"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Makroelementy"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Cukry proste"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "N/A"
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Tłuszcze nasycone"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Inne"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Błonnik"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Sód"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Kliknij tutaj aby uzyskać więcej informacji"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Żywienie"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Dodaj nową jednostkę wagi"
@@ -2441,36 +2801,36 @@ msgstr ""
"swój organizm przez kilka tygodni i w razie potrzeby dostosuj odpowiednie "
"wartości."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Dodaj nowy składnik"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Plan diety"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan dietetyczny dla %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Wartości odżywcze"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Sumarycznie"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Procent energii"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g na kg masy ciała"
@@ -2881,35 +3241,35 @@ msgstr "Kod Źródłowy"
msgid "Translation"
msgstr "Tłumaczenie"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Tak, usuń"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Oryginalny tytuł tego obiektu, jeśli jest dostępny"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Link do oryginalnego obiektu, jeśli jest dostępny"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Autor(rzy)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Jeżeli nie jesteś autorem, wpisz tutaj nazwę lub źródło."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Link do profilu autora, jeśli jest dostępny"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Link do oryginalnego źródła, jeśli jest to dzieło zależne"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3053,6 +3413,64 @@ msgstr ""
msgid "Re-Submit"
msgstr "Prześlij ponownie"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr "Używany do resetowania hasła i przypomnień e-mail."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Przypomnienia treningowe"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Pokaż komentarze ćwiczenia"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Zaznacz, by pokazać komentarze do ćwiczeń na podglądzie treningu"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Używaj także nazw składników po angielsku"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Zaznacz, aby podczas tworzenia planu żywieniowego pokazać również "
+#~ "składniki w języku angielskim.\n"
+#~ "Te składniki są ekstrahowane z dostarczonej listy\n"
+#~ "przez Departament Rolnictwa Stanów Zjednoczonych. Jest niezwykle "
+#~ "kompletny, z około\n"
+#~ "7000 wpisów, ale może być nieco przytłaczająca i utrudniać wyszukiwanie."
+
+#~ msgid "Allow external access"
+#~ msgstr "Pozwól na dostęp zewnętrzny"
+
+#~ 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 ""
+#~ "Udostępnij do odczytu swoje treningi i logi treningowe użytkownikom "
+#~ "zewnętrznym. Musisz to włączyć zanim będziesz mógł dzielić się linkami "
+#~ "np. na mediach społecznościowych."
+
+#~ msgid "Your API key"
+#~ msgstr "Twój klucz API"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "Aby przesyłać ćwiczenia, musisz zweryfikować swój adres e-mail"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Zostałeś poprawnie zarejestrowany"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "E-mail weryfikacyjny został wysłany na adres %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Zobacz obiekt"
+
#~ msgid "Email verification"
#~ msgstr "Weryfikacja E-mail"
@@ -3225,9 +3643,6 @@ msgstr "Prześlij ponownie"
#~ msgid "Brand name of product"
#~ msgstr "Nazwa marki produktu"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Kategorie składników"
-
#~ msgid "Amount in grams"
#~ msgstr "Ilość w gramach"
@@ -3442,9 +3857,6 @@ msgstr "Prześlij ponownie"
#~ "Możesz szukać więcej niż jednego ćwiczenia, zostaną one zebrane w jedną "
#~ "supergrupę."
-#~ msgid "Type"
-#~ msgstr "Typ"
-
#~ msgid "Table"
#~ msgstr "Tabela"
@@ -3541,9 +3953,6 @@ msgstr "Prześlij ponownie"
#~ msgid "Log overview"
#~ msgstr "Rozpiska logów"
-#~ msgid "Workout session"
-#~ msgstr "Sesja treningowa"
-
#~ msgid "Delete with logs"
#~ msgstr "Usuń z logami"
@@ -3713,9 +4122,6 @@ msgstr "Prześlij ponownie"
#~ "powtórzeń, a zostanie\n"
#~ "to zapisane jako \"4 x 10\"."
-#~ msgid "Edit set"
-#~ msgstr "Edytuj serię"
-
#~ msgid "Update"
#~ msgstr "Aktualizuj"
@@ -3764,9 +4170,6 @@ msgstr "Prześlij ponownie"
#~ msgid "Delete workout log"
#~ msgstr "Usuń log treningowy"
-#~ msgid "Create schedule"
-#~ msgstr "Utwórz harmonogram"
-
#~ msgid "Edit workout"
#~ msgstr "Edytuj trening"
@@ -3963,9 +4366,6 @@ msgstr "Prześlij ponownie"
#~ "umieszczenie w bazie danych. Do tego czasu, nie będzie on umieszczony w\n"
#~ "wynikach wyszukiwania."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Wybierz jedną z opcji poniżej."
-
#~ msgid "Accept"
#~ msgstr "Akceptuj"
diff --git a/wger/locale/pt/LC_MESSAGES/django.po b/wger/locale/pt/LC_MESSAGES/django.po
index add66cc55..1f519e4e9 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+0000\n"
"PO-Revision-Date: 2026-04-21 18:09+0000\n"
"Last-Translator: Ninguém Mesmo <[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"
@@ -40,10 +40,10 @@ msgstr ""
"os novos utilizadores a este ginásio e atualizará todos os utilizadores "
"existentes sem um ginásio."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -55,87 +55,82 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Editar"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "O formulário está seguro com o reCAPTCHA"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Cadastro"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Primeiro nome"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Último nome"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Email"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data de Nascimento"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Dados pessoais"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Lembretes de treino"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Outras configurações"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Salvar"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Email"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Este endereço de e-mail já está sendo usado."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Senha"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Por favor introduz a tua senha atual."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -143,27 +138,32 @@ msgstr "Por favor introduz a tua 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Remover"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Senha inválida"
-#: 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:289
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Confirm"
+msgstr "Verifique o email"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Submeter"
@@ -237,37 +237,10 @@ msgid "Imperial (pound)"
msgstr "Imperial (lb)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Mostrar comentários do exercício"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-"Marque para mostrar os comentários do exercício na visualização do treino"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Também use ingredientes em Inglês"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Marque também para mostrar ingredientes em inglês enquanto\n"
-"cria o plano nutricional. Esses ingredientes são extraídos de uma lista "
-"mantida\n"
-"pelo Departamento de Agricultura dos EUA. Ela é extremamente completa, com "
-"aproximadamente\n"
-"7000 itens, mas pode ser um pouco grande e tornar a pesquisa complicada."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Lembretes de treino ativo"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -275,20 +248,20 @@ msgstr ""
"Marque para ativar automaticamente os lembretes de treino. Você precisa "
"fornecer um e-mail válido para que isso funcione."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Lembrar antes do vencimento"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"O número de dias que você deseja ser lembrado antes que o treino expire."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Duração padrão do treino"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -296,11 +269,11 @@ msgstr ""
"Duração padrão em semanas dos treinos não agendados. Usado para enviar e-"
"mail de aviso de treino."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Notificação de idioma"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -308,93 +281,81 @@ msgstr ""
"Idioma usado durante o envio de e-mail de notificação, por exemplo, e-mail "
"de lembrete de treinos. Isso não afeta o idioma usado no site."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Idade"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Altura (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Horas de sono"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Média de horas dormidas por dia"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Trabalho"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Média de horas por dia"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Intensidade física"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Aproximadamente"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Esporte"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Média de horas por semana"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Tempo livre"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Total calorias diária"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Total de ingestão calórica, incluindo qualquer excedente"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Unidade de peso"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Permite acesso externo"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Permite acesso externo de leitura aos treinos e logs. Você precisa ligar "
-"para poder compartilhar links."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Lembretes automáticos para entradas de peso"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Número de dias após o último peso digitado (0 para desativar)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "Ativar troféus"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
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:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "A soma de todas as horas deve ser 24"
@@ -402,8 +363,7 @@ msgstr "A soma de todas as horas deve ser 24"
msgid "Repetitions"
msgstr "Repeticões"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Tempo"
@@ -412,12 +372,12 @@ msgid "Distance"
msgstr "Distância"
#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:283 core/views/user.py:605
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Nome"
@@ -505,6 +465,86 @@ msgstr "Se o botão não funcionar, copia e cola esta ligação no navegador:"
msgid "the wger Team"
msgstr "Equipe wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "E-mails"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Versão atual"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Enviar e-mail de verificação"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Ver mudanças"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Mudanças"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Confirm email"
+msgid "Change email"
+msgstr "Verifique o email"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Login"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Esqueceu a senha?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Não cadastrado?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr "Já tem uma conta?"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -514,7 +554,7 @@ msgstr ""
"Você está navegando no site como o utilizador \"%(current_user)s\", todas as "
"ações são realizadas nos dados dele(a)."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Voltar a \"%(target)s\""
@@ -539,7 +579,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Idiomas"
@@ -548,15 +588,15 @@ msgid "Nothing found."
msgstr "Não encontrado."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -570,14 +610,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Opções"
@@ -587,9 +626,9 @@ msgstr "Lista de licença"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -604,7 +643,7 @@ msgstr "Lista de licença"
msgid "Nothing found"
msgstr "Nada encontrado"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Imprimir"
@@ -616,7 +655,7 @@ msgstr "Treinamento"
msgid "Routines"
msgstr "Rotinas"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Calendário"
@@ -628,7 +667,7 @@ msgstr "Medições"
msgid "Gallery"
msgstr "Galeria"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr "Troféus"
@@ -650,7 +689,7 @@ msgstr "Modelos públicos"
msgid "Exercises"
msgstr "Exercícios"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administração"
@@ -675,7 +714,7 @@ msgstr "Categorias"
msgid "Nutrition"
msgstr "Nutrição"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Planos de nutrição"
@@ -696,7 +735,7 @@ msgstr "Visão geral do ingrediente"
msgid "Body weight"
msgstr "Peso Corporal"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Visão geral do peso"
@@ -712,7 +751,7 @@ msgstr "Suporte e envolver-se"
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licença"
@@ -724,42 +763,42 @@ msgstr "Documentação do desenvolvedor"
msgid "Get the code"
msgstr "Obtenha o código fonte"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduzir"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Redefinr a senha"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Sair"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Minhas preferências"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenças"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetição"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Unidades de peso"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de utilizadores"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Academias"
@@ -813,36 +852,28 @@ msgstr "Obrigado por usar o nosso site!"
msgid "The %(site_name)s team"
msgstr "O time do %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "Anterior"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "Próximo"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Fechar"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Crie alguns registros de demonstração"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termos de uso"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr "Linguagem do navegador"
@@ -850,37 +881,168 @@ msgstr "Linguagem do navegador"
msgid "Features"
msgstr "Funcionalidades"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Chave API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Sua API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Você não possui API key ainda"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Gerar nova API Key"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Criar cronograma"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Sessão de Treinos"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Chave API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Apager definitivamente sua API key e gerar uma nova"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Gerar nova API Key"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Gerar nova API Key"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Você não possui API key ainda"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Documentação"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentação"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Apagar conta"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Você tem certeza?"
@@ -897,102 +1059,94 @@ msgstr ""
"(treinos, registros, etc.)\n"
"e não poderá ser desfeito. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Não cadastrado?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Esqueceu a senha?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "último %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "descrição"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Número de registros (dias)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Última atividade"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Nenhum treino encontrado."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Impressão geral"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Notas"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energia"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Proteína"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Carboidratos"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Gordura"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1001,195 +1155,217 @@ msgstr "kcal"
msgid "Actions"
msgstr "Ações"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Utilizador desativado"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Utilizador ativo"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Redefinir a senha de utilizador"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Papéis"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Confirmação de redefinição da palavra-passe"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Não"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Sim"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalhes"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefone"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Endereço"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registrado"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Último Login"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Estado"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Ativo"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inativo"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contratos"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documentos"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Descarregar"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Incluir na visão geral inativa"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Autenticado como este utilizador"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Autenticado como este utilizador"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Preferências"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "E-mail verificado"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "E-mail não verificado"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Enviar e-mail de verificação"
-
-#: core/templates/user/preferences.html:31
-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:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Mudar senha"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
-msgstr "Já tem uma conta?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Redefinr a senha"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Apagar conta"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Apagado com sucesso"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Remover {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Editar {0}"
@@ -1204,52 +1380,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Conta \"{0}\" deletada com sucesso"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Você foi registrado com sucesso"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Configurações atualizadas com sucesso"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Por favor selecione uma das opções abaixo."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "O utilizador foi desativado com sucesso"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "O utilizador foi ativado com sucesso"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Editar utilizador"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Sim, apagar"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "Identificação"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "utilizador"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Academia"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Em latim, ex.: \"Pectoralis major\""
@@ -1279,44 +1471,160 @@ msgstr "O arquivo não é um vídeo válido"
msgid "Equipment list"
msgstr "Lista de equipamento"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Histórico de administração do exercício"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Ação"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Edit conjunto"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Utilizador"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Edit conjunto"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Edit conjunto"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr "Aplicar"
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr "Reincício"
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+#, fuzzy
+#| msgid "Dedicated"
+msgid "created"
+msgstr "Dedicado"
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Remover"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Traduzir"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Sim, apagar"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Reverter alterações"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Objeto"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Mudanças"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Reverter alterações"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Reverter"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Ver Objeto"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Ver mudanças"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Reverter alterações"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Dietary information"
+msgid "History pagination"
+msgstr "Informação dietética"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Primeiro nome"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "Anterior"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Último nome"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1338,6 +1646,33 @@ msgstr "Adicionar novo equipamento"
msgid "Delete equipment?"
msgstr "Apagar equipamento?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Utilizador"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Tipo"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Ação"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Adicionar músculo"
@@ -1437,15 +1772,15 @@ msgstr "Data início"
msgid "End date"
msgstr "Data final"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "CEP"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Cidade"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Rua"
@@ -1541,7 +1876,7 @@ msgstr "Lista da academia"
msgid "Global gym configuration"
msgstr "Configução global da academia"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Adicionar nova academia"
@@ -1621,11 +1956,11 @@ msgstr ""
"A palavra-passe desse utilizador foi redefinida. Por favor, notifique o "
"utilizador da sua nova senha."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Adicionar nota"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Adicionar contrato"
@@ -1642,15 +1977,15 @@ msgstr "Remover {0}"
msgid "Add contract type"
msgstr "Adicionar tipo de contrato"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Gênero"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Adicionar utilizador à academia"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Editar academia"
@@ -2050,27 +2385,27 @@ msgstr "Exercício"
msgid "Routine will expire soon"
msgstr "Rotina expirará brevemente"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Mal"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutro"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Bom"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
"Se você fornecer um tempo, você deve fornecer tempo de início e de fim."
+#: manager/models/session.py:152
+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."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2133,27 +2468,27 @@ msgstr "Treino"
msgid "Workout for %s"
msgstr "Treino para %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr "Porção"
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Unidade"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Ingestão básica de calorias"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
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:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Calorias adicionais"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2161,27 +2496,27 @@ msgstr ""
"Calorias adicionais para adicionar à taxa básica (para subtrair, entre com "
"um número negativo)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr "Gramas (g)"
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ingrediente"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Também buscar nomes em inglês"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr "Qualidade"
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr "Introduz uma quantidade e escolhe gramas (g) ou uma medida de porção."
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr "Porção"
@@ -2235,77 +2570,101 @@ msgstr ""
"completado com sucesso."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr "Vegano"
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr "Vegetariano"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Nenhum ingrediente."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Categorias de ingredientes"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Primeiro nome"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "Anterior"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "Próximo"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Pesquisa"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
msgid "Filter"
msgstr "Filtro"
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
-msgstr "Aplicar"
-
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
-msgstr "Reincício"
-
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Macronutrientes"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "Kj"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Açúcar contido nos carboidratos"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "n.d."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Gordura saturada contida nas gorduras"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Outros"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Fibra"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Sódio"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr "Informação dietética"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Nutrição"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Adicione nova unidade de peso"
@@ -2393,36 +2752,36 @@ 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:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Adicione um novo ingrediente"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Plano nutricional"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plano nutricional para %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Dados nutricionais"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Total"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Percentagem de energia"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g por kg de corpo"
@@ -2832,35 +3191,35 @@ msgstr "Código Fonte"
msgid "Translation"
msgstr "Traduzir"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Sim, apagar"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "O título original deste objeto, se disponível"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Ligação para o objeto original, se disponível"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Autor(es)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Se você não é o autor, escreva o nome ou fonte aqui."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Ligação para o perfil do autor, se disponível"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Ligação para a fonte original, se este for um trabalho derivado"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3009,6 +3368,65 @@ msgstr ""
msgid "Re-Submit"
msgstr "Re-submeter"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Usado para redefinições de senha e, opcionalmente, lembretes por e-mail."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Lembretes de treino"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Mostrar comentários do exercício"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Marque para mostrar os comentários do exercício na visualização do treino"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Também use ingredientes em Inglês"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Marque também para mostrar ingredientes em inglês enquanto\n"
+#~ "cria o plano nutricional. Esses ingredientes são extraídos de uma lista "
+#~ "mantida\n"
+#~ "pelo Departamento de Agricultura dos EUA. Ela é extremamente completa, "
+#~ "com aproximadamente\n"
+#~ "7000 itens, mas pode ser um pouco grande e tornar a pesquisa complicada."
+
+#~ msgid "Allow external access"
+#~ msgstr "Permite acesso externo"
+
+#~ 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 ""
+#~ "Permite acesso externo de leitura aos treinos e logs. Você precisa ligar "
+#~ "para poder compartilhar links."
+
+#~ msgid "Your API key"
+#~ msgstr "Sua API key"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "É preciso verificar seu e-mail para contribuir com exercícios"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Você foi registrado com sucesso"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "Um e-mail de verificação foi enviado para %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Ver Objeto"
+
#~ msgid "Email verification"
#~ msgstr "Verificação de e-mail"
@@ -3184,9 +3602,6 @@ msgstr "Re-submeter"
#~ msgid "Brand name of product"
#~ msgstr "Nome da marca do produto"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Categorias de ingredientes"
-
#~ msgid "Amount in grams"
#~ msgstr "total em gramas"
@@ -3402,9 +3817,6 @@ msgstr "Re-submeter"
#~ "Pode pesquisar para mais de um exercício, eles irão ser agrupados juntos "
#~ "num superconjunto."
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
#~ msgid "Table"
#~ msgstr "Tabela"
@@ -3503,9 +3915,6 @@ msgstr "Re-submeter"
#~ msgid "Log overview"
#~ msgstr "Visão geral do Log"
-#~ msgid "Workout session"
-#~ msgstr "Sessão de Treinos"
-
#~ msgid "Delete with logs"
#~ msgstr "Apagar com Logs"
@@ -3670,9 +4079,6 @@ msgstr "Re-submeter"
#~ "repetições, isto\n"
#~ "automaticamente tornará \"4 x 10\"."
-#~ msgid "Edit set"
-#~ msgstr "Edit conjunto"
-
#~ msgid "Update"
#~ msgstr "Atualizar"
@@ -3721,9 +4127,6 @@ msgstr "Re-submeter"
#~ msgid "Delete workout log"
#~ msgstr "Excliur log de treino"
-#~ msgid "Create schedule"
-#~ msgstr "Criar cronograma"
-
#~ msgid "Edit workout"
#~ msgstr "Edite treino"
@@ -3919,9 +4322,6 @@ msgstr "Re-submeter"
#~ "sobre a inclusão no banco de dados. Até então, não será mostrado na visão "
#~ "geral ou na busca."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Por favor selecione uma das opções abaixo."
-
#~ msgid "Accept"
#~ msgstr "Aceito"
diff --git a/wger/locale/ro/LC_MESSAGES/django.po b/wger/locale/ro/LC_MESSAGES/django.po
index 72690a5ea..ce256589f 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -36,10 +36,10 @@ msgstr ""
"utilizatorii noi înregistrați la această sală și va actualiza toți "
"utilizatorii existenți care nu au o sală."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -51,85 +51,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Editează"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Formularul este securizat cu reCAPTCHA"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Înregistrare"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Prenume"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Nume de familie"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "E-mail"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Data nașterii"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Date personale"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Mementouri antrenament"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Alte setări"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Salvează"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "E-mail"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "Folosit pentru resetarea parolei și, opțional, mementouri prin e-mail."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Această adresă de e-mail este deja folosită."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Parolă"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Te rugăm să introduci parola ta curentă."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -137,27 +133,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Șterge"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Parolă invalidă"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "Formularul este securizat cu reCAPTCHA"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "E-mail neverificat"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Trimite"
@@ -231,37 +232,10 @@ msgid "Imperial (pound)"
msgstr "Imperial (livre)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Arată comentariile exercițiilor"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-"Bifează pentru a arăta comentariile exercițiilor în vizualizarea "
-"antrenamentului"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Folosește și ingrediente în engleză"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Bifează pentru a afișa și ingredientele în engleză la crearea unui plan\n"
-"nutrițional. Aceste ingrediente sunt extrase dintr-o listă furnizată de\n"
-"Departamentul Agriculturii din SUA. Este extrem de completă, cu aproximativ\n"
-"7000 de intrări, dar poate fi oarecum copleșitoare și poate îngreuna "
-"căutarea."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Activează mementourile pentru antrenament"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -269,21 +243,21 @@ msgstr ""
"Bifează pentru a activa mementourile automate pentru antrenamente. Trebuie "
"să furnizezi un e-mail valid pentru ca acest lucru să funcționeze."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Amintește înainte de expirare"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Numărul de zile cu care vrei să fii notificat înainte să expire un "
"antrenament."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Durata implicită a antrenamentelor"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -291,11 +265,11 @@ msgstr ""
"Durata implicită în săptămâni a antrenamentelor care nu sunt într-un "
"program. Folosită pentru mementourile de antrenament prin e-mail."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Limba notificărilor"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -303,96 +277,83 @@ msgstr ""
"Limba folosită pentru a-ți trimite notificări prin e-mail, de ex. mementouri "
"pentru antrenamente. Aceasta nu afectează limba folosită pe site."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Vârstă"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Înălțime (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Ore de somn"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Numărul mediu de ore de somn pe zi"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Muncă"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Ore medii pe zi"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Intensitate fizică"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Aproximativ"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Ore medii pe săptămână"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Timp liber"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Total calorii zilnice"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Aportul caloric total, incluzând de ex. orice surplus"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Unitate de greutate"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Permite acces extern"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Permite utilizatorilor externi să acceseze antrenamentele și jurnalele tale "
-"în modul de citire (read-only). Trebuie să setezi acest lucru înainte de a "
-"putea distribui linkuri, de ex. pe rețelele de socializare."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Mementouri automate pentru înregistrările de greutate"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Numărul de zile după ultima înregistrare a greutății (introdu 0 pentru a "
"dezactiva)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "Activează trofeele"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr "Activează sau dezactivează sistemul de trofee pentru acest utilizator"
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Suma tuturor orelor trebuie să fie 24"
@@ -400,8 +361,7 @@ msgstr "Suma tuturor orelor trebuie să fie 24"
msgid "Repetitions"
msgstr "Repetări"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Timp"
@@ -412,12 +372,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Nume"
@@ -512,6 +472,86 @@ msgstr ""
msgid "the wger Team"
msgstr "Echipa wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "E-mailuri"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Versiunea curentă"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Trimite e-mail de verificare"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Vezi modificări"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Modificări"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "E-mail neverificat"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Autentificare"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Ai uitat parola?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Nu ai cont?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr "Ai deja un cont?"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -521,7 +561,7 @@ msgstr ""
"Navighezi pe site ca utilizatorul \"%(current_user)s\", toate acțiunile sunt "
"efectuate pe datele acestuia."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Înapoi la \"%(target)s\""
@@ -547,7 +587,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Limbi"
@@ -556,15 +596,15 @@ msgid "Nothing found."
msgstr "Nu am găsit nimic."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -578,14 +618,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Opțiuni"
@@ -595,9 +634,9 @@ msgstr "Lista licențelor"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -612,7 +651,7 @@ msgstr "Lista licențelor"
msgid "Nothing found"
msgstr "Nu am găsit nimic"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Informații legale"
@@ -624,7 +663,7 @@ msgstr "Antrenament"
msgid "Routines"
msgstr "Rutine"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Calendar"
@@ -636,7 +675,7 @@ msgstr "Măsurători"
msgid "Gallery"
msgstr "Galerie"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr "Trofee"
@@ -658,7 +697,7 @@ msgstr "Șabloane publice"
msgid "Exercises"
msgstr "Exerciții"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administrare"
@@ -683,7 +722,7 @@ msgstr "Categorii"
msgid "Nutrition"
msgstr "Nutriție"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Planuri nutriționale"
@@ -704,7 +743,7 @@ msgstr "Prezentare generală ingrediente"
msgid "Body weight"
msgstr "Greutatea corpului"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Prezentare generală a greutății"
@@ -720,7 +759,7 @@ msgstr "Suport și implicare"
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licență"
@@ -732,42 +771,42 @@ msgstr "Documentație pentru dezvoltatori"
msgid "Get the code"
msgstr "Obține codul sursă"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Traduceri"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Resetează parola"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Deconectare"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Preferințele mele"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licențe"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unități pentru repetări"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Unități de greutate"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista utilizatorilor"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Săli de fitness"
@@ -823,36 +862,28 @@ msgstr "Îți mulțumim că folosești site-ul nostru!"
msgid "The %(site_name)s team"
msgstr "Echipa %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "anterior"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "următorul"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Închide"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Creează câteva intrări demonstrative"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termeni de utilizare"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -860,37 +891,167 @@ msgstr ""
msgid "Features"
msgstr "Funcționalități"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Cheie API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Cheia ta API"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Nu ai nicio cheie API încă"
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Generează o nouă cheie API"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Dedicated"
+msgid "Created"
+msgstr "Dedicat"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Cheie API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Șterge cheia API curentă și generează una nouă"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Generează o nouă cheie API"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Generează o nouă cheie API"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Nu ai nicio cheie API încă"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Documentație"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Documentație"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Șterge contul"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Ești sigur?"
@@ -906,102 +1067,94 @@ msgstr ""
"Va elimina definitiv și toate datele asociate (antrenamente, jurnale etc.)\n"
"și este ireversibilă. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Nu ai cont?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Ai uitat parola?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "ultimele %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Descriere"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Numărul jurnalelor (zile)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Ultima activitate"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Nu am găsit antrenamente."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Înregistrează"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Impresie generală"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Note"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energie"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Proteine"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Carbohidrați"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Grăsimi"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1010,196 +1163,217 @@ msgstr "kcal"
msgid "Actions"
msgstr "Acțiuni"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Dezactivează utilizatorul"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Activează utilizatorul"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Resetează parola utilizatorului"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roluri"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Confirmarea resetării parolei"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Nu"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Da"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detalii"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adresă"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Înregistrat"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Ultima autentificare"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Activ"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inactiv"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Contracte"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Documente"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Descarcă"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Include în prezentarea generală a inactivității"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Autentifică-te ca acest utilizator"
+
+#: core/templates/user/overview.html:539
#, 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"
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
-msgstr "Autentifică-te ca acest utilizator"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Preferințe"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "E-mail verificat"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "E-mail neverificat"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Trimite e-mail de verificare"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Schimbă parola"
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Resetează parola"
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
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:617
-msgid "Change password"
-msgstr "Schimbă parola"
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
-msgstr "Ai deja un cont?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Șterge contul"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Șters cu succes"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Șterge {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Editează {0}"
@@ -1215,52 +1389,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Contul \"{0}\" a fost șters cu succes"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Te-ai înregistrat cu succes"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Setările au fost actualizate cu succes"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Selectați una dintre opțiunile de mai jos."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Utilizatorul a fost dezactivat cu succes"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Utilizatorul a fost activat cu succes"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Editează utilizatorul"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Da, șterge"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Nume de utilizator"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Sală de fitness"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "În latină, de ex. \"Pectoralis major\""
@@ -1290,44 +1480,154 @@ msgstr "Fișierul nu este un videoclip valid"
msgid "Equipment list"
msgstr "Lista de echipamente"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Istoricul de administrare a exercițiilor"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Acțiune"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
+msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Utilizator"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+#, fuzzy
+#| msgid "Dedicated"
+msgid "created"
+msgstr "Dedicat"
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Șterge"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Traducere"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Da, șterge"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Revocă modificările"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Obiect"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Modificări"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Revocă modificările"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Revocare"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Vezi obiect"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Vezi modificări"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Revocă modificările"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Date format"
+msgid "History pagination"
+msgstr "Formatul datei"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Prenume"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "anterior"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Nume de familie"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1349,6 +1649,35 @@ msgstr "Adaugă echipament nou"
msgid "Delete equipment?"
msgstr "Șterge echipament?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Utilizator"
+
+#: exercises/views/history.py:117
+#, fuzzy
+#| msgid "Types"
+msgid "Type"
+msgstr "Tipuri"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Acțiune"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Adaugă mușchi"
@@ -1449,15 +1778,15 @@ msgstr "Data de început"
msgid "End date"
msgstr "Data de sfârșit"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Cod poștal"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Oraș"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Stradă"
@@ -1553,7 +1882,7 @@ msgstr "Lista sălilor de fitness"
msgid "Global gym configuration"
msgstr "Configurația globală a sălii de fitness"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Adaugă o nouă sală de fitness"
@@ -1633,11 +1962,11 @@ msgstr ""
"Parola acestui utilizator a fost resetată. Te rugăm să notifici utilizatorul "
"de noua sa parolă."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Adaugă notă"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Adaugă contract"
@@ -1654,15 +1983,15 @@ msgstr "Șterge {0}"
msgid "Add contract type"
msgstr "Adaugă tip contract"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Sex"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Adaugă utilizator la sala de fitness"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Editează sala de fitness"
@@ -2064,28 +2393,28 @@ msgstr "Exercițiu"
msgid "Routine will expire soon"
msgstr "Rutina va expira în curând"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Rea"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutră"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Bună"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
"Dacă introduci o oră, trebuie să introduci atât ora de început cât și ora de "
"finalizare."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Ora de începere nu poate fi după ora de finalizare."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2150,27 +2479,27 @@ msgstr "Antrenament"
msgid "Workout for %s"
msgstr "Antrenament pentru %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Unitate"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Aportul caloric de bază"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Aportul caloric de bază calculat pentru datele tale"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Calorii adiționale"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2178,27 +2507,27 @@ msgstr ""
"Caloriile adiționale de adăugat la rata de bază (pentru a scădea, introdu un "
"număr negativ)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ingredient"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Caută nume și în engleză"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2255,81 +2584,105 @@ msgstr ""
"succes."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Nu există ingrediente."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient"
+msgid "Ingredient pagination"
+msgstr "Ingredient"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Prenume"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "anterior"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "următorul"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Caută"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Macronutrienți"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Conținutul de zahăr din carbohidrați"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "N/A"
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Conținutul de grăsimi saturate din grăsimi"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Altele"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Fibre"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Sodiu"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Date format"
msgid "Dietary information"
msgstr "Formatul datei"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Nutriție"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Adaugă o nouă unitate de greutate"
@@ -2419,36 +2772,36 @@ msgstr ""
"te\n"
"timp de câteva săptămâni și modifică cantitatea totală dacă este necesar."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Adaugă un ingredient nou"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Plan nutrițional"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "Plan nutrițional pentru %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Date nutriționale"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Total"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Procentaj din energie"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g per kg-corp"
@@ -2859,35 +3212,35 @@ msgstr "Cod sursă"
msgid "Translation"
msgstr "Traducere"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Da, șterge"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Titlul original al acestui obiect, dacă este disponibil"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Link către obiectul original, dacă este disponibil"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Autor(i)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Dacă nu ești autorul, introdu numele sau sursa aici."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Link către site-ul sau profilul autorului, dacă este disponibil"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Link către sursa originală, dacă aceasta este o lucrare derivată"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3036,6 +3389,68 @@ msgstr ""
msgid "Re-Submit"
msgstr "Retrimite"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Folosit pentru resetarea parolei și, opțional, mementouri prin e-mail."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Mementouri antrenament"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Arată comentariile exercițiilor"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Bifează pentru a arăta comentariile exercițiilor în vizualizarea "
+#~ "antrenamentului"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Folosește și ingrediente în engleză"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Bifează pentru a afișa și ingredientele în engleză la crearea unui plan\n"
+#~ "nutrițional. Aceste ingrediente sunt extrase dintr-o listă furnizată de\n"
+#~ "Departamentul Agriculturii din SUA. Este extrem de completă, cu "
+#~ "aproximativ\n"
+#~ "7000 de intrări, dar poate fi oarecum copleșitoare și poate îngreuna "
+#~ "căutarea."
+
+#~ msgid "Allow external access"
+#~ msgstr "Permite acces extern"
+
+#~ 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 ""
+#~ "Permite utilizatorilor externi să acceseze antrenamentele și jurnalele "
+#~ "tale în modul de citire (read-only). Trebuie să setezi acest lucru "
+#~ "înainte de a putea distribui linkuri, de ex. pe rețelele de socializare."
+
+#~ msgid "Your API key"
+#~ msgstr "Cheia ta API"
+
+#~ 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"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Te-ai înregistrat cu succes"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "Un e-mail de verificare a fost trimis la %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Vezi obiect"
+
#~ msgid "Email verification"
#~ msgstr "Verificarea e-mailului"
@@ -3165,9 +3580,6 @@ msgstr "Retrimite"
#~ msgid "Submission date"
#~ msgstr "Data depunerii"
-#~ msgid "Please select one of the options below."
-#~ msgstr "Selectați una dintre opțiunile de mai jos."
-
#~ msgid "Accept"
#~ msgstr "Acceptare"
diff --git a/wger/locale/ru/LC_MESSAGES/django.po b/wger/locale/ru/LC_MESSAGES/django.po
index 596d0eb0b..c7d106531 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -40,10 +40,10 @@ msgstr ""
"новых зарегистрированных пользователей в этот спортзал и обновит всех "
"существующих пользователей без тренажерного зала."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -55,87 +55,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Редактировать"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Данная форма защищена reCAPTCHA"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Зарегистрироваться"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Имя"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Фамилия"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Электронный адрес"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr "Используется для сброса пароля и опциональных уведомлений по e-mail."
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Дата рождения"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Персональные данные"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Напоминания тренировок"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Другие настройки"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Сохранить"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Электронный адрес"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Необходимо для возобновлений пароля, и выборочно, напоминаний по электронной "
"почте."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Этот электронный адрес уже используется."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Пароль"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Пожалуйста, введите ваш пароль."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -143,27 +139,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Удалить"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Неверный пароль"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "Данная форма защищена reCAPTCHA"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Непроверенный адрес электронной почты"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Отправить"
@@ -237,35 +238,10 @@ msgid "Imperial (pound)"
msgstr "Империал (фунты)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Показать комментарии к упражнению"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-"Поставьте галочку, для показа комментариев к упражнению в обзоре тренировки"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Компоненты также на английском языке"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Поставьте галочку, чтобы показать названия ингредиентов\n"
-"на английском при создании плана питания. Названия взяты из\n"
-"списка Департамента Сельского Хозяйства США. Список\n"
-"довольно обширный (около 7000 записей), что может усложнить поиск."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Активировать напоминания для тренировок"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -274,21 +250,21 @@ msgstr ""
"тренировок. Для этого необходимо предоставить действительный адрес "
"электронной почты."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Напомнить до истечения срока действия"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Количество дней до истечении срока действия тренировки, на которое вы хотите "
"установить напоминание."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Стандартная продолжительность тренировок"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -296,11 +272,11 @@ msgstr ""
"Стандартная продолжительность тренировок в неделях вне графика. Используется "
"для напоминания тренировок."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Язык уведомлений"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -309,94 +285,81 @@ msgstr ""
"например напоминание о тренировке. Это не влияет на язык, используемый на "
"веб-сайте."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Возраст"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Рост (см)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Количество часов сна"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Среднее количество часов сна в сутки"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Работа"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Среднее количество часов в день"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Физическая напряженность"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Приблизительно"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Спорт"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Среднее количество часов в неделю"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Свободное время"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Общая суточная калорийность"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Общее потребление калорий, в том числе, любой излишек"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Единица веса"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Разрешить внешний доступ"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Разрешить внешним пользователям доступ к вашим тренировкам и журналу в "
-"режиме только для чтения. Вы должны установить это прежде, чем вы можете "
-"поделиться ссылками например в социальных сетях."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Автоматические напоминания для записей веса"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Количество дней после последней записи веса (введите 0 для отключения)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Сумма всех часов должна быть 24"
@@ -404,8 +367,7 @@ msgstr "Сумма всех часов должна быть 24"
msgid "Repetitions"
msgstr "Повторений"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Время"
@@ -416,12 +378,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Имя"
@@ -517,6 +479,86 @@ msgstr ""
msgid "the wger Team"
msgstr "Команда wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Электронные почты"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Текущая версия"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Отправить электронное письмо с подтверждением"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Просмотр изменений"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Изменения"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Непроверенный адрес электронной почты"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Войти"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Забыли пароль?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Нет аккаунта?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -526,7 +568,7 @@ msgstr ""
"Вы просматриваете сайт как пользователь \"%(current_user)s\", все действия "
"выполняются с его данными."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Вернуться к \"%(target)s\""
@@ -550,7 +592,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Языки"
@@ -559,15 +601,15 @@ msgid "Nothing found."
msgstr "Ничего не найдено."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "Добавить одну сейчас."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -581,14 +623,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Опции"
@@ -598,9 +639,9 @@ msgstr "Список лицензий"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -615,7 +656,7 @@ msgstr "Список лицензий"
msgid "Nothing found"
msgstr "Ничего не найдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Отпечаток"
@@ -627,7 +668,7 @@ msgstr "Тренировка"
msgid "Routines"
msgstr "Рутина"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Календарь"
@@ -639,7 +680,7 @@ msgstr "Макронутриенты"
msgid "Gallery"
msgstr "Галерея"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -661,7 +702,7 @@ msgstr "Общедоступные шаблоны"
msgid "Exercises"
msgstr "Упражнения"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Администрация"
@@ -686,7 +727,7 @@ msgstr "Категории"
msgid "Nutrition"
msgstr "Питание"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Программы питания"
@@ -707,7 +748,7 @@ msgstr "Обзор ингредиентов"
msgid "Body weight"
msgstr "Вес тела"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Обзор веса"
@@ -723,7 +764,7 @@ msgstr "Поддерживайте и принимайте участие"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Лицензия"
@@ -735,42 +776,42 @@ msgstr "Документация для разработчиков"
msgid "Get the code"
msgstr "Получить код"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Перевести"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Восстановить пароль"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Выйти"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Мои настройки"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Лицензии"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Единицы повторения"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Единицы веса"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Список пользователей"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Тренажерные залы"
@@ -824,36 +865,28 @@ msgstr "Спасибо за пользование нашим сайтом!"
msgid "The %(site_name)s team"
msgstr "Команда %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "предыдущий"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "следующий"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Закрыть"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Вы используете аккаунт для гостей, введенные данные будут удалены через "
"неделю."
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Создайте демо-записи"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Условия обслуживания"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -861,37 +894,170 @@ msgstr ""
msgid "Features"
msgstr "Особенности"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Ключ API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Ваш API ключ"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "У вас еще нет API ключа"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Сгенерировать новый API ключ"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Создать программу"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Тренировка"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Ключ API"
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Удалить текущий API ключ и сгенерировать новый"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Сгенерировать новый API ключ"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Сгенерировать новый API ключ"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "У вас еще нет API ключа"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Документация"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Документация"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Удалить аккаунт"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Вы уверены?"
@@ -909,102 +1075,94 @@ msgstr ""
"журналы и т.д.) и не может быть отменено.\n"
" "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Нет аккаунта?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Забыли пароль?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "Последние %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Описание"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Количество записей (дней)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Последние действия"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Тренировок не найдено."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Журнал"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Общее впечатление"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Заметки"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Энергия"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Белки"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Углеводы"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Жиры"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "ккал"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1013,195 +1171,215 @@ msgstr "ккал"
msgid "Actions"
msgstr "Действия"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Деактивировать пользователя"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Активировать пользователя"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Сброс пароля пользователя"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Роли"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Подтверждение восстановления пароля"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr "Вы действительно хотите изменить пароль этого пользователя?"
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Нет"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Да"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Детали"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "№"
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Телефон"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Адрес"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Зарегистрировано"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Последний вход"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Статус"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Активные"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Неактивные"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Контакты"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Документы"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Загрузка"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Включить в обзор неактивных"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Войти в систему как этот пользователь"
+
+#: core/templates/user/overview.html:539
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Вход администратора доступен только для пользователей в %(gym_name)s"
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
-msgstr "Войти в систему как этот пользователь"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Настройки"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Подтвержденный email"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Непроверенный адрес электронной почты"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Отправить электронное письмо с подтверждением"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Изменить"
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Восстановить пароль"
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-"Вам необходимо подтвердить свой адрес электронной почты, чтобы добавлять "
-"упражнения"
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
-msgstr "Изменить"
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Удалить аккаунт"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "кг"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "г"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Успешно удалено"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Удалить {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Редактировать {0}"
@@ -1216,52 +1394,68 @@ msgstr ""
"масс тела и плана питания для наглядного примера возможностей этого сайта. "
"Вы можете их изменить или удалить!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Аккаунт \"{0}\" успешно удален"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Вы были успешно зарегистрированы"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Настройки успешно обновлены"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Пожалуйста, выберите одну из опций ниже."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Пользователь был успешно отключен"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Пользователь был успешно активирован"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Редактирование пользователя"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Да, удалить"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "Идентификация"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Имя пользователя"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Тренажерный зал"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr "На адрес %(email)s было отправлено электронное письмо с подтверждением"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Латинское название (например: \"Pectoralis major\")"
@@ -1291,44 +1485,158 @@ msgstr "Файл не содержит видеодорожку"
msgid "Equipment list"
msgstr "Перечень оборудования"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "История администрирования упражнений"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Действие"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Изменить подход"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Пользователь"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Изменить подход"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Изменить подход"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Удалить"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Перевод"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Да, удалить"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Отменить изменения"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Объект"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Изменения"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Отменить изменения"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Вернуть"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Просмотр объекта"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Просмотр изменений"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Отменить изменения"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Для дополнительной информации жмите сюда"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Имя"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "предыдущий"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Фамилия"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1350,6 +1658,33 @@ msgstr "Добавить новое оборудование"
msgid "Delete equipment?"
msgstr "Удалить оборудование?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Пользователь"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Тип"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Действие"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Добавить мышцу"
@@ -1450,15 +1785,15 @@ msgstr "Дата начала"
msgid "End date"
msgstr "Конечная дата"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Почтовый индекс"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Город"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Улица"
@@ -1554,7 +1889,7 @@ msgstr "Список тренажерного зала"
msgid "Global gym configuration"
msgstr "Глобальная настройка тренажерного зала"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Добавить новый тренажерный зал"
@@ -1634,11 +1969,11 @@ msgstr ""
"Пароль этого пользователя был сброшен. Пожалуйста, сообщите пользователю его "
"новый пароль."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Добавить примечание"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Добавить контракт"
@@ -1655,15 +1990,15 @@ msgstr "Удалить {0}"
msgid "Add contract type"
msgstr "Добавить форму контракта"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Пол"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Добавить пользователя в тренажерный зал"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Редактировать тренажерный зал"
@@ -2092,26 +2427,26 @@ msgstr "Упражнение"
msgid "Routine will expire soon"
msgstr "Срок этой тренировки скоро истечет"
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr "Время начала не может быть после времени окончания."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Плохо"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Нормально"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Хорошо"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Если вводить время, необходимо ввести время начала и окончания."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Время начала не может быть после времени окончания."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2176,27 +2511,27 @@ msgstr "Тренировка"
msgid "Workout for %s"
msgstr "Тренировка для %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Секция"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Основное потребление калорий"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основное потребление калорий, рассчитанное для ваших данных"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Дополнительные калории"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2204,27 +2539,27 @@ msgstr ""
"Дополнительные калории для добавления к базовой ставке (для вычитывания, "
"введите отрицательное число)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ингредиент"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Также ищите названия на английском"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2275,83 +2610,107 @@ msgstr ""
"адрес при регистрации, Вы будете уведомлены о удачном завершении процесса."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Вариации"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Ингредиентов нет."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Категории ингредиентов"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Имя"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "предыдущий"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "следующий"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Поиск"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Макронутриенты"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "кДж"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Содержание сахара в углеводах"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "не имеется в наличии"
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Содержание насыщенных жиров в жирах"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Другие"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Волокно"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Натрий"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Для дополнительной информации жмите сюда"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Питание"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Добавить новую единицу веса"
@@ -2439,36 +2798,36 @@ msgstr ""
"вы создаете ваш план питания на этих значениях, понаблюдайте за собой "
"несколько недель и при необходимости измените общее количество."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Добавить новый ингредиент"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "План питания"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "План питания для %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Это пустой план, что Вы ожидали в PDF?</i>"
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Пищевые данные"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Итого"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Процент энергии"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "г на кг тела"
@@ -2898,23 +3257,23 @@ msgstr "Исходный код"
msgid "Translation"
msgstr "Перевод"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Да, удалить"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Оригинальное название этого объекта, если таковое имеется"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Ссылка на исходный объект, если таковая имеется"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Автор(ы)"
-#: utils/models.py:67
+#: utils/models.py:91
#, fuzzy
#| msgid ""
#| "If you are not the author, enter the name or source here. This is needed "
@@ -2924,15 +3283,15 @@ msgstr ""
"Если вы не являетесь автором, введите имя или источник здесь. Это необходимо "
"для некоторых лицензий, таких как CC-BY-SA."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Ссылка на профиль автора, если таковая имеется"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Ссылка на первоисточник, если это производная работа"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3079,6 +3438,68 @@ msgstr ""
msgid "Re-Submit"
msgstr "Повторно отправить"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Используется для сброса пароля и опциональных уведомлений по e-mail."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Напоминания тренировок"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Показать комментарии к упражнению"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Поставьте галочку, для показа комментариев к упражнению в обзоре "
+#~ "тренировки"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Компоненты также на английском языке"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Поставьте галочку, чтобы показать названия ингредиентов\n"
+#~ "на английском при создании плана питания. Названия взяты из\n"
+#~ "списка Департамента Сельского Хозяйства США. Список\n"
+#~ "довольно обширный (около 7000 записей), что может усложнить поиск."
+
+#~ msgid "Allow external access"
+#~ msgstr "Разрешить внешний доступ"
+
+#~ 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 ""
+#~ "Разрешить внешним пользователям доступ к вашим тренировкам и журналу в "
+#~ "режиме только для чтения. Вы должны установить это прежде, чем вы можете "
+#~ "поделиться ссылками например в социальных сетях."
+
+#~ msgid "Your API key"
+#~ msgstr "Ваш API ключ"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr ""
+#~ "Вам необходимо подтвердить свой адрес электронной почты, чтобы добавлять "
+#~ "упражнения"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Вы были успешно зарегистрированы"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr ""
+#~ "На адрес %(email)s было отправлено электронное письмо с подтверждением"
+
+#~ msgid "View Object"
+#~ msgstr "Просмотр объекта"
+
#~ msgid "Email verification"
#~ msgstr "Подтверждение электронного адреса"
@@ -3254,9 +3675,6 @@ msgstr "Повторно отправить"
#~ msgid "Brand name of product"
#~ msgstr "Название бренда продукта"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Категории ингредиентов"
-
#~ msgid "Amount in grams"
#~ msgstr "Количество в граммах"
@@ -3459,9 +3877,6 @@ msgstr "Повторно отправить"
#~ "Вы можете искать больше одного упражнения, они будут сгруппированы в "
#~ "расширенном наборе."
-#~ msgid "Type"
-#~ msgstr "Тип"
-
#~ msgid "Table"
#~ msgstr "Таблица"
@@ -3561,9 +3976,6 @@ msgstr "Повторно отправить"
#~ msgid "Log overview"
#~ msgstr "Обзор журналов"
-#~ msgid "Workout session"
-#~ msgstr "Тренировка"
-
#~ msgid "Delete with logs"
#~ msgstr "Удалить с журналами"
@@ -3746,9 +4158,6 @@ msgstr "Повторно отправить"
#~ "можете просто ввести одно значение: например, для 4 подходов просто "
#~ "введите «10» повторений, это автоматически становится «4 x 10»."
-#~ msgid "Edit set"
-#~ msgstr "Изменить подход"
-
#~ msgid "Update"
#~ msgstr "Обновление"
@@ -3797,9 +4206,6 @@ msgstr "Повторно отправить"
#~ msgid "Delete workout log"
#~ msgstr "Удалить запись тренировки"
-#~ msgid "Create schedule"
-#~ msgstr "Создать программу"
-
#~ msgid "Edit workout"
#~ msgstr "Изменить тренировку"
@@ -3987,9 +4393,6 @@ msgstr "Повторно отправить"
#~ "ожидании решения относительно его добавления в базу данных. До этого, его "
#~ "не будет показано ни в обзоре, ни в поиске."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Пожалуйста, выберите одну из опций ниже."
-
#~ msgid "Accept"
#~ msgstr "Принять"
diff --git a/wger/locale/sk/LC_MESSAGES/django.po b/wger/locale/sk/LC_MESSAGES/django.po
index e4262db24..de8984556 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -29,10 +29,10 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -44,85 +44,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr ""
-#: 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:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
-msgid "First name"
+#: core/forms.py:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: 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"
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
msgstr ""
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
+msgid "First name"
msgstr ""
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
+msgid "Last name"
msgstr ""
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr ""
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -130,27 +126,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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr ""
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr ""
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: 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"
+#: core/forms.py:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -222,148 +221,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -371,8 +340,7 @@ msgstr ""
msgid "Repetitions"
msgstr ""
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -381,12 +349,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -465,6 +433,74 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+msgid "Current email"
+msgstr ""
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+msgid "Resend confirmation email"
+msgstr ""
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+msgid "Change email"
+msgstr ""
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr ""
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -472,7 +508,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr ""
@@ -491,7 +527,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -500,15 +536,15 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -522,14 +558,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr ""
@@ -539,9 +574,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -556,7 +591,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -568,7 +603,7 @@ msgstr ""
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr ""
@@ -580,7 +615,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -602,7 +637,7 @@ msgstr ""
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -627,7 +662,7 @@ msgstr ""
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr ""
@@ -648,7 +683,7 @@ msgstr ""
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr ""
@@ -664,7 +699,7 @@ msgstr ""
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr ""
@@ -676,42 +711,42 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -761,34 +796,26 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr ""
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -796,37 +823,160 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+msgid "Delete API key"
+msgstr ""
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr ""
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+msgid "API documentation"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -839,102 +989,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -943,114 +1085,112 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1058,78 +1198,98 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+msgid "Set password"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1141,52 +1301,64 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1216,43 +1388,131 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/history/overview.html:27
-msgid "Action"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+msgid "deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+msgid "translations"
+msgstr ""
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+msgid "First"
+msgstr ""
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+msgid "Last"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
@@ -1275,6 +1535,33 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr ""
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr ""
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr ""
@@ -1373,15 +1660,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1473,7 +1760,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1547,11 +1834,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1568,15 +1855,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -1974,26 +2261,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2046,53 +2333,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr ""
@@ -2134,77 +2421,95 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
+msgid "Ingredient pagination"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:59
+msgid "First page"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+msgid "Nutri-Score"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2276,36 +2581,36 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2664,35 +2969,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
diff --git a/wger/locale/sl/LC_MESSAGES/django.po b/wger/locale/sl/LC_MESSAGES/django.po
index d5f912d36..2ae5f9403 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -29,10 +29,10 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -44,85 +44,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr ""
-#: 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:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
-msgid "First name"
+#: core/forms.py:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: 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"
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
msgstr ""
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
+msgid "First name"
msgstr ""
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
+msgid "Last name"
msgstr ""
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr ""
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -130,27 +126,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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr ""
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr ""
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: 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"
+#: core/forms.py:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -222,148 +221,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -371,8 +340,7 @@ msgstr ""
msgid "Repetitions"
msgstr ""
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -381,12 +349,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -465,6 +433,74 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+msgid "Current email"
+msgstr ""
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+msgid "Resend confirmation email"
+msgstr ""
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+msgid "Change email"
+msgstr ""
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr ""
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -472,7 +508,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr ""
@@ -491,7 +527,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -500,15 +536,15 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -522,14 +558,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr ""
@@ -539,9 +574,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -556,7 +591,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -568,7 +603,7 @@ msgstr ""
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr ""
@@ -580,7 +615,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -602,7 +637,7 @@ msgstr ""
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -627,7 +662,7 @@ msgstr ""
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr ""
@@ -648,7 +683,7 @@ msgstr ""
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr ""
@@ -664,7 +699,7 @@ msgstr ""
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr ""
@@ -676,42 +711,42 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -761,34 +796,26 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr ""
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -796,37 +823,160 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+msgid "Delete API key"
+msgstr ""
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr ""
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+msgid "API documentation"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -839,102 +989,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -943,114 +1085,112 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1058,78 +1198,98 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+msgid "Set password"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1141,52 +1301,64 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1216,43 +1388,131 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/history/overview.html:27
-msgid "Action"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+msgid "deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+msgid "translations"
+msgstr ""
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+msgid "First"
+msgstr ""
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+msgid "Last"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
@@ -1275,6 +1535,33 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr ""
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr ""
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr ""
@@ -1373,15 +1660,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1473,7 +1760,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1547,11 +1834,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1568,15 +1855,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -1974,26 +2261,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2046,53 +2333,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr ""
@@ -2134,77 +2421,95 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
+msgid "Ingredient pagination"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:59
+msgid "First page"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+msgid "Nutri-Score"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2276,36 +2581,36 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2664,35 +2969,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
diff --git a/wger/locale/sr/LC_MESSAGES/django.po b/wger/locale/sr/LC_MESSAGES/django.po
index 193dd155a..85130da0a 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -29,10 +29,10 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -44,85 +44,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr ""
-#: 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:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
-msgid "First name"
+#: core/forms.py:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: 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"
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
msgstr ""
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
+msgid "First name"
msgstr ""
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
+msgid "Last name"
msgstr ""
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr ""
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -130,27 +126,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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr ""
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr ""
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: 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"
+#: core/forms.py:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -222,148 +221,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -371,8 +340,7 @@ msgstr ""
msgid "Repetitions"
msgstr ""
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -381,12 +349,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -465,6 +433,74 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+msgid "Current email"
+msgstr ""
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+msgid "Resend confirmation email"
+msgstr ""
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+msgid "Change email"
+msgstr ""
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr ""
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -472,7 +508,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr ""
@@ -491,7 +527,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -500,15 +536,15 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -522,14 +558,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr ""
@@ -539,9 +574,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -556,7 +591,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -568,7 +603,7 @@ msgstr ""
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr ""
@@ -580,7 +615,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -602,7 +637,7 @@ msgstr ""
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -627,7 +662,7 @@ msgstr ""
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr ""
@@ -648,7 +683,7 @@ msgstr ""
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr ""
@@ -664,7 +699,7 @@ msgstr ""
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr ""
@@ -676,42 +711,42 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -761,34 +796,26 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr ""
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -796,37 +823,159 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+msgid "Delete API key"
+msgstr ""
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr ""
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+msgid "API documentation"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -839,102 +988,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -943,114 +1084,112 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1058,78 +1197,98 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+msgid "Set password"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1141,52 +1300,64 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1216,43 +1387,131 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/history/overview.html:27
-msgid "Action"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+msgid "deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+msgid "translations"
+msgstr ""
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+msgid "First"
+msgstr ""
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+msgid "Last"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
@@ -1275,6 +1534,33 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr ""
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr ""
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr ""
@@ -1373,15 +1659,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1473,7 +1759,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1547,11 +1833,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1568,15 +1854,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -1974,26 +2260,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2046,53 +2332,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr ""
@@ -2134,77 +2420,95 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
+msgid "Ingredient pagination"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:59
+msgid "First page"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+msgid "Nutri-Score"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2276,36 +2580,36 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2664,35 +2968,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
diff --git a/wger/locale/sv/LC_MESSAGES/django.po b/wger/locale/sv/LC_MESSAGES/django.po
index d0d9f326b..1e59f9296 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -35,10 +35,10 @@ msgstr ""
"alla nya registrerade användare här gym och uppdatera alla befintliga "
"användare utan ett gym."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -50,87 +50,82 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Redigera"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Formuläret är säkrat med reCAPTCHA"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Registrera dig"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Förnamn"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Efternamn"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "E-post"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Födelsedatum"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Personlig data"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Träningspåminnelser"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Andra inställningar"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Spara"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "E-post"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Denna mail används redan."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Lösenord"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Vänligen ange ditt nuvarande lösenord."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -138,27 +133,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Ta bort"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Ogiltigt lösenord"
-#: 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:289
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirm"
+msgstr "Konfiguration"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Ladda upp"
@@ -232,34 +232,10 @@ msgid "Imperial (pound)"
msgstr "Imperial (pund)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Visa träningskommentarer"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Välj för att visa övningskommentarer i träningsvyn"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Också använda ingredienser i Svenska"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Välj för att även visa ingredienser på Engelska under kostplansskapandet. "
-"Dessa ingredienser extraheras från en lista skapad av \"The US Department of "
-"Agriculture\". Denna lista är väldigt övergripande, med runt 7000 objekt, "
-"men kan bli överväldigande och göra det svårt att söka."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Aktivera träningspåminnelser"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -267,19 +243,19 @@ msgstr ""
"Välj för att aktivera automatiska träningspåminnelser. Du behöver ange en "
"giltig e-postadress för att detta ska fungera."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Påminn före förfallodagen"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Antalet dagar du vill bli påmind innan ett träningspass löper ut."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Standardvaraktigheten för träningspass"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -287,105 +263,92 @@ msgstr ""
"Standardlängden i veckor av träningspass utanför ett schema. Används för e-"
"postpåminnelser."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Notisspråk"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
"Språk som används i e-postnotiser. Detta påverkar inte språket på hemsidan."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Ålder"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Längd (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Timmars sömn"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Genomsnittlig sömntid per natt"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Arbete"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Timmar per dag i genomsnitt"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Fysisk intensitet"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Cirka"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Sport"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Timmar per vecka i genomsnitt"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Fritid"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Totala dagliga kalorier"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Totala kaloriintaget, inklusive t.ex. eventuellt överskott"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Viktenhet"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "TIllåt extern tillgång"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Ge andra användare tillgång till dina träningspass och loggar i skrivskyddat "
-"läge. Du behöver tillåta detta innan du kan dela länkar, t.ex. till social "
-"media."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Automatiska påminnleser för viktnoteringar"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "Antal dagar sedan senaste viktnotering (Ange 0 för att avaktivera)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Summan av alla timmar måste vara 24"
@@ -393,8 +356,7 @@ msgstr "Summan av alla timmar måste vara 24"
msgid "Repetitions"
msgstr "Repetitioner"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Tid"
@@ -403,12 +365,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Namn"
@@ -496,6 +458,88 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "E-postmeddelanden"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Aktuell version"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Configuration"
+msgid "Resend confirmation email"
+msgstr "Konfiguration"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Cancel change"
+msgstr "Ändra"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgctxt "Noun, not verb"
+#| msgid "Change"
+msgid "Change to"
+msgstr "Ändra"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Configuration"
+msgid "Change email"
+msgstr "Konfiguration"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Logga in"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Glömt ditt lösenord?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Inget konto?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -503,7 +547,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Tillbaka till \"%(target)s\""
@@ -523,7 +567,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Språk"
@@ -532,15 +576,15 @@ msgid "Nothing found."
msgstr "Ingenting hittades"
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -554,14 +598,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Alternativ"
@@ -571,9 +614,9 @@ msgstr "Licens lista"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -588,7 +631,7 @@ msgstr "Licens lista"
msgid "Nothing found"
msgstr "Ingenting hittades"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -600,7 +643,7 @@ msgstr "Träning"
msgid "Routines"
msgstr "Rutiner"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Kalender"
@@ -614,7 +657,7 @@ msgstr "Makronäringsämnen"
msgid "Gallery"
msgstr "Galleri"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -638,7 +681,7 @@ msgstr "Publika mallar"
msgid "Exercises"
msgstr "Övningar"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Administration"
@@ -665,7 +708,7 @@ msgstr "Kategorier"
msgid "Nutrition"
msgstr "Kost"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Kostplaner"
@@ -686,7 +729,7 @@ msgstr "Ingrediensöversikt"
msgid "Body weight"
msgstr "Kroppsvikt"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Viktöversikt"
@@ -702,7 +745,7 @@ msgstr ""
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Licens"
@@ -714,42 +757,42 @@ msgstr "Dokument för utvecklare"
msgid "Get the code"
msgstr "Hämta koden"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Översätt"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Återställ lösenord"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Logga ut"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Mina preferenser"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Licenser"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetitioner"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Viktenheter"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Användarlista"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Gym"
@@ -803,34 +846,26 @@ msgstr "Tack för att du använder vår sida!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s lag"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "tidigare"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "nästa"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Stäng"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Skapa några demoposter"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Villkor för tjänsten"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -838,37 +873,168 @@ msgstr ""
msgid "Features"
msgstr "Funktioner"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Din API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Du har ingen API key ännu"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Generera nya API key"
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Skapa schema"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Träningssession"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API key"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Ta bort nuvarande API key och skapa en ny"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Generera nya API key"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Generera nya API key"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Du har ingen API key ännu"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokumentation"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokumentation"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Ta bort konto"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Är du säker?"
@@ -885,102 +1051,94 @@ msgstr ""
"(träningspass, loggar, etc.).\n"
"Detta kan inte ångras. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Inget konto?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Glömt ditt lösenord?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "sista %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Beskrivning"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Antal loggar (dagar)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Senaste aktiviteten"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Inga träningspass hittade."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Log"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Generellt intryck"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Anteckningar"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Energi"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Kolhydrater"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Fett"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kcal"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,193 +1147,215 @@ msgstr "kcal"
msgid "Actions"
msgstr "Åtgärder"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Inaktivera användare"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Aktivera användare"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Återställ användarlösenord"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roller"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Lösenordsåterställningsbekräftelse"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Nej"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Ja"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detaljer"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adress"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Registrerad"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Senaste inloggning"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Status"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktiv"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Inaktiv"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Kontrakt"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Dokument"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Hämta"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Inkludera i inaktiv överblick"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Logga in som denna användare"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Logga in som denna användare"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Preferenser"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Ändra lösenord"
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Återställ lösenord"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
-msgstr "Ändra lösenord"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Ta bort konto"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kg"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "lb"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Borttagning genomförd"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Ta bort {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Redigera {0}"
@@ -1190,52 +1370,68 @@ msgstr ""
"så du kan lära dig hur sidan fungerar. Känn dig fri att ändra eller ta bort "
"dom!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Konto \"{0}\" är nu borttaget"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Du är nu registrerad"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Inställningar uppdaterade"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Vänligen välj ett av alternativen nedan."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Användaren har nu tagits bort"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Användaren har nu aktiverats"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Redigera användare"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Ja, ta bort"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Användarnamn"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Gym"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "På latin, e.g. \"Pectoralis major\""
@@ -1267,55 +1463,158 @@ msgstr ""
msgid "Equipment list"
msgstr "Utrustningslista"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
#, fuzzy
#| msgid "Exercise day"
msgid "Exercise admin history"
msgstr "Träningsdag"
-#: exercises/templates/history/overview.html:27
+#: exercises/templates/history/overview.html:16
#, fuzzy
-#| msgid "Actions"
-msgid "Action"
-msgstr "Åtgärder"
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Redigera set"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Användare"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Redigera set"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Redigera set"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
-#: exercises/templates/history/overview.html:29
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Ta bort"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translate"
+msgid "translations"
+msgstr "Översätt"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Ja, ta bort"
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
#, fuzzy
#| msgctxt "As in \"email subject\""
#| msgid "Subject"
-msgid "Object"
+msgid "Open object"
msgstr "Ämne"
-#: exercises/templates/history/overview.html:31
-#, fuzzy
-#| msgctxt "Noun, not verb"
-#| msgid "Change"
-msgid "Changes"
-msgstr "Ändra"
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Klicka här för mer information"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Förnamn"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "tidigare"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Efternamn"
+
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
msgstr "Muskelöversikt"
@@ -1336,6 +1635,35 @@ msgstr "Lägg till ny utrustning"
msgid "Delete equipment?"
msgstr "Ta bort utrustning?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Användare"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Typ"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Åtgärder"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Lägg till muskel"
@@ -1439,15 +1767,15 @@ msgstr "Startdatum"
msgid "End date"
msgstr "Slutdatum"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Postnummer"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Stad"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Gata"
@@ -1541,7 +1869,7 @@ msgstr "Gymlista"
msgid "Global gym configuration"
msgstr "Global gymkonfiguration"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Lägg till nytt gym"
@@ -1620,11 +1948,11 @@ msgstr ""
"Denna användares lösenord har återställts. Vänligen meddela användaren om "
"deras nya lösenord."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Lägga till anteckning"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Lägg till avtal"
@@ -1641,15 +1969,15 @@ msgstr "Ta bort {0}"
msgid "Add contract type"
msgstr "Lägg till avtalstyp"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Kön"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Lägg till användare till gym"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Redigera gym"
@@ -2086,26 +2414,26 @@ msgstr "Träning"
msgid "Routine will expire soon"
msgstr "Träningspass snart löper ut"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Dålig"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Neutral"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Bra"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Om du anger en tid måste du ange både start-och sluttid."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Starttiden kan inte vara efter sluttiden."
+
#: manager/templates/routines/email_reminder.tpl:3
#, fuzzy, python-format
#| msgid "Your current workout '%(workout)s' expired %(days)s days ago."
@@ -2172,27 +2500,27 @@ msgstr "Träning"
msgid "Workout for %s"
msgstr "Träning för %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Enhet"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Grundläggande kaloriintag"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
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:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Extra kalorier"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2200,29 +2528,29 @@ msgstr ""
"Extra kalorier att lägga till basen (för att subtrahera, ange ett negativt "
"tal)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Ingrediens"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
#, 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
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2273,83 +2601,107 @@ msgstr ""
"slutförd."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Variationer"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Inga ingredienser."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "ingredient name"
+msgid "Ingredient pagination"
+msgstr "ingrediensnamn"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Förnamn"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "tidigare"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "nästa"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Sök"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Makronäringsämnen"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Sockerinehåll i kolhydraterna"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Mättat-fett innehåll i fettet"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Andra"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Natrium"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Klicka här för mer information"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Kost"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Lägg till ny viktenhet"
@@ -2436,36 +2788,36 @@ 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:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Lägg till en ny ingrediens"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Näringsdata"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Totalt"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Procent av energi"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g / kroppsvikt (kg)"
@@ -2873,25 +3225,25 @@ msgstr ""
msgid "Translation"
msgstr "Översätt"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Ja, ta bort"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
#, fuzzy
#| msgid "Author"
msgid "Author(s)"
msgstr "Skapare"
-#: utils/models.py:67
+#: utils/models.py:91
#, fuzzy
#| msgid ""
#| "If you are not the author, enter the name or source here. This is needed "
@@ -2901,15 +3253,15 @@ msgstr ""
"Om du inte är skapaen, ange namn eller källa här. Detta är nödvändigt för "
"vissa licenser e.g. CC-BY-SA."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3044,6 +3396,53 @@ msgstr "Du kan korrigera listan här och skicka om den så ofta du vill."
msgid "Re-Submit"
msgstr "Skicka igen"
+#~ 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)."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Träningspåminnelser"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Visa träningskommentarer"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Välj för att visa övningskommentarer i träningsvyn"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Också använda ingredienser i Svenska"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Välj för att även visa ingredienser på Engelska under kostplansskapandet. "
+#~ "Dessa ingredienser extraheras från en lista skapad av \"The US Department "
+#~ "of Agriculture\". Denna lista är väldigt övergripande, med runt 7000 "
+#~ "objekt, men kan bli överväldigande och göra det svårt att söka."
+
+#~ msgid "Allow external access"
+#~ msgstr "TIllåt extern tillgång"
+
+#~ 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 ""
+#~ "Ge andra användare tillgång till dina träningspass och loggar i "
+#~ "skrivskyddat läge. Du behöver tillåta detta innan du kan dela länkar, "
+#~ "t.ex. till social media."
+
+#~ msgid "Your API key"
+#~ msgstr "Din API key"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Du är nu registrerad"
+
#~ msgid "Email verification"
#~ msgstr "E-post verifiering"
@@ -3336,9 +3735,6 @@ msgstr "Skicka igen"
#~ "Du kan söka efter mer än en övning, dessa kommer att grupperas för ett "
#~ "superset."
-#~ msgid "Type"
-#~ msgstr "Typ"
-
#~ msgid "Table"
#~ msgstr "Tabell"
@@ -3434,9 +3830,6 @@ msgstr "Skicka igen"
#~ msgid "Log overview"
#~ msgstr "Loggöversikt"
-#~ msgid "Workout session"
-#~ msgstr "Träningssession"
-
#~ msgid "Delete with logs"
#~ msgstr "Ta bort tillsammans med loggar"
@@ -3593,9 +3986,6 @@ msgstr "Skicka igen"
#~ "bara ange ett värde: e.g. för 4 set, skriv bara \"10\" för "
#~ "upprepningarna. Detta blir automatiskt \"4 x 10\"."
-#~ msgid "Edit set"
-#~ msgstr "Redigera set"
-
#, fuzzy
#~| msgid "No schedules found."
#~ msgid "No templates found."
@@ -3637,9 +4027,6 @@ msgstr "Skicka igen"
#~ msgid "Delete workout log"
#~ msgstr "Ta bort träningslogg"
-#~ msgid "Create schedule"
-#~ msgstr "Skapa schema"
-
#~ msgid "Edit workout"
#~ msgstr "Redigera träningspass"
@@ -3814,9 +4201,6 @@ msgstr "Skicka igen"
#~ "i databasen. Tills dess kommed den inte visas i översikten eller i "
#~ "sökresultaten."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Vänligen välj ett av alternativen nedan."
-
#~ msgid "Accept"
#~ msgstr "Acceptera"
@@ -3870,9 +4254,6 @@ msgstr "Skicka igen"
#~ msgid "That's done here"
#~ msgstr "Det är gjort här"
-#~ msgid "ingredient name"
-#~ msgstr "ingrediensnamn"
-
#~ msgid "Only registered users can do this"
#~ msgstr "Endast registrerade användare kan göra detta"
diff --git a/wger/locale/ta/LC_MESSAGES/django.po b/wger/locale/ta/LC_MESSAGES/django.po
index ccb9720f9..74c065b56 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -28,10 +28,10 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -43,86 +43,82 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr ""
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr ""
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "பதிவு செய்"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "முதல் பெயர்"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "கடைசி பெயர்"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "மின்னஞ்சல்"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr ""
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "பிறந்த தேதி"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "தனிப்பட்ட விவரங்கள்"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "பயிற்சி நினைவூட்டல்"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "மின்னஞ்சல்"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"கடவுச்சொல் மீட்பு மற்றும் விருப்பமான மின்னஞ்சல் நினைவூட்டல்களுக்குப் பயன்படுத்தப்படுகிறது."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "மின்னஞ்சல் ஏற்கனவே பதிவு செய்யப்பட்டுள்ளது."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "கடவுச்சொல்"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "உங்கள் தற்போதைய கடவுச்சொல்லை உள்ளிடவும்."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -130,27 +126,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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "நீக்கு"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "தவறான கடவுச்சொல்"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -222,148 +221,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -371,8 +340,7 @@ msgstr ""
msgid "Repetitions"
msgstr ""
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -381,12 +349,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -465,6 +433,74 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+msgid "Current email"
+msgstr ""
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+msgid "Resend confirmation email"
+msgstr ""
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+msgid "Change email"
+msgstr ""
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "உள்நுழை"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -472,7 +508,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr ""
@@ -491,7 +527,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -500,15 +536,15 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -522,14 +558,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr ""
@@ -539,9 +574,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -556,7 +591,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -568,7 +603,7 @@ msgstr ""
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr ""
@@ -580,7 +615,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -602,7 +637,7 @@ msgstr ""
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -627,7 +662,7 @@ msgstr ""
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr ""
@@ -648,7 +683,7 @@ msgstr ""
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr ""
@@ -664,7 +699,7 @@ msgstr ""
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr ""
@@ -676,42 +711,42 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -761,34 +796,26 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr ""
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -796,37 +823,160 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr ""
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete API key"
+msgstr "நீக்கு"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr ""
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+msgid "API documentation"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -839,102 +989,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -943,114 +1085,112 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1058,78 +1198,100 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Password"
+msgid "Set password"
+msgstr "கடவுச்சொல்"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1141,52 +1303,64 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1216,45 +1390,139 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/history/overview.html:27
-msgid "Action"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "நீக்கு"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+msgid "translations"
+msgstr ""
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "முதல் பெயர்"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "கடைசி பெயர்"
+
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
msgstr ""
@@ -1275,6 +1543,33 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr ""
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr ""
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr ""
@@ -1373,15 +1668,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1473,7 +1768,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1547,11 +1842,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1568,15 +1863,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -1974,26 +2269,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2046,53 +2341,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr ""
@@ -2134,77 +2429,97 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
+msgid "Ingredient pagination"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "முதல் பெயர்"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+msgid "Nutri-Score"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2276,36 +2591,36 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2664,35 +2979,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2809,3 +3124,6 @@ msgstr ""
#: weight/templates/import_csv_preview.html:85
msgid "Re-Submit"
msgstr ""
+
+#~ msgid "Workout reminders"
+#~ msgstr "பயிற்சி நினைவூட்டல்"
diff --git a/wger/locale/th/LC_MESSAGES/django.po b/wger/locale/th/LC_MESSAGES/django.po
index 34136f914..e0c4cd3a9 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -28,10 +28,10 @@ msgid ""
"registered users to this gym and update all existing users without a gym."
msgstr ""
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -43,85 +43,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr ""
-#: 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:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
-msgid "First name"
+#: core/forms.py:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: 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"
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
msgstr ""
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
+msgid "First name"
msgstr ""
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
+msgid "Last name"
msgstr ""
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr ""
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -129,27 +125,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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr ""
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr ""
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: 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"
+#: core/forms.py:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -221,148 +220,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -370,8 +339,7 @@ msgstr ""
msgid "Repetitions"
msgstr ""
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr ""
@@ -380,12 +348,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -464,6 +432,74 @@ msgstr ""
msgid "the wger Team"
msgstr ""
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+msgid "Email address"
+msgstr ""
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+msgid "Current email"
+msgstr ""
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+msgid "Resend confirmation email"
+msgstr ""
+
+#: core/templates/account/email_change.html:42
+msgid "Cancel change"
+msgstr ""
+
+#: core/templates/account/email_change.html:54
+msgid "Change to"
+msgstr ""
+
+#: core/templates/account/email_change.html:66
+msgid "Change email"
+msgstr ""
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr ""
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -471,7 +507,7 @@ msgid ""
"performed on their data."
msgstr ""
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr ""
@@ -490,7 +526,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -499,15 +535,15 @@ msgid "Nothing found."
msgstr ""
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr ""
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -521,14 +557,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr ""
@@ -538,9 +573,9 @@ msgstr ""
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -555,7 +590,7 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr ""
@@ -567,7 +602,7 @@ msgstr ""
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr ""
@@ -579,7 +614,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -601,7 +636,7 @@ msgstr ""
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -626,7 +661,7 @@ msgstr ""
msgid "Nutrition"
msgstr ""
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr ""
@@ -647,7 +682,7 @@ msgstr ""
msgid "Body weight"
msgstr ""
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr ""
@@ -663,7 +698,7 @@ msgstr ""
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr ""
@@ -675,42 +710,42 @@ msgstr ""
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -760,34 +795,26 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr ""
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr ""
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr ""
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -795,37 +822,157 @@ msgstr ""
msgid "Features"
msgstr ""
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
+#: core/templates/user/api_key.html:4
+msgid "API access"
msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+msgid "JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+msgid "Delete API key"
+msgstr ""
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr ""
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
+#: core/templates/user/api_key.html:213
+msgid "API documentation"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr ""
@@ -838,102 +985,94 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr ""
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr ""
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr ""
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr ""
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr ""
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -942,114 +1081,112 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr ""
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr ""
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr ""
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr ""
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr ""
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr ""
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr ""
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr ""
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr ""
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr ""
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr ""
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr ""
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr ""
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr ""
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr ""
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr ""
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr ""
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr ""
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr ""
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr ""
-#: core/templates/user/overview.html:513
-#, python-format
-msgid "Admin login is only available for users in %(gym_name)s"
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
msgstr ""
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
+#: core/templates/user/overview.html:539
+#, python-format
+msgid "Admin login is only available for users in %(gym_name)s"
msgstr ""
#: core/templates/user/preferences.html:4
@@ -1057,78 +1194,98 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
msgstr ""
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:42
+msgid "Set password"
msgstr ""
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr ""
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr ""
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr ""
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr ""
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr ""
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1140,52 +1297,64 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:287
-msgid "You were successfully registered"
+#: core/views/user.py:311
+msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:357
-msgid "Settings successfully updated"
+#: core/views/user.py:314
+msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:396
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+msgid "API key was deleted"
+msgstr ""
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr ""
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr ""
@@ -1215,43 +1384,131 @@ msgstr ""
msgid "Equipment list"
msgstr ""
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr ""
-#: exercises/templates/history/overview.html:27
-msgid "Action"
+#: exercises/templates/history/overview.html:16
+msgid "Edits last 24h"
msgstr ""
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
+#: exercises/templates/history/overview.html:24
+msgid "Edits last 7d"
+msgstr ""
+
+#: exercises/templates/history/overview.html:32
+msgid "Edits last 30d"
msgstr ""
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
msgstr ""
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
msgstr ""
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+msgid "deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+msgid "translations"
+msgstr ""
+
+#: exercises/templates/history/overview.html:129
+msgid "Object was deleted"
+msgstr ""
+
+#: exercises/templates/history/overview.html:180
+msgid "Revert change"
+msgstr ""
+
+#: exercises/templates/history/overview.html:187
+msgid "Open object"
+msgstr ""
+
+#: exercises/templates/history/overview.html:198
+msgid "Revert this change?"
+msgstr ""
+
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr ""
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
+
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
+
+#: exercises/templates/history/overview.html:246
+msgid "History pagination"
+msgstr ""
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+msgid "First"
+msgstr ""
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+msgid "Previous"
msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+msgid "Last"
msgstr ""
#: exercises/templates/muscles/admin-overview.html:4
@@ -1274,6 +1531,33 @@ msgstr ""
msgid "Delete equipment?"
msgstr ""
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr ""
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr ""
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr ""
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr ""
@@ -1372,15 +1656,15 @@ msgstr ""
msgid "End date"
msgstr ""
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr ""
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr ""
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr ""
@@ -1472,7 +1756,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1546,11 +1830,11 @@ msgid ""
"password."
msgstr ""
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr ""
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr ""
@@ -1567,15 +1851,15 @@ msgstr ""
msgid "Add contract type"
msgstr ""
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -1973,26 +2257,26 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr ""
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr ""
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2045,53 +2329,53 @@ msgstr ""
msgid "Workout for %s"
msgstr ""
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr ""
@@ -2133,77 +2417,95 @@ msgid ""
msgstr ""
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
msgid "Vegetarian"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr ""
#: nutrition/templates/ingredient/overview.html:54
-msgid "Search"
+msgid "Ingredient pagination"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:57
-msgid "Filter"
+#: nutrition/templates/ingredient/overview.html:59
+msgid "First page"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:83
-msgid "Apply"
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
msgstr ""
-#: nutrition/templates/ingredient/overview.html:85
-msgid "Reset"
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:90
+msgid "Search"
+msgstr ""
+
+#: nutrition/templates/ingredient/overview.html:93
+msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:46 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
msgid "Dietary information"
msgstr ""
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+msgid "Nutri-Score"
+msgstr ""
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr ""
@@ -2275,36 +2577,36 @@ msgid ""
"yourself for some weeks and change the total amount if needed."
msgstr ""
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
@@ -2663,35 +2965,35 @@ msgstr ""
msgid "Translation"
msgstr ""
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr ""
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr ""
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr ""
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr ""
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr ""
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr ""
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr ""
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
diff --git a/wger/locale/tr/LC_MESSAGES/django.po b/wger/locale/tr/LC_MESSAGES/django.po
index 7c4a742cd..889c4e0d6 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -34,10 +34,10 @@ msgstr ""
"kullanıcıları bu spor salonuna atayacak ve spor salonu olmayan tüm mevcut "
"kullanıcıları güncelleyecektir."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -49,89 +49,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Düzenle"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Form reCAPTCHA ile güvence altına alındı"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Kayıt ol"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "İsim"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Soyisim"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "E-posta"
-
-#: 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:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Doğum tarihi"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Kişisel bilgiler"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Antrenman hatırlatıcıları"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Diğer ayarlar"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Kaydet"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "E-posta"
+
+#: core/forms.py:211
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:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Bu e-posta adresi zaten kullanılıyor."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Parola"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Lütfen geçerli parolanızı girin."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -139,27 +133,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Sil"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Geçersiz parola"
-#: 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:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Doğrulanmamış e-posta adresi"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Sunmak"
@@ -233,34 +232,10 @@ msgid "Imperial (pound)"
msgstr "İngiliz (paunt)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Egzersiz yorumlarını göster"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Antrenman görünümünde egzersiz yorumlarını göstermek için işaretleyin"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "İngilizce malzemeleri de kullanın"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Oluştururken malzemeleri İngilizce olarak da göstermek için kontrol edin\n"
-"beslenme planı. Bu bileşenler, sağlanan bir listeden çıkarılmıştır.\n"
-"ABD Tarım Bakanlığı tarafından. Çevresinde son derece eksiksiz\n"
-"7000 giriş, ancak biraz bunaltıcı olabilir ve aramayı zorlaştırabilir."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Antrenman hatırlatıcılarını aktifleştir"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -268,20 +243,20 @@ msgstr ""
"Antrenmanlar için otomatik hatırlatıcıları etkinleştirmek için işaretleyin. "
"Bunun çalışması için geçerli bir e-posta adresi sağlamanız gerekiyor."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Son kullanma tarihinden önce hatırlat"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
"Bir antrenman sona ermeden önce hatırlatılmasını istediğiniz gün sayısı."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Varsayılan antrenman süresi"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -289,11 +264,11 @@ msgstr ""
"Bir programda olmayan antrenman haftaları için varsayılan süre. E-posta "
"egzersiz hatırlatıcıları için kullanılır."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Bildirim dili"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -301,95 +276,82 @@ msgstr ""
"Size e-posta bildirimleri gönderirken kullanılacak dil, ör. egzersizler için "
"e-posta hatırlatıcıları. Bu, web sitesinde kullanılan dili etkilemez."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Yaş"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Boy (cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Uyku saatleri"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Günlük ortalama uyuma süresi"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "İş"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Günlük ortalama saat"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Fiziksel yoğunluk"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Yaklaşık olarak"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Spor"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Haftalık ortalama saat"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Boş zaman"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Toplam günlük kalori"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Toplam kalori alımı, örn. herhangi bir fazlalık"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Ağırlık birimi"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Harici erişime izin ver"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Harici kullanıcıların egzersiz programlarınıza ve günlüklerinize salt okunur "
-"modda erişmesine izin verin. Bağlantıları paylaşmadan önce bunu ayarlamanız "
-"gerekir, ör. sosyal medyaya."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Kilo girişleri için otomatik hatırlatıcılar"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Son ağırlık girişinden sonraki gün sayısı (devre dışı bırakmak için 0 girin)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Tüm saatlerin toplamı 24 olmalıdır"
@@ -397,8 +359,7 @@ msgstr "Tüm saatlerin toplamı 24 olmalıdır"
msgid "Repetitions"
msgstr "Tekrarlar"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Zaman"
@@ -407,12 +368,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "İsim"
@@ -505,6 +466,86 @@ msgstr ""
msgid "the wger Team"
msgstr "wger Ekibi"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "E-postalar"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Şimdiki versiyonu"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Doğrulama e-postası gönder"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Değişiklikleri görüntüle"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Değişiklikler"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Doğrulanmamış e-posta adresi"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Oturum aç"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Parolanızı mı unuttunuz?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Hesap yok?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, fuzzy, python-format
#| msgid ""
@@ -521,7 +562,7 @@ msgstr ""
"işlemler onların verileri üzerinde gerçekleştirilir.\n"
" "
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "\"%(target)s\" sayfasına geri dön"
@@ -549,7 +590,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/language/overview.html:4 core/templates/navigation.html:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Diller"
@@ -558,15 +599,15 @@ msgid "Nothing found."
msgstr "Bulunamadı."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
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: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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -580,14 +621,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Seçenekler"
@@ -597,9 +637,9 @@ msgstr "Lisans listesi"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -614,7 +654,7 @@ msgstr "Lisans listesi"
msgid "Nothing found"
msgstr "Hiçbir şey Bulunamadı"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Künye"
@@ -626,7 +666,7 @@ msgstr "Eğitim"
msgid "Routines"
msgstr ""
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Takvim"
@@ -638,7 +678,7 @@ msgstr "Ölçümler"
msgid "Gallery"
msgstr "Galeri"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -660,7 +700,7 @@ msgstr "Herkese açık şablonlar"
msgid "Exercises"
msgstr "Egzersizler"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Yönetim"
@@ -685,7 +725,7 @@ msgstr "Kategoriler"
msgid "Nutrition"
msgstr "Beslenme"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Beslenme planları"
@@ -706,7 +746,7 @@ msgstr "İçeriğe genel bakış"
msgid "Body weight"
msgstr "Vücut ağırlığı"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Ağırlığa genel bakış"
@@ -722,7 +762,7 @@ msgstr ""
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Lisans"
@@ -734,42 +774,42 @@ msgstr "Geliştirici belgeleri"
msgid "Get the code"
msgstr "Kodu alın"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Çevir"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Parolayı sıfırla"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Çıkış"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Benim tercihlerim"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Lisanslar"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Tekrarlama birimleri"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Ağırlık birimleri"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Kullanıcı listesi"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Spor salonları"
@@ -823,35 +863,27 @@ msgstr "Sitemizi kullandığınız için teşekkürler!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s ekibi"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "önceki"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "Sonraki"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Kapat"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
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:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Bazı demo girişleri oluşturun"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Kullanım Şartları"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -859,37 +891,168 @@ msgstr ""
msgid "Features"
msgstr "Özellikleri"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API anahtarı"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "API anahtarınız"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "Henüz API anahtarınız yok"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Yeni API anahtarı oluşturun"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Program oluştur"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Egzersiz seansı"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API anahtarı"
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Mevcut API anahtarını silin ve yenisini oluşturun"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Yeni API anahtarı oluşturun"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Yeni API anahtarı oluşturun"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "Henüz API anahtarınız yok"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Dokümantasyon"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Dokümantasyon"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Hesabı sil"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Emin misiniz?"
@@ -906,102 +1069,94 @@ msgstr ""
"edilemez bir\n"
"şekilde kaldıracaktır ve geri alınamaz. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Hesap yok?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Parolanızı mı unuttunuz?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "son %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Açıklama"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Günlük sayısı (gün)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Son Aktivite"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Antrenman bulunamadı."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Kayıt"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Genel izlenim"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Notlar"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Enerji"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Protein"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Karbonhidratlar"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Yağ"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "kilokalori"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1010,196 +1165,217 @@ msgstr "kilokalori"
msgid "Actions"
msgstr "Hareketler"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Kullanıcıyı devre dışı bırak"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Kullanıcıyı etkinleştir"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Kullanıcı parolasını sıfırla"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Roller"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Parola sıfırlama onayı"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
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:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Hayır"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Evet"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Detaylar"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "Nr."
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Telefon"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Adres"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Kayıtlı"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Son giriş"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Durum"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Aktif"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Etkin değil"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Sözleşmeler"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Belgeler"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "İndir"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Etkin olmayan genel bakışa ekle"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Bu kullanıcı olarak oturum açın"
+
+#: core/templates/user/overview.html:539
#, 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:517
-msgid "Log in as this user"
-msgstr "Bu kullanıcı olarak oturum açın"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Tercihler"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Doğrulanmış e-posta adresi"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Doğrulanmamış e-posta adresi"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Doğrulama e-postası gönder"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr "Parola değiştir"
+
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Parolayı sıfırla"
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-"Egzersizlere katkıda bulunmak için e-posta adresinizi doğrulamanız gerekiyor"
-#: core/templates/user/preferences.html:55 core/views/user.py:617
-msgid "Change password"
-msgstr "Parola değiştir"
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Hesabı sil"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "kilogram"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "g"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "1 pound = 0.45 kg"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "oz"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Başarıyla silindi"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "{0} silinsin mi?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "{0} düzenleyin"
@@ -1214,52 +1390,68 @@ 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:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "\"{0}\" hesabı başarıyla silindi"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Başarıyla kaydoldunuz"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Ayarlar başarıyla güncellendi"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Lütfen aşağıdaki seçeneklerden birini seçin."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Kullanıcı başarıyla devre dışı bırakıldı"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Kullanıcı başarıyla etkinleştirildi"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Kullanıcıyı düzenle"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Evet, sil"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "İD"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Kullanıcı adı"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Jimnastik"
-#: 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"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "Latince, ör. \"Büyük pektoralis\""
@@ -1289,44 +1481,158 @@ msgstr "Dosya geçerli bir video değil"
msgid "Equipment list"
msgstr "Ekipman listesi"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Egzersiz yönetici geçmişi"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Eylem"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Seti düzenle"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Kullanıcı"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Seti düzenle"
+
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Seti düzenle"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+msgid "created"
+msgstr ""
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Sil"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Çeviri"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Evet, sil"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Değişiklikleri geri al"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Nesne"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Değişiklikler"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Değişiklikleri geri al"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Geri al"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Nesneyi Görüntüle"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Değişiklikleri görüntüle"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Değişiklikleri geri al"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Daha fazla bilgi için buraya tıklayın"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "İsim"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "önceki"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Soyisim"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1348,6 +1654,33 @@ msgstr "Yeni ekipman ekle"
msgid "Delete equipment?"
msgstr "Ekipman silinsin mi?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Kullanıcı"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Tür"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Eylem"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Kas ekleyin"
@@ -1449,15 +1782,15 @@ msgstr "Başlangıç tarihi"
msgid "End date"
msgstr "Bitiş tarihi"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "posta kodu"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Şehir"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Sokak"
@@ -1553,7 +1886,7 @@ msgstr "Spor listesi"
msgid "Global gym configuration"
msgstr "Global spor salonu yapılandırması"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Yeni spor salonu ekle"
@@ -1633,11 +1966,11 @@ msgstr ""
"Bu kullanıcının parolası sıfırlandı. Lütfen kullanıcıya yeni parolasını "
"bildirin."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Not ekle"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Sözleşme ekleyin"
@@ -1654,15 +1987,15 @@ msgstr "{0} öğesini sil"
msgid "Add contract type"
msgstr "Sözleşme türü ekleyin"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Cinsiyet"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Spor salonuna kullanıcı ekle"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Spor salonunu düzenle"
@@ -2089,27 +2422,27 @@ msgstr "Egzersiz"
msgid "Routine will expire soon"
msgstr "Antrenman yakında sona erecek"
-#: 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."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Kötü"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Nötr"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "İyi"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
"Bir saat girerseniz, hem başlangıç hem de bitiş saatini girmeniz gerekir."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Başlangıç zamanı, bitiş zamanından sonra olamaz."
+
#: manager/templates/routines/email_reminder.tpl:3
#, fuzzy, python-format
#| msgid "Your current workout '%(workout)s' expired %(days)s days ago."
@@ -2176,54 +2509,54 @@ msgstr "Antrenman"
msgid "Workout for %s"
msgstr "%s için egzersiz"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Birim"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Temel kalori alımı"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Verileriniz için hesaplanan temel kalori alımınız"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Ek kaloriler"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
"Baz orana eklenecek ek kaloriler (çıkarmak için negatif bir sayı girin)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Bileşen"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Ayrıca İngilizce adları da arayın"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2280,83 +2613,107 @@ msgstr ""
"eklemeniz durumunda, işlem başarıyla tamamlandığında size haber verilecektir."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Varyasyonlar"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "İçerik yok."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "İçerik Kategorileri"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "İsim"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "önceki"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "Sonraki"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Ara"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Makrobesinler"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "kJ"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Karbonhidratlardaki şeker içeriği"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "n.A."
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Yağlarda doymuş yağ içeriği"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Diğerleri"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Lif"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Sodyum"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, 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
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Beslenme"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Yeni ağırlık birimi ekle"
@@ -2444,36 +2801,36 @@ 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:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Yeni bir malzeme ekle"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "Beslenme planı"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "%s için beslenme planı"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
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:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Beslenme verileri"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Toplamda"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Enerji yüzdesi"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "g vücut kg"
@@ -2884,35 +3241,35 @@ msgstr "Kaynak Kodları"
msgid "Translation"
msgstr "Çeviri"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Evet, sil"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Varsa, bu nesnenin asıl başlığı"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Varsa asıl nesnenin bağlantısı"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Yazar(lar)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Yazar değilseniz, adı veya kaynağı buraya girin."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Varsa yazar profilinin bağlantısı"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Bu türev bir çalışma ise asıl kaynağın bağlantısı"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3061,6 +3418,67 @@ msgstr ""
msgid "Re-Submit"
msgstr "Yeniden Gönder"
+#~ 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."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Antrenman hatırlatıcıları"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Egzersiz yorumlarını göster"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr ""
+#~ "Antrenman görünümünde egzersiz yorumlarını göstermek için işaretleyin"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "İngilizce malzemeleri de kullanın"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Oluştururken malzemeleri İngilizce olarak da göstermek için kontrol edin\n"
+#~ "beslenme planı. Bu bileşenler, sağlanan bir listeden çıkarılmıştır.\n"
+#~ "ABD Tarım Bakanlığı tarafından. Çevresinde son derece eksiksiz\n"
+#~ "7000 giriş, ancak biraz bunaltıcı olabilir ve aramayı zorlaştırabilir."
+
+#~ msgid "Allow external access"
+#~ msgstr "Harici erişime izin ver"
+
+#~ 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 ""
+#~ "Harici kullanıcıların egzersiz programlarınıza ve günlüklerinize salt "
+#~ "okunur modda erişmesine izin verin. Bağlantıları paylaşmadan önce bunu "
+#~ "ayarlamanız gerekir, ör. sosyal medyaya."
+
+#~ msgid "Your API key"
+#~ msgstr "API anahtarınız"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr ""
+#~ "Egzersizlere katkıda bulunmak için e-posta adresinizi doğrulamanız "
+#~ "gerekiyor"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Başarıyla kaydoldunuz"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "%(email)s adresine bir doğrulama e-postası gönderildi"
+
+#~ msgid "View Object"
+#~ msgstr "Nesneyi Görüntüle"
+
#~ msgid "Email verification"
#~ msgstr "E-posta doğrulaması"
@@ -3239,9 +3657,6 @@ msgstr "Yeniden Gönder"
#~ msgid "Brand name of product"
#~ msgstr "Ürünün marka adı"
-#~ msgid "Ingredient Categories"
-#~ msgstr "İçerik Kategorileri"
-
#~ msgid "Amount in grams"
#~ msgstr "Gram cinsinden miktar"
@@ -3460,9 +3875,6 @@ msgstr "Yeniden Gönder"
#~ "Birden fazla egzersiz için arama yapabilirsiniz, bunlar bir üst set için "
#~ "birlikte gruplandırılır."
-#~ msgid "Type"
-#~ msgstr "Tür"
-
#~ msgid "Table"
#~ msgstr "Tablo"
@@ -3562,9 +3974,6 @@ msgstr "Yeniden Gönder"
#~ msgid "Log overview"
#~ msgstr "Günlüğe genel bakış"
-#~ msgid "Workout session"
-#~ msgstr "Egzersiz seansı"
-
#~ msgid "Delete with logs"
#~ msgstr "Günlüklerle sil"
@@ -3728,9 +4137,6 @@ msgstr "Yeniden Gönder"
#~ "\"10\" girin, bu\n"
#~ "otomatik olarak \"4 x 10\" olur."
-#~ msgid "Edit set"
-#~ msgstr "Seti düzenle"
-
#~ msgid "Update"
#~ msgstr "Güncelleme"
@@ -3779,9 +4185,6 @@ msgstr "Yeniden Gönder"
#~ msgid "Delete workout log"
#~ msgstr "Antrenman günlüğünü sil"
-#~ msgid "Create schedule"
-#~ msgstr "Program oluştur"
-
#~ msgid "Edit workout"
#~ msgstr "Antrenmanı düzenle"
@@ -3979,9 +4382,6 @@ msgstr "Yeniden Gönder"
#~ "veya\n"
#~ "aramada görünmeyecektir."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Lütfen aşağıdaki seçeneklerden birini seçin."
-
#~ msgid "Accept"
#~ msgstr "Kabul etmek"
diff --git a/wger/locale/uk/LC_MESSAGES/django.po b/wger/locale/uk/LC_MESSAGES/django.po
index 9c88beef2..16bc627fe 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -39,10 +39,10 @@ msgstr ""
"призначений всім новим зареєстрованим користувачам і для всіх існуючих "
"користувачів без тренажерного залу."
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -54,89 +54,83 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "Змінити"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "Форма захищена reCAPTCHA"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "Зареєструватись"
+
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "Ім'я"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "Прізвище"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "Адреса електронної пошти"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr ""
-"Використовується для скидання пароля і, і за необхідності, нагадування "
-"електронною поштою."
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "Дата народження"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "Особисті дані"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "Нагадування про тренування"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "Інші параметри"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "Зберегти"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "Адреса електронної пошти"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
"Використовується для скидання пароля і, при необхідності, нагадування "
"електронною поштою."
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "Ця адреса електронної пошти вже використовується."
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "Пароль"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "Введіть свій поточний пароль."
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -144,27 +138,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "Вилучити"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "Неправильний пароль"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "Форма захищена reCAPTCHA"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "Непідтверджена електронна пошта"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Надіслати"
@@ -238,34 +237,10 @@ msgid "Imperial (pound)"
msgstr "Імперичні (фунт)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "Показувати коментарі вправи"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "Відмітьте для показу коментарів вправи при перегляді тренування"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "Також використовувати інгредієнти Англійською"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"Поставте галочку, для того щоб показати компоненти також англійською\n"
-"мовою при створенні плану харчування. Назви цих інгредієнтів взяті\n"
-"зі списку встановленому Департаментом Сільського Господарства США.\n"
-"Список досить великий, близько 7000 записів, що може ускладнити пошук."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "Активувати нагадування про тренування"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
@@ -273,19 +248,19 @@ msgstr ""
"Відмітьте для активації автоматичних нагадувань для тренувань. Для роботи "
"цієї функції необхідно вказати дійсну адресу електронної пошти."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "Нагадати перед завершенням"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "Кількість днів для нагадування перед закінченням тренування."
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "Типова тривалість тренувань"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -293,11 +268,11 @@ msgstr ""
"Типова тривалість тренувань в тижнях, які не заплановані. Використовується "
"для нагадувань про тренування."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "Мова сповіщення"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -305,95 +280,82 @@ msgstr ""
"Мова, яка використовується при надсиланні вам сповіщень електронною поштою, "
"наприклад, нагадування про тренування. Це не стосується мови веб-сайту."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "Вік"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "Зріст (см)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "Годин сну"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "Середня кількість годин сну на добу"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "Робота"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "Середня кількість годин на добу"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "Фізична інтенсивність"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "Приблизно"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "Спорт"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "Середня кількість годин на тиждень"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "Вільний час"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "Денна кількість калорій"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "Загальне споживання калорій, в тому числі, будь-який надлишок"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "Одиниця ваги"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "Дозволити зовнішній доступ"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"Дозволити зовнішнім користувачам доступ до ваших тренувань та журналів у "
-"режимі лише для читання. Це необхідно встановити для можливості ділитися "
-"посиланнями, наприклад в соціальних мережах."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "Автоматичні нагадування для записів ваги"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
"Кількість днів після останнього запису ваги (введіть 0 для деактивації)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "Увімкнути трофеї"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr "Увімкнути або вимкнути систему трофеїв для цього користувача"
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "Сума всіх годин повинна дорівнювати 24"
@@ -401,8 +363,7 @@ msgstr "Сума всіх годин повинна дорівнювати 24"
msgid "Repetitions"
msgstr "Повтори"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "Час"
@@ -413,12 +374,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "Ім'я"
@@ -513,6 +474,86 @@ msgstr ""
msgid "the wger Team"
msgstr "Команда wger"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "Електронні листи"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "Поточна версія"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "Надіслати електронний лист для підтвердження"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "Перегляд змін"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "Зміни"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "Непідтверджена електронна пошта"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "Вхід"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "Забули пароль?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "Немає облікового запису?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr "Вже маєте обліковий запис?"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -522,7 +563,7 @@ msgstr ""
"Ви переглядаєте сайт як користувач \"%(current_user)s\", усі дії виконуються "
"з його даними."
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "Назад до \"%(target)s\""
@@ -546,7 +587,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "Мови"
@@ -555,15 +596,15 @@ msgid "Nothing found."
msgstr "Нічого не знайдено."
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "Додати зараз."
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -577,14 +618,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "Параметри"
@@ -594,9 +634,9 @@ msgstr "Список ліцензій"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -611,7 +651,7 @@ msgstr "Список ліцензій"
msgid "Nothing found"
msgstr "Нічого не знайдено"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "Відбиток"
@@ -623,7 +663,7 @@ msgstr "Тренування"
msgid "Routines"
msgstr "Рутини"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "Календар"
@@ -635,7 +675,7 @@ msgstr "Вимірювання"
msgid "Gallery"
msgstr "Галерея"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr "Трофеї"
@@ -657,7 +697,7 @@ msgstr "Загальнодоступні шаблони"
msgid "Exercises"
msgstr "Вправи"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "Адміністрація"
@@ -682,7 +722,7 @@ msgstr "Категорії"
msgid "Nutrition"
msgstr "Харчування"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "Плани харчування"
@@ -703,7 +743,7 @@ msgstr "Огляд інгредієнтів"
msgid "Body weight"
msgstr "Вага тіла"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "Огляд ваги"
@@ -719,7 +759,7 @@ msgstr "Підтримайте та долучайтеся"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "Ліцензія"
@@ -731,42 +771,42 @@ msgstr "Документація для розробників"
msgid "Get the code"
msgstr "Отримати код"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "Перекласти"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "Скинути пароль"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "Вийти"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "Мої налаштування"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "Ліцензії"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Одиниці повторень"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "Одиниця ваги"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "Список користувачів"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "Тренажерні зали"
@@ -820,36 +860,28 @@ msgstr "Дякуємо за користування нашим сайтом!"
msgid "The %(site_name)s team"
msgstr "Команда сайту %(site_name)s"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "назад"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "вперед"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "Закрити"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr ""
"Ви використовуєте обліковий запис гостя, введені дані будуть видалені через "
"тиждень."
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "Створіть деякі демонстраційні записи"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "Умови надання послуг"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -857,37 +889,170 @@ msgstr ""
msgid "Features"
msgstr "Особливості"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "Ключ API"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "Ваш ключ API"
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "У вас ще немає ключа API"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "Згенерувати новий ключ API"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "Створити програму"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "Тренування"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "Ключ API"
+
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "Видалити поточний ключ API і створити новий"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "Згенерувати новий ключ API"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "Згенерувати новий ключ API"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "У вас ще немає ключа API"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "Документація"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "Документація"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "Видалити обліковий запис"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "Ви впевнені?"
@@ -904,102 +1069,94 @@ msgstr ""
"тощо)\n"
"і не може бути скасована. "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "Немає облікового запису?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "Забули пароль?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "останні %(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "Опис"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "Кількість записів (днів)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "Остання активність"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "Не знайдено жодних тренувань."
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "Журнал"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "Загальне враження"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "Примітки"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "Енергія"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "Білок"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "Вуглеводи"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "Жири"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "ккал"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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
@@ -1008,193 +1165,215 @@ msgstr "ккал"
msgid "Actions"
msgstr "Дії"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "Деактивувати користувача"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "Активувати користувача"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "Скинути пароль користувача"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "Ролі"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "Підтвердження відновлення пароля"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr "Ви дійсно бажаєте змінити пароль цього користувача?"
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "Ні"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "Так"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "Деталі"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "№"
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "Телефон"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "Адреса"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "Зареєстрований"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "Останній вхід"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "Статус"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "Активний"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "Неактивний"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "Контракти"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "Документи"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "Завантажити"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "Включити в огляд неактивних"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "Увійти як цей користувач"
+
+#: core/templates/user/overview.html:539
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "Вхід адміністратора доступний лише для користувачів у %(gym_name)s"
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
-msgstr "Увійти як цей користувач"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "Налаштування"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "Підтверджена електронна пошта"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "Непідтверджена електронна пошта"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "Надіслати електронний лист для підтвердження"
-
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
-msgstr "Вам необхідно підтвердити свою електронну пошту, щоб надсилати вправи"
-
-#: core/templates/user/preferences.html:55 core/views/user.py:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "Змінити пароль"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
-msgstr "Вже маєте обліковий запис?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "Скинути пароль"
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Видалити обліковий запис"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
+
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "кг"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "г"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "фунт"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "унцій"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "Успішно вилучено"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "Вилучити {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "Змінити {0}"
@@ -1209,52 +1388,68 @@ msgstr ""
"тіла та плани харчування, щоб ви могли краще побачити, що може зробити цей "
"сайт. Ви можете редагувати або видаляти їх!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "Обліковий запис \"{0}\" успішно видалено"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "Ви успішно зареєстровані"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "Налаштування успішно оновлено"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "Виберіть один із наведених нижче варіантів."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "Користувач був успішно деактивований"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "Користувач успішно активований"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "Редагувати користувача"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "Так, вилучити"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "Ім'я користувача"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "Тренажерний зал"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr "Підтверджувальний лист було надіслано на електронну адресу %(email)s"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "На латині, напр. \"Pectoralis major\""
@@ -1284,44 +1479,160 @@ msgstr "Файл не є припустимим відеофайлом"
msgid "Equipment list"
msgstr "Список обладнання"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "Історія адміністрування вправ"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "Дія"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "Змінити підхід"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "Користувач"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "Змінити підхід"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "Змінити підхід"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+#, fuzzy
+#| msgid "Dedicated"
+msgid "created"
+msgstr "Присвячений"
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "Вилучити"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "Перекладання"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "Так, вилучити"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "Повернення змін"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "Об'єкт"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "Зміни"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "Повернення змін"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "Повернути"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "Перегляд об'єкту"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "Перегляд змін"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "Повернення змін"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "Натисніть тут для отримання додаткової інформації"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "Ім'я"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "назад"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "Прізвище"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1343,6 +1654,33 @@ msgstr "Додайте нове обладнання"
msgid "Delete equipment?"
msgstr "Видалити обладнання?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "Користувач"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "Тип"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "Дія"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "Додати м'язи"
@@ -1441,15 +1779,15 @@ msgstr "Дата початку"
msgid "End date"
msgstr "Кінцева дата"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "Поштовий індекс"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "Місто"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "Вулиця"
@@ -1545,7 +1883,7 @@ msgstr "Список тренажерних залів"
msgid "Global gym configuration"
msgstr "Глобальна конфігурація тренажерного залу"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "Додати новий тренажерний зал"
@@ -1624,11 +1962,11 @@ msgid ""
msgstr ""
"Пароль користувача було скинуто. Повідомте користувача про новий пароль."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "Додати запис"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "Додати контракт"
@@ -1645,15 +1983,15 @@ msgstr "Видалити {0}"
msgid "Add contract type"
msgstr "Додати тип контракту"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "Стать"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "Додати користувача до залу"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "Редагувати тренажерний зал"
@@ -2055,26 +2393,26 @@ msgstr "Вправа"
msgid "Routine will expire soon"
msgstr "Термін дії процедури скоро закінчиться"
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr "Час початку не може бути після часу закінчення."
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "Погано"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "Нейтрально"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "Добре"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "Якщо вводити час, необхідно ввести час початку і закінчення."
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "Час початку не може бути після часу закінчення."
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2141,27 +2479,27 @@ msgstr "Тренування"
msgid "Workout for %s"
msgstr "Тренування для %s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "Одиниця"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "Основне споживання калорій"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "Ваше основне споживання калорій, розраховане для ваших даних"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "Додаткові калорії"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
@@ -2169,27 +2507,27 @@ msgstr ""
"Додаткові калорії для додавання до базової ставки (для віднімання, введіть "
"від'ємне число)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "Інгредієнт"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "Також шукайте імена англійською мовою"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2245,83 +2583,107 @@ msgstr ""
"успішне завершення процесу."
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "Варіації"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "Немає інгредієнтів."
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "Категорії інгредієнтів"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "Ім'я"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "назад"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "вперед"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "Пошук"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
#, 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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "Макроелементи"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "кДж"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "Вміст цукру в вуглеводах"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "немає в наявності"
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "Вміст жиру у жирах"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "Інші"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "Волокна"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "Натрій"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "Натисніть тут для отримання додаткової інформації"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "Харчування"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "Додати нову одиницю ваги"
@@ -2412,36 +2774,36 @@ msgstr ""
"свій план харчування на цих значеннях, поспостерігайте за собою кілька\n"
"тижнів і при необхідності змініть загальну кількість."
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "Додати новий інгредієнт"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "План харчування"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "План харчування для %s"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>Це порожній план, що ви очікували на PDF?</i>"
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "Харчові дані"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "Разом"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "Відсоток енергії"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "г на кг маси тіли"
@@ -2851,35 +3213,35 @@ msgstr "Вихідний код"
msgid "Translation"
msgstr "Перекладання"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "Так, вилучити"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "Оригінальна назва цього об'єкта, якщо є"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "Посилання на оригінальний об'єкт, якщо доступне"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "Автор(и)"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "Якщо ви не є автором, введіть тут ім'я або джерело."
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "Посилання на профіль автора, якщо доступне"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "Посилання на першоджерело, якщо це похідна робота"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -3026,6 +3388,66 @@ msgstr ""
msgid "Re-Submit"
msgstr "Повторно подати"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr ""
+#~ "Використовується для скидання пароля і, і за необхідності, нагадування "
+#~ "електронною поштою."
+
+#~ msgid "Workout reminders"
+#~ msgstr "Нагадування про тренування"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "Показувати коментарі вправи"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "Відмітьте для показу коментарів вправи при перегляді тренування"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "Також використовувати інгредієнти Англійською"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "Поставте галочку, для того щоб показати компоненти також англійською\n"
+#~ "мовою при створенні плану харчування. Назви цих інгредієнтів взяті\n"
+#~ "зі списку встановленому Департаментом Сільського Господарства США.\n"
+#~ "Список досить великий, близько 7000 записів, що може ускладнити пошук."
+
+#~ msgid "Allow external access"
+#~ msgstr "Дозволити зовнішній доступ"
+
+#~ 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 ""
+#~ "Дозволити зовнішнім користувачам доступ до ваших тренувань та журналів у "
+#~ "режимі лише для читання. Це необхідно встановити для можливості ділитися "
+#~ "посиланнями, наприклад в соціальних мережах."
+
+#~ msgid "Your API key"
+#~ msgstr "Ваш ключ API"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr ""
+#~ "Вам необхідно підтвердити свою електронну пошту, щоб надсилати вправи"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "Ви успішно зареєстровані"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr ""
+#~ "Підтверджувальний лист було надіслано на електронну адресу %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "Перегляд об'єкту"
+
#~ msgid "Email verification"
#~ msgstr "Підтвердження E-mail"
@@ -3201,9 +3623,6 @@ msgstr "Повторно подати"
#~ msgid "Brand name of product"
#~ msgstr "Торгова марка виробу"
-#~ msgid "Ingredient Categories"
-#~ msgstr "Категорії інгредієнтів"
-
#~ msgid "Amount in grams"
#~ msgstr "Кількість в грамах"
@@ -3418,9 +3837,6 @@ msgstr "Повторно подати"
#~ "Ви можете шукати більше ніж одну вправу, вони будуть згруповані в "
#~ "суперсет."
-#~ msgid "Type"
-#~ msgstr "Тип"
-
#~ msgid "Table"
#~ msgstr "Таблиця"
@@ -3520,9 +3936,6 @@ msgstr "Повторно подати"
#~ msgid "Log overview"
#~ msgstr "Огляд журналів"
-#~ msgid "Workout session"
-#~ msgstr "Тренування"
-
#~ msgid "Delete with logs"
#~ msgstr "Видалити з журналами"
@@ -3678,9 +4091,6 @@ msgstr "Повторно подати"
#~ "повторень,\n"
#~ "це автоматично стає \"4 x 10\"."
-#~ msgid "Edit set"
-#~ msgstr "Змінити підхід"
-
#~ msgid "Update"
#~ msgstr "Оновлення"
@@ -3729,9 +4139,6 @@ msgstr "Повторно подати"
#~ msgid "Delete workout log"
#~ msgstr "Видалити журнал тренування"
-#~ msgid "Create schedule"
-#~ msgstr "Створити програму"
-
#~ msgid "Edit workout"
#~ msgstr "Змінити тренування"
@@ -3926,9 +4333,6 @@ msgstr "Повторно подати"
#~ "включення до бази даних. До цього часу він не буде показаний в огляді \n"
#~ "або в пошуку."
-#~ msgid "Please select one of the options below."
-#~ msgstr "Виберіть один із наведених нижче варіантів."
-
#~ msgid "Accept"
#~ msgstr "Прийняти"
diff --git a/wger/locale/uz/LC_MESSAGES/django.po b/wger/locale/uz/LC_MESSAGES/django.po
index e0b217744..5abad43ba 100644
--- a/wger/locale/uz/LC_MESSAGES/django.po
+++ b/wger/locale/uz/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-05-22 09:21+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -48,46 +48,46 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: core/forms.py:91 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"
+#: core/forms.py:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr ""
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
msgstr ""
-#: core/forms.py:130 core/forms.py:247 gym/views/export.py:62
-#: gym/views/gym.py:219
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr ""
-#: core/forms.py:131 core/forms.py:248 core/templates/user/overview.html:310
-#: gym/views/export.py:63 gym/views/gym.py:219
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr ""
-#: core/forms.py:133 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:188
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:195
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: core/forms.py:203 core/views/user.py:667 core/views/user.py:691
-#: core/views/user.py:705 gym/forms.py:73 utils/generic_views.py:132
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:218 core/templates/user/overview.html:314
+#: core/forms.py:210 core/templates/user/overview.html:314
#: 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:61
@@ -97,24 +97,24 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:219
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:242
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:264 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:219
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:266
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:275 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
#: core/templates/user/overview.html:259
@@ -130,22 +130,25 @@ msgstr ""
msgid "Delete"
msgstr ""
-#: core/forms.py:284
+#: core/forms.py:276
msgid "Invalid password"
msgstr ""
-#: core/forms.py:296 core/forms.py:364
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: core/forms.py:322 core/forms.py:354 core/templates/navigation.html:269
-#: core/templates/navigation.html:282 core/templates/template.html:114
-#: core/templates/user/login.html:21 core/views/user.py:319
-#: software/templates/features.html:87 software/templates/features.html:442
-msgid "Register"
+#: core/forms.py:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
msgstr ""
-#: core/forms.py:375 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -217,148 +220,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:65
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -375,12 +348,12 @@ msgid "Distance"
msgstr ""
#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:306 core/views/user.py:642
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:160 nutrition/templates/ingredient/view.html:242
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -460,7 +433,7 @@ msgid "the wger Team"
msgstr ""
#: core/templates/account/email_change.html:4
-#: core/templates/user/preferences.html:56
+#: core/templates/user/preferences.html:25
msgid "Email address"
msgstr ""
@@ -496,6 +469,37 @@ msgstr ""
msgid "Change email"
msgstr ""
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr ""
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -522,7 +526,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -557,9 +561,8 @@ msgstr ""
msgid "Add"
msgstr ""
-#: core/templates/language/view.html:61 core/templates/user/preferences.html:51
-#: gym/models/contract.py:203 gym/templates/contract/view.html:41
-#: gym/templates/gym/member_list.html:270
+#: core/templates/language/view.html:61 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr ""
@@ -611,7 +614,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -633,7 +636,7 @@ msgstr ""
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -712,37 +715,37 @@ msgstr ""
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -831,14 +834,61 @@ msgid ""
msgstr ""
#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
msgid "JWT sessions"
msgstr ""
-#: core/templates/user/api_key.html:29
+#: core/templates/user/api_key.html:123
msgid "Revoke all JWT sessions"
msgstr ""
-#: core/templates/user/api_key.html:35
+#: core/templates/user/api_key.html:129
#, python-format
msgid ""
"\n"
@@ -853,33 +903,33 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/templates/user/api_key.html:44
+#: core/templates/user/api_key.html:138
msgid ""
"Revoking JWT sessions logs out every device that obtained a refresh token "
"via the JWT login endpoint."
msgstr ""
-#: core/templates/user/api_key.html:49 core/templates/user/preferences.html:64
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
msgid "API key"
msgstr ""
-#: core/templates/user/api_key.html:62
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:64
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:80
+#: core/templates/user/api_key.html:174
msgid "Delete API key"
msgstr ""
-#: core/templates/user/api_key.html:90
+#: core/templates/user/api_key.html:184
msgid "You have no API key yet"
msgstr ""
-#: core/templates/user/api_key.html:96
+#: core/templates/user/api_key.html:190
#, python-format
msgid ""
"\n"
@@ -888,20 +938,38 @@ msgid ""
" "
msgstr ""
-#: core/templates/user/api_key.html:102
+#: core/templates/user/api_key.html:196
msgid "Example with curl:"
msgstr ""
-#: core/templates/user/api_key.html:116 software/templates/features.html:533
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
-#: core/templates/user/api_key.html:119
+#: core/templates/user/api_key.html:213
msgid "API documentation"
msgstr ""
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:67
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
@@ -918,14 +986,6 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
@@ -959,8 +1019,8 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:43 core/views/user.py:643
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:160
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
@@ -987,22 +1047,22 @@ msgid "Weight"
msgstr ""
#: core/templates/user/overview.html:176
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:244
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
#: core/templates/user/overview.html:177
-#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:250
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
#: core/templates/user/overview.html:178
-#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:258
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
#: core/templates/user/overview.html:179
-#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:272
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
@@ -1063,8 +1123,8 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:302 gym/views/export.py:58
-#: manager/helpers.py:89 nutrition/views/plan.py:150
-#: nutrition/views/plan.py:156
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
@@ -1135,27 +1195,47 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:28
-msgid "Manage email address"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr ""
+
+#: core/templates/user/preferences.html:42
+msgid "Set password"
msgstr ""
-#: core/templates/user/preferences.html:32
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:60 core/views/user.py:654
-msgid "Change password"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
#: core/templatetags/wger_extras.py:108 i18n.tpl:39
@@ -1193,20 +1273,20 @@ msgstr ""
#: 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:207 gym/views/gym.py:483
+#: gym/views/document.py:207 gym/views/gym.py:489
#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
#: core/views/languages.py:118 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:505
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:187 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:172
-#: gym/views/gym.py:465 nutrition/views/ingredient.py:238
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1218,56 +1298,61 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:152
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:313
-msgid "You were successfully registered"
-msgstr ""
-
-#: core/views/user.py:341
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:344
+#: core/views/user.py:314
msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:406
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:458
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:473
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:531
+#: core/views/user.py:503
msgid "API key was deleted"
msgstr ""
-#: core/views/user.py:536
+#: core/views/user.py:508
msgid "All API sessions were revoked"
msgstr ""
-#: core/views/user.py:640 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:160
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: core/views/user.py:641 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
-#: gym/views/gym.py:160 gym/views/gym.py:219
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:644 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:59 gym/views/gym.py:219
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
@@ -1672,7 +1757,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:173
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1771,11 +1856,11 @@ msgstr ""
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:346
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:445
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -2173,23 +2258,23 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/session.py:37
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:38
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:39
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:139
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:152
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2249,49 +2334,49 @@ msgstr ""
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:472
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr ""
@@ -2375,7 +2460,7 @@ msgstr ""
msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
@@ -2383,7 +2468,7 @@ msgstr ""
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
@@ -2397,7 +2482,7 @@ msgstr ""
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
@@ -2405,11 +2490,11 @@ msgstr ""
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
@@ -2497,32 +2582,32 @@ msgstr ""
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
diff --git a/wger/locale/vi/LC_MESSAGES/django.po b/wger/locale/vi/LC_MESSAGES/django.po
index e0b217744..5abad43ba 100644
--- a/wger/locale/vi/LC_MESSAGES/django.po
+++ b/wger/locale/vi/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-05-22 09:21+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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"
@@ -48,46 +48,46 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: core/forms.py:91 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"
+#: core/forms.py:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr ""
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
msgstr ""
-#: core/forms.py:130 core/forms.py:247 gym/views/export.py:62
-#: gym/views/gym.py:219
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr ""
-#: core/forms.py:131 core/forms.py:248 core/templates/user/overview.html:310
-#: gym/views/export.py:63 gym/views/gym.py:219
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr ""
-#: core/forms.py:133 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr ""
-#: core/forms.py:177
+#: core/forms.py:172
msgid "Personal data"
msgstr ""
-#: core/forms.py:188
-msgid "Workout reminders"
-msgstr ""
-
-#: core/forms.py:195
+#: core/forms.py:190
msgid "Other settings"
msgstr ""
-#: core/forms.py:203 core/views/user.py:667 core/views/user.py:691
-#: core/views/user.py:705 gym/forms.py:73 utils/generic_views.py:132
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr ""
-#: core/forms.py:218 core/templates/user/overview.html:314
+#: core/forms.py:210 core/templates/user/overview.html:314
#: 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:61
@@ -97,24 +97,24 @@ msgstr ""
msgid "Email"
msgstr ""
-#: core/forms.py:219
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr ""
-#: core/forms.py:242
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr ""
-#: core/forms.py:264 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:219
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr ""
-#: core/forms.py:266
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr ""
-#: core/forms.py:275 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
#: core/templates/user/overview.html:259
@@ -130,22 +130,25 @@ msgstr ""
msgid "Delete"
msgstr ""
-#: core/forms.py:284
+#: core/forms.py:276
msgid "Invalid password"
msgstr ""
-#: core/forms.py:296 core/forms.py:364
-msgid "The form is secured with reCAPTCHA"
+#: core/forms.py:289
+msgid "Confirm"
msgstr ""
-#: core/forms.py:322 core/forms.py:354 core/templates/navigation.html:269
-#: core/templates/navigation.html:282 core/templates/template.html:114
-#: core/templates/user/login.html:21 core/views/user.py:319
-#: software/templates/features.html:87 software/templates/features.html:442
-msgid "Register"
+#: core/forms.py:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
msgstr ""
-#: core/forms.py:375 weight/templates/import_csv_form.html:9
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
+
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
@@ -217,148 +220,118 @@ msgid "Imperial (pound)"
msgstr ""
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr ""
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr ""
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr ""
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr ""
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr ""
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr ""
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr ""
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr ""
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
msgstr ""
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr ""
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
msgstr ""
-#: core/models/profile.py:214 gym/views/export.py:65
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr ""
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr ""
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr ""
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr ""
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr ""
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr ""
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr ""
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr ""
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr ""
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr ""
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr ""
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr ""
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr ""
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr ""
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr ""
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr ""
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr ""
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr ""
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr ""
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr ""
@@ -375,12 +348,12 @@ msgid "Distance"
msgstr ""
#: core/models/rep_unit.py:47 core/models/weight_unit.py:42
-#: core/templates/user/overview.html:306 core/views/user.py:642
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:160 nutrition/templates/ingredient/view.html:242
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr ""
@@ -460,7 +433,7 @@ msgid "the wger Team"
msgstr ""
#: core/templates/account/email_change.html:4
-#: core/templates/user/preferences.html:56
+#: core/templates/user/preferences.html:25
msgid "Email address"
msgstr ""
@@ -496,6 +469,37 @@ msgstr ""
msgid "Change email"
msgstr ""
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr ""
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr ""
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr ""
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr ""
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -522,7 +526,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr ""
@@ -557,9 +561,8 @@ msgstr ""
msgid "Add"
msgstr ""
-#: core/templates/language/view.html:61 core/templates/user/preferences.html:51
-#: gym/models/contract.py:203 gym/templates/contract/view.html:41
-#: gym/templates/gym/member_list.html:270
+#: core/templates/language/view.html:61 gym/models/contract.py:203
+#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr ""
@@ -611,7 +614,7 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr ""
@@ -633,7 +636,7 @@ msgstr ""
msgid "Exercises"
msgstr ""
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr ""
@@ -712,37 +715,37 @@ msgstr ""
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr ""
@@ -831,14 +834,61 @@ msgid ""
msgstr ""
#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+msgid "Generate a new refresh token"
+msgstr ""
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+msgid "Created"
+msgstr ""
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
msgid "JWT sessions"
msgstr ""
-#: core/templates/user/api_key.html:29
+#: core/templates/user/api_key.html:123
msgid "Revoke all JWT sessions"
msgstr ""
-#: core/templates/user/api_key.html:35
+#: core/templates/user/api_key.html:129
#, python-format
msgid ""
"\n"
@@ -853,33 +903,33 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/templates/user/api_key.html:44
+#: core/templates/user/api_key.html:138
msgid ""
"Revoking JWT sessions logs out every device that obtained a refresh token "
"via the JWT login endpoint."
msgstr ""
-#: core/templates/user/api_key.html:49 core/templates/user/preferences.html:64
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
msgid "API key"
msgstr ""
-#: core/templates/user/api_key.html:62
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr ""
-#: core/templates/user/api_key.html:64
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr ""
-#: core/templates/user/api_key.html:80
+#: core/templates/user/api_key.html:174
msgid "Delete API key"
msgstr ""
-#: core/templates/user/api_key.html:90
+#: core/templates/user/api_key.html:184
msgid "You have no API key yet"
msgstr ""
-#: core/templates/user/api_key.html:96
+#: core/templates/user/api_key.html:190
#, python-format
msgid ""
"\n"
@@ -888,20 +938,38 @@ msgid ""
" "
msgstr ""
-#: core/templates/user/api_key.html:102
+#: core/templates/user/api_key.html:196
msgid "Example with curl:"
msgstr ""
-#: core/templates/user/api_key.html:116 software/templates/features.html:533
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr ""
-#: core/templates/user/api_key.html:119
+#: core/templates/user/api_key.html:213
msgid "API documentation"
msgstr ""
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:67
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr ""
@@ -918,14 +986,6 @@ msgid ""
"and can't be undone. "
msgstr ""
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr ""
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr ""
-
#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
@@ -959,8 +1019,8 @@ msgstr ""
msgid "Number of logs (days)"
msgstr ""
-#: core/templates/user/overview.html:43 core/views/user.py:643
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:160
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr ""
@@ -987,22 +1047,22 @@ msgid "Weight"
msgstr ""
#: core/templates/user/overview.html:176
-#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:244
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr ""
#: core/templates/user/overview.html:177
-#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:250
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr ""
#: core/templates/user/overview.html:178
-#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:258
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr ""
#: core/templates/user/overview.html:179
-#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:272
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr ""
@@ -1063,8 +1123,8 @@ msgid "Details"
msgstr ""
#: core/templates/user/overview.html:302 gym/views/export.py:58
-#: manager/helpers.py:89 nutrition/views/plan.py:150
-#: nutrition/views/plan.py:156
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr ""
@@ -1135,27 +1195,47 @@ msgid "Preferences"
msgstr ""
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr ""
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr ""
-#: core/templates/user/preferences.html:28
-msgid "Manage email address"
+#: core/templates/user/preferences.html:36 core/views/user.py:692
+msgid "Change password"
+msgstr ""
+
+#: core/templates/user/preferences.html:42
+msgid "Set password"
msgstr ""
-#: core/templates/user/preferences.html:32
-msgid "You need to verify your email to contribute exercises"
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
msgstr ""
-#: core/templates/user/preferences.html:60 core/views/user.py:654
-msgid "Change password"
+#: core/templates/user/preferences.html:50
+msgid "On"
msgstr ""
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+msgid "Connected accounts"
+msgstr ""
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
msgstr ""
#: core/templatetags/wger_extras.py:108 i18n.tpl:39
@@ -1193,20 +1273,20 @@ msgstr ""
#: 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:207 gym/views/gym.py:483
+#: gym/views/document.py:207 gym/views/gym.py:489
#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr ""
#: core/views/languages.py:118 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:505
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:187 gym/views/contract_option.py:123
#: gym/views/contract_type.py:123 gym/views/document.py:172
-#: gym/views/gym.py:465 nutrition/views/ingredient.py:238
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr ""
@@ -1218,56 +1298,61 @@ msgid ""
"do. Feel free to edit or delete them!"
msgstr ""
-#: core/views/user.py:152
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr ""
-#: core/views/user.py:313
-msgid "You were successfully registered"
-msgstr ""
-
-#: core/views/user.py:341
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr ""
-#: core/views/user.py:344
+#: core/views/user.py:314
msgid "Please correct the errors below."
msgstr ""
-#: core/views/user.py:406
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr ""
-#: core/views/user.py:458
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr ""
-#: core/views/user.py:473
+#: core/views/user.py:445
msgid "Edit user"
msgstr ""
-#: core/views/user.py:531
+#: core/views/user.py:503
msgid "API key was deleted"
msgstr ""
-#: core/views/user.py:536
+#: core/views/user.py:508
msgid "All API sessions were revoked"
msgstr ""
-#: core/views/user.py:640 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:160
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr ""
-#: core/views/user.py:641 gym/forms.py:95 gym/templates/contract/view.html:55
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
-#: gym/views/gym.py:160 gym/views/gym.py:219
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr ""
-#: core/views/user.py:644 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:59 gym/views/gym.py:219
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr ""
@@ -1672,7 +1757,7 @@ msgstr ""
msgid "Global gym configuration"
msgstr ""
-#: gym/templates/gym/list.html:69 gym/views/gym.py:173
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr ""
@@ -1771,11 +1856,11 @@ msgstr ""
msgid "Gender"
msgstr ""
-#: gym/views/gym.py:346
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr ""
-#: gym/views/gym.py:445
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr ""
@@ -2173,23 +2258,23 @@ msgstr ""
msgid "Routine will expire soon"
msgstr ""
-#: manager/models/session.py:37
+#: manager/models/session.py:41
msgid "Bad"
msgstr ""
-#: manager/models/session.py:38
+#: manager/models/session.py:42
msgid "Neutral"
msgstr ""
-#: manager/models/session.py:39
+#: manager/models/session.py:43
msgid "Good"
msgstr ""
-#: manager/models/session.py:139
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr ""
-#: manager/models/session.py:142
+#: manager/models/session.py:152
msgid "The start time cannot be after the end time."
msgstr ""
@@ -2249,49 +2334,49 @@ msgstr ""
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr ""
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr ""
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr ""
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr ""
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr ""
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr ""
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr ""
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:472
+#: nutrition/models/ingredient.py:476
msgid "Portion"
msgstr ""
@@ -2375,7 +2460,7 @@ msgstr ""
msgid "Filter"
msgstr ""
-#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:236
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr ""
@@ -2383,7 +2468,7 @@ msgstr ""
msgid "kJ"
msgstr ""
-#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr ""
@@ -2397,7 +2482,7 @@ msgstr ""
msgid "n.A."
msgstr ""
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr ""
@@ -2405,11 +2490,11 @@ msgstr ""
msgid "Others"
msgstr ""
-#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr ""
-#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr ""
@@ -2497,32 +2582,32 @@ msgstr ""
msgid "Add a new ingredient"
msgstr ""
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr ""
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr ""
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr ""
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr ""
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr ""
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr ""
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr ""
diff --git a/wger/locale/zh_Hans/LC_MESSAGES/django.po b/wger/locale/zh_Hans/LC_MESSAGES/django.po
index 024d89978..d3954e67f 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-04-10 10:20+0000\n"
+"POT-Creation-Date: 2026-06-17 07:28+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/"
@@ -38,10 +38,10 @@ msgstr ""
"选择默认健身房。所有新注册用户及没有添加健身房的已注册用户会加入此默认健身"
"房。"
-#: config/views/gym_config.py:42 core/templates/language/view.html:64
+#: config/views/gym_config.py:46 core/templates/language/view.html:64
#: core/templates/license/list.html:17
#: core/templates/repetition_unit/list.html:18
-#: core/templates/user/overview.html:207 core/templates/user/overview.html:470
+#: core/templates/user/overview.html:230 core/templates/user/overview.html:493
#: core/templates/weight_unit/list.html:18
#: exercises/templates/categories/admin-overview.html:17
#: exercises/templates/equipment/admin-overview.html:17
@@ -53,85 +53,81 @@ 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:205
-#: nutrition/templates/ingredient/view.html:248
+#: nutrition/templates/ingredient/view.html:255
+#: nutrition/templates/ingredient/view.html:298
msgid "Edit"
msgstr "编辑"
-#: 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:114 core/forms.py:321
+msgid "The form is secured with reCAPTCHA"
+msgstr "该表格由 reCAPTCHA 保护"
+
+#: core/forms.py:123 core/templates/account/login.html:93
+#: core/templates/account/signup.html:4 core/templates/navigation.html:269
+#: core/templates/navigation.html:282 core/templates/template.html:114
+#: software/templates/features.html:87 software/templates/features.html:442
+msgid "Register"
+msgstr "注册"
-#: core/forms.py:128 core/forms.py:242 gym/views/export.py:61
-#: gym/views/gym.py:217
+#: core/forms.py:128 core/forms.py:239 gym/views/export.py:62
+#: gym/views/gym.py:220
msgid "First name"
msgstr "名字"
-#: core/forms.py:129 core/forms.py:243 core/templates/user/overview.html:287
-#: gym/views/export.py:62 gym/views/gym.py:217
+#: core/forms.py:129 core/forms.py:240 core/templates/user/overview.html:310
+#: gym/views/export.py:63 gym/views/gym.py:220
msgid "Last name"
msgstr "姓氏"
-#: 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
-#: mailer/templates/mailer/gym/form.html:4
-#: mailer/templates/mailer/gym/overview.html:4
-#: mailer/templates/mailer/gym/preview.html:4
-msgid "Email"
-msgstr "邮件"
-
-#: core/forms.py:132
-msgid "Used for password resets and, optionally, e-mail reminders."
-msgstr "用来重设密码和邮件提醒,如果你选择了邮件提醒。"
-
-#: core/forms.py:136 core/models/profile.py:222
+#: core/forms.py:131 core/models/profile.py:200
#: gym/templates/gym/new_user.html:38
msgid "Date of Birth"
msgstr "生日"
-#: core/forms.py:175
+#: core/forms.py:172
msgid "Personal data"
msgstr "个人数据"
-#: core/forms.py:187
-msgid "Workout reminders"
-msgstr "健身提醒"
-
-#: core/forms.py:194
+#: core/forms.py:190
msgid "Other settings"
msgstr "其它设置"
-#: 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
+#: core/forms.py:195 core/views/user.py:705 core/views/user.py:729
+#: core/views/user.py:743 gym/forms.py:73 utils/generic_views.py:132
msgid "Save"
msgstr "保存"
-#: core/forms.py:209
+#: core/forms.py:210 core/templates/user/overview.html:314
+#: 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:61
+#: mailer/templates/mailer/gym/form.html:4
+#: mailer/templates/mailer/gym/overview.html:4
+#: mailer/templates/mailer/gym/preview.html:4
+msgid "Email"
+msgstr "邮件"
+
+#: core/forms.py:211
msgid "Used for password resets and, optionally, email reminders."
msgstr "用来重设密码和邮件提醒,如果你选择了邮件提醒。"
-#: core/forms.py:238
+#: core/forms.py:234
msgid "This e-mail address is already in use."
msgstr "这个邮件地址已经被注册过了。"
-#: core/forms.py:259 gym/templates/gym/new_user.html:26
-#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:217
+#: core/forms.py:256 gym/templates/gym/new_user.html:26
+#: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:220
msgid "Password"
msgstr "密码"
-#: core/forms.py:261
+#: core/forms.py:258
msgid "Please enter your current password."
msgstr "请输入你的原密码。"
-#: core/forms.py:270 core/templates/language/view.html:70
+#: core/forms.py:267 core/forms.py:304 core/templates/language/view.html:70
#: core/templates/license/list.html:21
#: core/templates/repetition_unit/list.html:22
-#: core/templates/user/overview.html:236
+#: core/templates/user/overview.html:259
#: core/templates/weight_unit/list.html:22
#: exercises/templates/categories/admin-overview.html:21
#: exercises/templates/equipment/admin-overview.html:21
@@ -139,27 +135,32 @@ 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:209
-#: nutrition/templates/ingredient/view.html:254
+#: gym/templates/gym/list.html:23 nutrition/templates/ingredient/view.html:259
+#: nutrition/templates/ingredient/view.html:304
msgid "Delete"
msgstr "删除"
-#: core/forms.py:279
+#: core/forms.py:276
msgid "Invalid password"
msgstr "密码无效"
-#: core/forms.py:291 core/forms.py:349
-msgid "The form is secured with reCAPTCHA"
-msgstr "该表格由 reCAPTCHA 保护"
+#: core/forms.py:289
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Confirm"
+msgstr "未验证的邮箱"
-#: 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:297
+#, python-brace-format
+msgid ""
+"Your account has no password. Type the username \"{username}\" to confirm."
+msgstr ""
+
+#: core/forms.py:313
+msgid "The entered username does not match"
+msgstr ""
-#: core/forms.py:360 weight/templates/import_csv_form.html:9
+#: core/forms.py:332 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "提交"
@@ -233,52 +234,28 @@ msgid "Imperial (pound)"
msgstr "英制(磅)"
#: core/models/profile.py:119
-msgid "Show exercise comments"
-msgstr "显示健身项目的评论"
-
-#: core/models/profile.py:120
-msgid "Check to show exercise comments on the workout view"
-msgstr "勾选用来在健身版块显示该健身项目的评论"
-
-#: core/models/profile.py:130
-msgid "Also use ingredients in English"
-msgstr "使用食谱时用英文显示"
-
-#: core/models/profile.py:132
-msgid ""
-"Check to also show ingredients in English while creating\n"
-"a nutritional plan. These ingredients are extracted from a list provided\n"
-"by the US Department of Agriculture. It is extremely complete, with around\n"
-"7000 entries, but can be somewhat overwhelming and make the search difficult."
-msgstr ""
-"勾选以在创建营养计划时,使用英文来显示食谱.\n"
-"这些食谱摘录自美国农业部提供的食谱列表.它大概有7000多个食谱,\n"
-"这是极其完善的,但是,在某些程度上,\n"
-"也会让人抓狂并且让搜索变得困难."
-
-#: core/models/profile.py:141
msgid "Activate workout reminders"
msgstr "激活健身提醒"
-#: core/models/profile.py:143
+#: core/models/profile.py:121
msgid ""
"Check to activate automatic reminders for workouts. You need to provide a "
"valid email for this to work."
msgstr "勾选以激活自动健身提醒功能.你需要提供一个有效的电子邮件方能使用."
-#: core/models/profile.py:152
+#: core/models/profile.py:130
msgid "Remind before expiration"
msgstr "健身过期前提醒"
-#: core/models/profile.py:153
+#: core/models/profile.py:131
msgid "The number of days you want to be reminded before a workout expires."
msgstr "在一个健身过期前你希望被提醒的天数。"
-#: core/models/profile.py:159
+#: core/models/profile.py:137
msgid "Default duration of workouts"
msgstr "默认的健身持续时间"
-#: core/models/profile.py:161
+#: core/models/profile.py:139
msgid ""
"Default duration in weeks of workouts not in a schedule. Used for email "
"workout reminders."
@@ -286,11 +263,11 @@ msgstr ""
"默认每周的健身持续时间,需要注意,这不是日程的健身持续时间.健身的邮件提醒中会使"
"用这项内容."
-#: core/models/profile.py:179
+#: core/models/profile.py:157
msgid "Notification language"
msgstr "通知语言"
-#: core/models/profile.py:181
+#: core/models/profile.py:159
msgid ""
"Language to use when sending you email notifications, e.g. email reminders "
"for workouts. This does not affect the language used on the website."
@@ -298,93 +275,81 @@ msgstr ""
"发送给你电子邮件通知,包括健身的邮件提醒等所使用的语言.这不会影响到网站使用的"
"语言."
-#: core/models/profile.py:214 gym/views/export.py:64
+#: core/models/profile.py:192 gym/views/export.py:65
msgid "Age"
msgstr "年龄"
-#: core/models/profile.py:230
+#: core/models/profile.py:208
msgid "Height (cm)"
msgstr "身高(cm)"
-#: core/models/profile.py:247
+#: core/models/profile.py:225
msgid "Hours of sleep"
msgstr "睡眠时长"
-#: core/models/profile.py:248
+#: core/models/profile.py:226
msgid "The average hours of sleep per day"
msgstr "每日平均睡眠时长"
-#: core/models/profile.py:257
+#: core/models/profile.py:235
msgid "Work"
msgstr "工作"
-#: core/models/profile.py:258 core/models/profile.py:300
+#: core/models/profile.py:236 core/models/profile.py:278
msgid "Average hours per day"
msgstr "每日平均时长"
-#: core/models/profile.py:267 core/models/profile.py:288
-#: core/models/profile.py:309
+#: core/models/profile.py:245 core/models/profile.py:266
+#: core/models/profile.py:287
msgid "Physical intensity"
msgstr "活动强度"
-#: core/models/profile.py:268 core/models/profile.py:289
-#: core/models/profile.py:310
+#: core/models/profile.py:246 core/models/profile.py:267
+#: core/models/profile.py:288
msgid "Approximately"
msgstr "大约"
-#: core/models/profile.py:278
+#: core/models/profile.py:256
msgid "Sport"
msgstr "运动"
-#: core/models/profile.py:279
+#: core/models/profile.py:257
msgid "Average hours per week"
msgstr "每周平均时长"
-#: core/models/profile.py:299
+#: core/models/profile.py:277
msgid "Free time"
msgstr "自由时间"
-#: core/models/profile.py:320 nutrition/templates/rate/form.html:67
+#: core/models/profile.py:298 nutrition/templates/rate/form.html:67
msgid "Total daily calories"
msgstr "每日总卡路里"
-#: core/models/profile.py:321
+#: core/models/profile.py:299
msgid "Total caloric intake, including e.g. any surplus"
msgstr "总卡路里摄取量,包括例如:任何过量的卡路里"
-#: core/models/profile.py:333
+#: core/models/profile.py:311
msgid "Weight unit"
msgstr "重量单位"
-#: core/models/profile.py:341
-msgid "Allow external access"
-msgstr "允许外部访问"
-
-#: core/models/profile.py:343
-msgid ""
-"Allow external users to access your workouts and logs in a read-only mode. "
-"You need to set this before you can share links e.g. to social media."
-msgstr ""
-"允许外网用户以只读模式访问你的健身和日志等数据.在你分享链接到社交媒体之前,你"
-"需要勾选这个选项."
-
-#: core/models/profile.py:352
+#: core/models/profile.py:319
msgid "Automatic reminders for weight entries"
msgstr "为体重记录创建自动提醒"
-#: core/models/profile.py:353
+#: core/models/profile.py:320
msgid "Number of days after the last weight entry (enter 0 to deactivate)"
msgstr "最后一次体重记录之后经过的天数(输入0关闭提醒)"
-#: core/models/profile.py:379
+#: core/models/profile.py:346
msgid "Enable trophies"
msgstr "开启奖杯"
-#: core/models/profile.py:380
+#: core/models/profile.py:347
msgid "Enable or disable the trophy system for this user"
msgstr "启用或禁用此用户的奖杯系统"
-#: core/models/profile.py:457
+#: core/models/profile.py:424
msgid "The sum of all hours has to be 24"
msgstr "所有时长的和应该是24"
@@ -392,8 +357,7 @@ msgstr "所有时长的和应该是24"
msgid "Repetitions"
msgstr "重复次数"
-#: core/models/rep_unit.py:33 core/templates/user/overview.html:82
-#: exercises/templates/history/overview.html:30
+#: core/models/rep_unit.py:33 core/templates/user/overview.html:93
msgid "Time"
msgstr "时间"
@@ -404,12 +368,12 @@ 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
+#: core/templates/user/overview.html:306 core/views/user.py:680
#: 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:192
+#: gym/views/gym.py:161 nutrition/templates/ingredient/view.html:242
msgid "Name"
msgstr "名称"
@@ -500,6 +464,86 @@ msgstr ""
msgid "the wger Team"
msgstr "维格小组"
+#: core/templates/account/email_change.html:4
+#: core/templates/user/preferences.html:25
+#, fuzzy
+#| msgid "Emails"
+msgid "Email address"
+msgstr "邮件"
+
+#: core/templates/account/email_change.html:9
+msgid ""
+"Your email address is used for password resets and, optionally, workout "
+"reminders. A new address only becomes active once you confirm it via the "
+"link sent to it."
+msgstr ""
+
+#: core/templates/account/email_change.html:20
+#, fuzzy
+#| msgid "Current version"
+msgid "Current email"
+msgstr "当前版本"
+
+#: core/templates/account/email_change.html:30
+#, python-format
+msgid "Pending confirmation: <strong>%(email)s</strong>"
+msgstr ""
+
+#: core/templates/account/email_change.html:38
+#, fuzzy
+#| msgid "Send verification email"
+msgid "Resend confirmation email"
+msgstr "发送验证邮件"
+
+#: core/templates/account/email_change.html:42
+#, fuzzy
+#| msgid "View changes"
+msgid "Cancel change"
+msgstr "查看更改"
+
+#: core/templates/account/email_change.html:54
+#, fuzzy
+#| msgid "Changes"
+msgid "Change to"
+msgstr "修改"
+
+#: core/templates/account/email_change.html:66
+#, fuzzy
+#| msgid "Unverified email"
+msgid "Change email"
+msgstr "未验证的邮箱"
+
+#: core/templates/account/login.html:4 core/templates/account/login.html:29
+#: core/templates/account/login.html:81 core/templates/account/signup.html:30
+#: core/templates/navigation.html:268 core/templates/navigation.html:275
+#: software/templates/features.html:82 software/templates/features.html:448
+msgid "Login"
+msgstr "登录"
+
+#: core/templates/account/login.html:76
+msgid "Forgot password?"
+msgstr "忘记密码?"
+
+#: core/templates/account/login.html:88
+msgid "No account?"
+msgstr "没有账户?"
+
+#: core/templates/account/login.html:104
+msgid "Faster sign in"
+msgstr ""
+
+#: core/templates/account/login.html:113
+msgid "Sign in with a passkey"
+msgstr ""
+
+#: core/templates/account/login.html:120
+msgid "or sign in with"
+msgstr ""
+
+#: core/templates/account/signup.html:26
+msgid "Already have an account?"
+msgstr "已有账户?"
+
#: core/templates/base.html:10
#, python-format
msgid ""
@@ -509,7 +553,7 @@ msgstr ""
"您正以用户 “%(current_user)s” 的身份浏览本网站,所有操作均基于该用户的数据执"
"行。"
-#: core/templates/base.html:15 core/templates/base_wide.html:12
+#: core/templates/base.html:17 core/templates/base_wide.html:14
#, python-format
msgid "Back to \"%(target)s\""
msgstr "返回到\"%(target)s\""
@@ -532,7 +576,7 @@ msgstr ""
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:341
+#: core/templates/language/overview.html:4 core/templates/navigation.html:345
msgid "Languages"
msgstr "语言"
@@ -541,15 +585,15 @@ msgid "Nothing found."
msgstr "未找到匹配项。"
#: core/templates/language/overview.html:22
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
msgid "Add one now."
msgstr "现在就新增一个。"
#: core/templates/language/overview.html:34 core/templates/license/list.html:43
#: 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/templates/user/overview.html:370 core/templates/user/overview.html:410
+#: core/templates/user/overview.html:448
+#: core/templates/weight_unit/list.html:46 core/views/languages.py:81
#: core/views/license.py:66 core/views/repetition_units.py:76
#: core/views/weight_units.py:66
#: exercises/templates/categories/admin-overview.html:40
@@ -563,14 +607,13 @@ 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:97
+#: nutrition/templates/ingredient/overview.html:133
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
+#: core/templates/language/view.html:61 gym/models/contract.py:203
#: gym/templates/contract/view.html:41 gym/templates/gym/member_list.html:270
-#: nutrition/templates/ingredient/view.html:245
+#: nutrition/templates/ingredient/view.html:295
msgid "Options"
msgstr "选项"
@@ -580,9 +623,9 @@ msgstr "许可协议列表"
#: core/templates/license/list.html:30
#: core/templates/repetition_unit/list.html:32
-#: 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/user/overview.html:118 core/templates/user/overview.html:154
+#: core/templates/user/overview.html:211 core/templates/user/overview.html:391
+#: core/templates/user/overview.html:430 core/templates/user/overview.html:474
#: core/templates/weight_unit/list.html:32
#: exercises/templates/categories/admin-overview.html:30
#: exercises/templates/equipment/admin-overview.html:30
@@ -597,7 +640,7 @@ msgstr "许可协议列表"
msgid "Nothing found"
msgstr "没有找到任何内容"
-#: core/templates/misc/about.html:4 core/templates/template.html:150
+#: core/templates/misc/about.html:4 core/templates/template.html:151
msgid "Imprint"
msgstr "版本说明"
@@ -609,7 +652,7 @@ msgstr "训练"
msgid "Routines"
msgstr "训练计划"
-#: core/templates/navigation.html:44 core/templates/user/overview.html:73
+#: core/templates/navigation.html:44 core/templates/user/overview.html:83
msgid "Calendar"
msgstr "日历"
@@ -621,7 +664,7 @@ msgstr "测量"
msgid "Gallery"
msgstr "画廊"
-#: core/templates/navigation.html:74 core/templates/navigation.html:400
+#: core/templates/navigation.html:74 core/templates/navigation.html:404
#: trophies/templates/trophies/overview.html:7
msgid "Trophies"
msgstr "奖杯"
@@ -643,7 +686,7 @@ msgstr "公共模板"
msgid "Exercises"
msgstr "练习"
-#: core/templates/navigation.html:109 core/templates/navigation.html:336
+#: core/templates/navigation.html:109 core/templates/navigation.html:340
msgid "Administration"
msgstr "管理"
@@ -668,7 +711,7 @@ msgstr "类别"
msgid "Nutrition"
msgstr "营养"
-#: core/templates/navigation.html:154 core/templates/user/overview.html:147
+#: core/templates/navigation.html:154 core/templates/user/overview.html:162
msgid "Nutrition plans"
msgstr "营养计划"
@@ -689,7 +732,7 @@ msgstr "食谱总览"
msgid "Body weight"
msgstr "体重"
-#: core/templates/navigation.html:200 core/templates/user/overview.html:117
+#: core/templates/navigation.html:200 core/templates/user/overview.html:131
msgid "Weight overview"
msgstr "体重总览"
@@ -705,7 +748,7 @@ msgstr "支持与参与"
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:232 utils/models.py:45
+#: core/templates/navigation.html:232 utils/models.py:69
msgid "License"
msgstr "许可协议"
@@ -717,42 +760,42 @@ msgstr "开发者文档"
msgid "Get the code"
msgstr "获取源码"
-#: core/templates/navigation.html:252 core/templates/template.html:202
+#: core/templates/navigation.html:252 core/templates/template.html:203
#: software/templates/features.html:614
msgid "Translate"
msgstr "翻译"
-#: core/templates/navigation.html:289 core/templates/user/login.html:30
+#: core/templates/navigation.html:289
msgid "Reset password"
msgstr "重设密码"
-#: core/templates/navigation.html:298 core/templates/navigation.html:326
+#: core/templates/navigation.html:299 core/templates/navigation.html:329
msgid "Logout"
msgstr "退出"
-#: core/templates/navigation.html:317
+#: core/templates/navigation.html:319
msgid "My preferences"
msgstr "我的首选项"
-#: core/templates/navigation.html:349
+#: core/templates/navigation.html:353
msgid "Licenses"
msgstr "许可协议"
-#: core/templates/navigation.html:357
+#: core/templates/navigation.html:361
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "重复单元"
-#: core/templates/navigation.html:365 core/templates/weight_unit/list.html:4
-#: nutrition/templates/ingredient/view.html:182
+#: core/templates/navigation.html:369 core/templates/weight_unit/list.html:4
+#: nutrition/templates/ingredient/view.html:232
msgid "Weight units"
msgstr "重量单位"
-#: core/templates/navigation.html:373 core/templates/user/list.html:4
+#: core/templates/navigation.html:377 core/templates/user/list.html:4
msgid "User list"
msgstr "用户列表"
-#: core/templates/navigation.html:379
+#: core/templates/navigation.html:383
msgid "Gyms"
msgstr "健身房"
@@ -804,34 +847,26 @@ msgstr "感谢使用我们的网站!"
msgid "The %(site_name)s team"
msgstr "%(site_name)s 团队"
-#: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:12
-msgid "previous"
-msgstr "前"
-
-#: core/templates/tags/pagination.html:33
-#: core/templates/tags/pagination.html:38
-msgid "next"
-msgstr "后"
-
-#: core/templates/template.html:86
+#: core/templates/template.html:87
+#: exercises/templates/history/overview.html:202
msgid "Close"
msgstr "关闭"
-#: core/templates/template.html:102
+#: core/templates/template.html:103
msgid ""
"You are using a guest account, data entered will be deleted after a week."
msgstr "你正在以访客模式浏览,输入的数据会在一周后删除."
-#: core/templates/template.html:107
+#: core/templates/template.html:108
msgid "Create some demo entries"
msgstr "创建一些示例项"
-#: core/templates/template.html:155 software/templates/features.html:568
+#: core/templates/template.html:156 software/templates/features.html:568
#: software/templates/tos.html:7
msgid "Terms of service"
msgstr "服务条款"
-#: core/templates/template.html:181 software/templates/features.html:595
+#: core/templates/template.html:182 software/templates/features.html:595
msgid "Browser language"
msgstr ""
@@ -839,37 +874,167 @@ msgstr ""
msgid "Features"
msgstr "特色"
-#: core/templates/user/api_key.html:4 core/templates/user/preferences.html:59
-msgid "API key"
-msgstr "API密钥"
+#: core/templates/user/api_key.html:4
+msgid "API access"
+msgstr ""
+
+#: core/templates/user/api_key.html:9
+msgid ""
+"Theare are two ways to authenticate against the API: JWT is the preferred "
+"mechanism for client applications, the static API key is intended for "
+"personal scripts or one-off integrations."
+msgstr ""
-#: core/templates/user/api_key.html:15
-msgid "Your API key"
-msgstr "你的API密钥"
+#: core/templates/user/api_key.html:16
+msgid "Long-lived refresh tokens"
+msgstr ""
-#: core/templates/user/api_key.html:21
-msgid "You have no API key yet"
-msgstr "你现在还没有API密钥"
+#: core/templates/user/api_key.html:19
+msgid ""
+"Refresh tokens let scripts and CLI tools talk to the wger API using the JWT "
+"flow without logging in interactively each time."
+msgstr ""
+
+#: core/templates/user/api_key.html:35
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Generate a new refresh token"
+msgstr "生成一个新的API密钥"
+
+#: core/templates/user/api_key.html:41
+msgid "Copy this token now."
+msgstr ""
+
+#: core/templates/user/api_key.html:42
+msgid ""
+"It is shown only once. If you lose it, generate a new one and revoke the old "
+"session below."
+msgstr ""
+
+#: core/templates/user/api_key.html:56
+#, python-format
+msgid ""
+"Refresh tokens expire %(days)s days after they were generated, unless you "
+"revoke them sooner."
+msgstr ""
+
+#: core/templates/user/api_key.html:65
+#, fuzzy
+#| msgid "Create schedule"
+msgid "Created"
+msgstr "创建规划"
+
+#: core/templates/user/api_key.html:66
+msgid "Expires"
+msgstr ""
+
+#: core/templates/user/api_key.html:86
+msgid "Revoke"
+msgstr ""
+
+#: core/templates/user/api_key.html:105
+msgid "Revoke all refresh tokens"
+msgstr ""
+
+#: core/templates/user/api_key.html:110
+#, fuzzy
+#| msgid "Workout session"
+msgid "JWT sessions"
+msgstr "锻炼课程"
+
+#: core/templates/user/api_key.html:123
+msgid "Revoke all JWT sessions"
+msgstr ""
+
+#: core/templates/user/api_key.html:129
+#, python-format
+msgid ""
+"\n"
+" There is currently <strong>%(counter)s</strong> active JWT "
+"session\n"
+" "
+msgid_plural ""
+"\n"
+" There are currently <strong>%(counter)s</strong> active JWT "
+"sessions\n"
+" "
+msgstr[0] ""
+
+#: core/templates/user/api_key.html:138
+msgid ""
+"Revoking JWT sessions logs out every device that obtained a refresh token "
+"via the JWT login endpoint."
+msgstr ""
+
+#: core/templates/user/api_key.html:143 core/templates/user/preferences.html:66
+msgid "API key"
+msgstr "API密钥"
-#: core/templates/user/api_key.html:46
+#: core/templates/user/api_key.html:156
msgid "Delete current API key and generate new one"
msgstr "删除当前API密钥并生成一个新的"
-#: core/templates/user/api_key.html:49
+#: core/templates/user/api_key.html:158
msgid "Generate new API key"
msgstr "生成一个新的API密钥"
-#: core/templates/user/api_key.html:55 software/templates/features.html:533
+#: core/templates/user/api_key.html:174
+#, fuzzy
+#| msgid "Generate new API key"
+msgid "Delete API key"
+msgstr "生成一个新的API密钥"
+
+#: core/templates/user/api_key.html:184
+msgid "You have no API key yet"
+msgstr "你现在还没有API密钥"
+
+#: core/templates/user/api_key.html:190
+#, python-format
+msgid ""
+"\n"
+" Pass <code>Token %(key)s</code> in the\n"
+" <code>Authorization</code> header to use it.\n"
+" "
+msgstr ""
+
+#: core/templates/user/api_key.html:196
+msgid "Example with curl:"
+msgstr ""
+
+#: core/templates/user/api_key.html:210 software/templates/features.html:533
msgid "Documentation"
msgstr "文档"
+#: core/templates/user/api_key.html:213
+#, fuzzy
+#| msgid "Documentation"
+msgid "API documentation"
+msgstr "文档"
+
+#: core/templates/user/app_auth_handoff.html:7
+msgid "Return to app"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:14
+msgid "Returning to the wger app…"
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:16
+msgid ""
+"If nothing happens, tap the button below. Make sure the wger app is "
+"installed on this device."
+msgstr ""
+
+#: core/templates/user/app_auth_handoff.html:23
+msgid "Tap to return to app"
+msgstr ""
+
#: core/templates/user/delete_account.html:3
-#: core/templates/user/preferences.html:62
+#: core/templates/user/preferences.html:82
msgid "Delete account"
msgstr "删除账户"
#: core/templates/user/delete_account.html:9
-#: exercises/templates/history/overview.html:93
msgid "Are you sure?"
msgstr "你确定吗?"
@@ -885,102 +1050,94 @@ msgstr ""
"同时也会删除所有和该账户关联的数据(健身,日志等),\n"
"并且不可撤销。 "
-#: core/templates/user/login.html:17
-msgid "No account?"
-msgstr "没有账户?"
-
-#: core/templates/user/login.html:26
-msgid "Forgot password?"
-msgstr "忘记密码?"
-
-#: 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
+#: core/templates/user/overview.html:28 core/templates/user/overview.html:78
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:162
+#: core/templates/user/overview.html:374 core/templates/user/overview.html:416
+#: core/templates/user/overview.html:452
#, python-format
msgid "last %(number)s"
msgstr "最后%(number)s"
-#: 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
+#: core/templates/user/overview.html:33 core/templates/user/overview.html:167
+#: core/templates/user/overview.html:369 core/templates/user/overview.html:408
+#: core/templates/user/overview.html:447 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:37 core/templates/user/overview.html:79
-#: core/templates/user/overview.html:123 core/templates/user/overview.html:155
+#: core/templates/user/overview.html:40 core/templates/user/overview.html:90
+#: core/templates/user/overview.html:138 core/templates/user/overview.html:174
#: 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:38 core/templates/user/overview.html:156
+#: core/templates/user/overview.html:41 core/templates/user/overview.html:175
#: gym/models/contract.py:58 gym/models/contract.py:109
msgid "Description"
msgstr "目标"
-#: core/templates/user/overview.html:39
+#: core/templates/user/overview.html:42
msgid "Number of logs (days)"
msgstr "日志数(天)"
-#: core/templates/user/overview.html:40 core/views/user.py:606
-#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:158
+#: core/templates/user/overview.html:43 core/views/user.py:681
+#: gym/templates/gym/email_inactive_members.html:4 gym/views/gym.py:161
msgid "Last activity"
msgstr "最后一次活动"
-#: core/templates/user/overview.html:61
+#: core/templates/user/overview.html:68
msgid "No workouts found."
msgstr "没有健身记录。"
-#: core/templates/user/overview.html:71
+#: core/templates/user/overview.html:78
msgid "Log"
msgstr "日志"
-#: core/templates/user/overview.html:80
+#: core/templates/user/overview.html:91
msgid "General impression"
msgstr "总体印象"
-#: core/templates/user/overview.html:81 core/templates/user/overview.html:393
+#: core/templates/user/overview.html:92 core/templates/user/overview.html:416
msgid "Notes"
msgstr "备注"
-#: core/templates/user/overview.html:115 core/templates/user/overview.html:124
+#: core/templates/user/overview.html:126 core/templates/user/overview.html:139
#: 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:157
-#: nutrition/templates/ingredient/view.html:52 nutrition/views/plan.py:244
+#: core/templates/user/overview.html:176
+#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:245
msgid "Energy"
msgstr "能量"
-#: core/templates/user/overview.html:158
-#: nutrition/templates/ingredient/view.html:59 nutrition/views/plan.py:250
+#: core/templates/user/overview.html:177
+#: nutrition/templates/ingredient/view.html:91 nutrition/views/plan.py:251
msgid "Protein"
msgstr "蛋白质"
-#: core/templates/user/overview.html:159
-#: nutrition/templates/ingredient/view.html:65 nutrition/views/plan.py:258
+#: core/templates/user/overview.html:178
+#: nutrition/templates/ingredient/view.html:97 nutrition/views/plan.py:259
msgid "Carbohydrates"
msgstr "碳水化合物"
-#: core/templates/user/overview.html:160
-#: nutrition/templates/ingredient/view.html:81 nutrition/views/plan.py:272
+#: core/templates/user/overview.html:179
+#: nutrition/templates/ingredient/view.html:113 nutrition/views/plan.py:273
msgid "Fat"
msgstr "脂肪"
-#: core/templates/user/overview.html:173
-#: nutrition/templates/ingredient/view.html:54
+#: core/templates/user/overview.html:196
+#: nutrition/templates/ingredient/view.html:86
msgid "kcal"
msgstr "千卡"
-#: 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
+#: core/templates/user/overview.html:227 core/templates/user/overview.html:366
+#: core/templates/user/overview.html:405 core/templates/user/overview.html:444
+#: core/templates/user/overview.html:489 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,193 +1146,215 @@ msgstr "千卡"
msgid "Actions"
msgstr "操作"
-#: core/templates/user/overview.html:213
+#: core/templates/user/overview.html:236
msgid "Deactivate user"
msgstr "非活跃用户"
-#: core/templates/user/overview.html:217
+#: core/templates/user/overview.html:240
msgid "Activate user"
msgstr "活跃用户"
-#: core/templates/user/overview.html:226
+#: core/templates/user/overview.html:249
msgid "Reset user password"
msgstr "重置用户密码"
-#: core/templates/user/overview.html:230 gym/templates/gym/member_list.html:30
+#: core/templates/user/overview.html:253 gym/templates/gym/member_list.html:30
msgid "Roles"
msgstr "角色"
-#: core/templates/user/overview.html:246
+#: core/templates/user/overview.html:269
msgid "Password reset confirmation"
msgstr "密码重置确认"
-#: core/templates/user/overview.html:250
+#: core/templates/user/overview.html:273
msgid "Do you really want to change this user&#39;s password?"
msgstr "真的要修改用户&#39;的密码?"
-#: core/templates/user/overview.html:253
-#: exercises/templates/history/overview.html:106
-#: nutrition/templates/ingredient/view.html:148
-#: nutrition/templates/ingredient/view.html:160
+#: core/templates/user/overview.html:276
+#: nutrition/templates/ingredient/view.html:180
+#: nutrition/templates/ingredient/view.html:195
msgid "No"
msgstr "否"
-#: core/templates/user/overview.html:254
-#: exercises/templates/history/overview.html:99
-#: nutrition/templates/ingredient/view.html:146
-#: nutrition/templates/ingredient/view.html:158
+#: core/templates/user/overview.html:277
+#: nutrition/templates/ingredient/view.html:178
+#: nutrition/templates/ingredient/view.html:193
msgid "Yes"
msgstr "是"
-#: core/templates/user/overview.html:275 gym/templates/gym/member_list.html:105
+#: core/templates/user/overview.html:298 gym/templates/gym/member_list.html:105
msgid "Details"
msgstr "详细"
-#: 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
+#: core/templates/user/overview.html:302 gym/views/export.py:58
+#: manager/helpers.py:89 nutrition/views/plan.py:151
+#: nutrition/views/plan.py:157
msgid "Nr."
msgstr "序号"
-#: core/templates/user/overview.html:301 gym/models/contract.py:287
+#: core/templates/user/overview.html:324 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
+#: gym/templates/gym/member_list.html:112 gym/views/export.py:69
msgid "Phone"
msgstr "手机"
-#: core/templates/user/overview.html:305 gym/templates/contract/view.html:87
+#: core/templates/user/overview.html:328 gym/templates/contract/view.html:87
#: gym/templates/gym/member_list.html:130
msgid "Address"
msgstr "地址"
-#: core/templates/user/overview.html:316
+#: core/templates/user/overview.html:339
msgid "Registered"
msgstr "注册时间"
-#: core/templates/user/overview.html:320
+#: core/templates/user/overview.html:343
msgid "Last login"
msgstr "最后登录"
-#: core/templates/user/overview.html:325
+#: core/templates/user/overview.html:348
msgid "Status"
msgstr "状态"
-#: core/templates/user/overview.html:328
+#: core/templates/user/overview.html:351
msgid "Active"
msgstr "活跃"
-#: core/templates/user/overview.html:330
+#: core/templates/user/overview.html:353
msgid "Inactive"
msgstr "非活跃"
-#: core/templates/user/overview.html:351 gym/templates/contract/list.html:4
+#: core/templates/user/overview.html:374 gym/templates/contract/list.html:4
#: gym/templates/gym/member_list.html:218
msgid "Contracts"
msgstr "合同"
-#: core/templates/user/overview.html:429 gym/templates/document/list.html:4
+#: core/templates/user/overview.html:452 gym/templates/document/list.html:4
msgid "Documents"
msgstr "文档"
-#: core/templates/user/overview.html:436 gym/templates/document/list.html:33
+#: core/templates/user/overview.html:459 gym/templates/document/list.html:33
msgid "Download"
msgstr "下载"
-#: core/templates/user/overview.html:477 gym/views/admin_config.py:44
+#: core/templates/user/overview.html:500 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:480 gym/models/user_config.py:92
+#: core/templates/user/overview.html:503 gym/models/user_config.py:92
msgid "Include in inactive overview"
msgstr "包含在非活动概览中"
-#: core/templates/user/overview.html:513
+#: core/templates/user/overview.html:534 core/templates/user/overview.html:541
+msgid "Log in as this user"
+msgstr "以该用户登录"
+
+#: core/templates/user/overview.html:539
#, python-format
msgid "Admin login is only available for users in %(gym_name)s"
msgstr "管理员登录权限只对%(gym_name)s的用户开放"
-#: core/templates/user/overview.html:517
-msgid "Log in as this user"
-msgstr "以该用户登录"
-
#: core/templates/user/preferences.html:4
msgid "Preferences"
msgstr "首选项"
#: core/templates/user/preferences.html:19
+msgid "Account & security"
+msgstr ""
+
+#: core/templates/user/preferences.html:27
msgid "Verified email"
msgstr "已验证邮箱"
-#: core/templates/user/preferences.html:24
+#: core/templates/user/preferences.html:29
msgid "Unverified email"
msgstr "未验证的邮箱"
-#: core/templates/user/preferences.html:26
-msgid "Send verification email"
-msgstr "发送验证邮件"
-
-#: core/templates/user/preferences.html:31
-msgid "You need to verify your email to contribute exercises"
-msgstr "您需要验证您的邮箱来添加锻炼项目"
-
-#: core/templates/user/preferences.html:55 core/views/user.py:617
+#: core/templates/user/preferences.html:36 core/views/user.py:692
msgid "Change password"
msgstr "修改密码"
-#: core/templates/user/registration_sidebar.html:8
-msgid "Already have an account?"
-msgstr "已有账户?"
+#: core/templates/user/preferences.html:42
+#, fuzzy
+#| msgid "Reset password"
+msgid "Set password"
+msgstr "重设密码"
+
+#: core/templates/user/preferences.html:48
+msgid "Two-factor authentication"
+msgstr ""
+
+#: core/templates/user/preferences.html:50
+msgid "On"
+msgstr ""
+
+#: core/templates/user/preferences.html:52
+msgid "Off"
+msgstr ""
+
+#: core/templates/user/preferences.html:60
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "删除账户"
+
+#: core/templates/user/preferences.html:74
+msgid "Danger zone"
+msgstr ""
+
+#: core/templates/user/preferences.html:79
+msgid "Your account and all training data will be permanently deleted."
+msgstr ""
-#: core/templatetags/wger_extras.py:142 i18n.tpl:39
+#: core/templatetags/wger_extras.py:108 i18n.tpl:39
msgid "kg"
msgstr "千克"
-#: core/templatetags/wger_extras.py:144
-#: 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
+#: core/templatetags/wger_extras.py:110
+#: nutrition/templates/ingredient/view.html:93
+#: nutrition/templates/ingredient/view.html:99
+#: nutrition/templates/ingredient/view.html:106
+#: nutrition/templates/ingredient/view.html:115
#: nutrition/templates/ingredient/view.html:122
+#: nutrition/templates/ingredient/view.html:144
+#: nutrition/templates/ingredient/view.html:154
msgctxt "weight unit, i.e. grams"
msgid "g"
msgstr "克"
-#: core/templatetags/wger_extras.py:147 i18n.tpl:40
+#: core/templatetags/wger_extras.py:113 i18n.tpl:40
msgid "lb"
msgstr "磅"
-#: core/templatetags/wger_extras.py:149
+#: core/templatetags/wger_extras.py:115
msgctxt "weight unit, i.e. ounces"
msgid "oz"
msgstr "盎司"
-#: core/views/languages.py:88 exercises/views/categories.py:122
+#: core/views/languages.py:92 exercises/views/categories.py:122
#: exercises/views/equipment.py:103 exercises/views/muscles.py:99
-#: nutrition/views/ingredient.py:125
+#: nutrition/views/ingredient.py:212
msgid "Successfully deleted"
msgstr "删除成功"
-#: core/views/languages.py:96 core/views/license.py:103
+#: core/views/languages.py:100 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:132
+#: gym/views/document.py:207 gym/views/gym.py:489
+#: nutrition/views/ingredient.py:219
#, python-brace-format
msgid "Delete {0}?"
msgstr "删除 {0}?"
-#: core/views/languages.py:114 core/views/license.py:85
-#: core/views/repetition_units.py:96 core/views/user.py:480
+#: core/views/languages.py:118 core/views/license.py:85
+#: core/views/repetition_units.py:96 core/views/user.py:477
#: 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:151
+#: gym/views/contract.py:187 gym/views/contract_option.py:123
+#: gym/views/contract_type.py:123 gym/views/document.py:172
+#: gym/views/gym.py:471 nutrition/views/ingredient.py:238
#, python-brace-format
msgid "Edit {0}"
msgstr "编辑 {0}"
@@ -1190,52 +1369,68 @@ msgstr ""
"些,你可以更加深入了解到这个网站可以做到什么 你可以随意编辑或者删除这些数"
"据!"
-#: core/views/user.py:145
+#: core/views/user.py:180
#, python-brace-format
msgid "Account \"{0}\" was successfully deleted"
msgstr "账户\"{0}\"已经被成功删除"
-#: core/views/user.py:287
-msgid "You were successfully registered"
-msgstr "你已成功注册"
-
-#: core/views/user.py:357
+#: core/views/user.py:311
msgid "Settings successfully updated"
msgstr "设置更新成功"
-#: core/views/user.py:396
+#: core/views/user.py:314
+#, fuzzy
+#| msgid "Please select one of the options below."
+msgid "Please correct the errors below."
+msgstr "请选择通过或者拒绝."
+
+#: core/views/user.py:378
msgid "The user was successfully deactivated"
msgstr "该用户已经被成功置为非活跃"
-#: core/views/user.py:433
+#: core/views/user.py:430
msgid "The user was successfully activated"
msgstr "该用户已经被成功置为活跃"
-#: core/views/user.py:448
+#: core/views/user.py:445
msgid "Edit user"
msgstr "编辑用户"
-#: core/views/user.py:603 gym/templates/gym/member_list.html:26
-#: gym/views/gym.py:158
+#: core/views/user.py:503
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "API key was deleted"
+msgstr "是,删除"
+
+#: core/views/user.py:508
+msgid "All API sessions were revoked"
+msgstr ""
+
+#: core/views/user.py:524
+msgid "Refresh token was revoked"
+msgstr ""
+
+#: core/views/user.py:532
+#, python-brace-format
+msgid "Revoked {count} refresh token(s)"
+msgstr ""
+
+#: core/views/user.py:678 gym/templates/gym/member_list.html:26
+#: gym/views/gym.py:161
msgid "ID"
msgstr "ID"
-#: 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
+#: core/views/user.py:679 gym/forms.py:95 gym/templates/contract/view.html:55
+#: gym/templates/gym/member_list.html:27 gym/views/export.py:60
+#: gym/views/gym.py:161 gym/views/gym.py:220
msgid "Username"
msgstr "用户名"
-#: core/views/user.py:607 gym/templates/gym/new_user.html:34
-#: gym/views/export.py:58 gym/views/gym.py:217
+#: core/views/user.py:682 gym/templates/gym/new_user.html:34
+#: gym/views/export.py:59 gym/views/gym.py:220
msgid "Gym"
msgstr "健身房"
-#: core/views/user.py:678
-#, python-format
-msgid "A verification email was sent to %(email)s"
-msgstr "一封验证邮箱已发送至 %(email)s"
-
#: exercises/models/muscle.py:37
msgid "In latin, e.g. \"Pectoralis major\""
msgstr "拉丁语中的\"Pectoralis major\""
@@ -1265,44 +1460,160 @@ msgstr "这不是一个有效的视频文件"
msgid "Equipment list"
msgstr "器材列表"
-#: exercises/templates/history/overview.html:11
+#: exercises/templates/history/overview.html:7
msgid "Exercise admin history"
msgstr "训练管理历史"
-#: exercises/templates/history/overview.html:27
-msgid "Action"
-msgstr "操作"
+#: exercises/templates/history/overview.html:16
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 24h"
+msgstr "编辑组"
-#: exercises/templates/history/overview.html:28 gym/forms.py:58
-#: gym/templates/gym/email_inactive_members.html:4
-#: gym/templates/gym/new_user.html:22
-#: gym/templates/gym/reset_user_password.html:20
-msgid "User"
-msgstr "用户"
+#: exercises/templates/history/overview.html:24
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 7d"
+msgstr "编辑组"
-#: exercises/templates/history/overview.html:29
-msgid "Object"
+#: exercises/templates/history/overview.html:32
+#, fuzzy
+#| msgid "Edit set"
+msgid "Edits last 30d"
+msgstr "编辑组"
+
+#: exercises/templates/history/overview.html:49
+#: nutrition/templates/ingredient/overview.html:119
+msgid "Apply"
+msgstr ""
+
+#: exercises/templates/history/overview.html:50
+#: nutrition/templates/ingredient/overview.html:121
+msgid "Reset"
+msgstr ""
+
+#: exercises/templates/history/overview.html:88
+msgid "Account younger than 60 days"
+msgstr ""
+
+#: exercises/templates/history/overview.html:89
+msgid "new"
+msgstr ""
+
+#: exercises/templates/history/overview.html:94
+#, fuzzy
+#| msgid "Dedicated"
+msgid "created"
+msgstr "资深"
+
+#: exercises/templates/history/overview.html:96
+msgid "edited"
+msgstr ""
+
+#: exercises/templates/history/overview.html:98
+#, fuzzy
+#| msgid "Delete"
+msgid "deleted"
+msgstr "删除"
+
+#: exercises/templates/history/overview.html:100
+msgid "merged"
+msgstr ""
+
+#: exercises/templates/history/overview.html:113
+msgid "into"
+msgstr ""
+
+#: exercises/templates/history/overview.html:123
+msgid "media"
+msgstr ""
+
+#: exercises/templates/history/overview.html:126
+#, fuzzy
+#| msgid "Translation"
+msgid "translations"
+msgstr "翻译"
+
+#: exercises/templates/history/overview.html:129
+#, fuzzy
+#| msgid "Yes, delete"
+msgid "Object was deleted"
+msgstr "是,删除"
+
+#: exercises/templates/history/overview.html:180
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert change"
+msgstr "还原更改"
+
+#: exercises/templates/history/overview.html:187
+#, fuzzy
+#| msgid "Object"
+msgid "Open object"
msgstr "对象"
-#: exercises/templates/history/overview.html:31
-msgid "Changes"
-msgstr "修改"
+#: exercises/templates/history/overview.html:198
+#, fuzzy
+#| msgid "Revert changes"
+msgid "Revert this change?"
+msgstr "还原更改"
-#: exercises/templates/history/overview.html:32
+#: exercises/templates/history/overview.html:206
+msgid "The object will be restored to its previous state."
+msgstr ""
+
+#: exercises/templates/history/overview.html:213
+msgid "Cancel"
+msgstr ""
+
+#: exercises/templates/history/overview.html:220
msgid "Revert"
msgstr "还原"
-#: exercises/templates/history/overview.html:64
-msgid "View Object"
-msgstr "查看对象"
+#: exercises/templates/history/overview.html:236
+msgid "No changes match the filters."
+msgstr ""
-#: exercises/templates/history/overview.html:75
-msgid "View changes"
-msgstr "查看更改"
+#: exercises/templates/history/overview.html:238
+msgid "Reset filters"
+msgstr ""
-#: exercises/templates/history/overview.html:86
-msgid "Revert changes"
-msgstr "还原更改"
+#: exercises/templates/history/overview.html:246
+#, fuzzy
+#| msgid "Click here for more information"
+msgid "History pagination"
+msgstr "点击获取更多信息"
+
+#: exercises/templates/history/overview.html:251
+#: exercises/templates/history/overview.html:260
+#, fuzzy
+#| msgid "First name"
+msgid "First"
+msgstr "名字"
+
+#: exercises/templates/history/overview.html:256
+#: exercises/templates/history/overview.html:261
+#, fuzzy
+#| msgid "previous"
+msgid "Previous"
+msgstr "前"
+
+#: exercises/templates/history/overview.html:266
+#, python-format
+msgid "Page %(current)s of %(total)s"
+msgstr ""
+
+#: exercises/templates/history/overview.html:273
+#: exercises/templates/history/overview.html:282
+msgid "Next"
+msgstr ""
+
+#: exercises/templates/history/overview.html:278
+#: exercises/templates/history/overview.html:283
+#, fuzzy
+#| msgid "Last name"
+msgid "Last"
+msgstr "姓氏"
#: exercises/templates/muscles/admin-overview.html:4
msgid "Muscle overview"
@@ -1324,6 +1635,33 @@ msgstr "新增器材"
msgid "Delete equipment?"
msgstr "删除器材?"
+#: exercises/views/history.py:111 gym/forms.py:58
+#: gym/templates/gym/email_inactive_members.html:4
+#: gym/templates/gym/new_user.html:22
+#: gym/templates/gym/reset_user_password.html:20
+msgid "User"
+msgstr "用户"
+
+#: exercises/views/history.py:117
+msgid "Type"
+msgstr "类型"
+
+#: exercises/views/history.py:118 exercises/views/history.py:125
+msgid "All"
+msgstr ""
+
+#: exercises/views/history.py:124
+msgid "Action"
+msgstr "操作"
+
+#: exercises/views/history.py:131
+msgid "From"
+msgstr ""
+
+#: exercises/views/history.py:139
+msgid "To"
+msgstr ""
+
#: exercises/views/muscles.py:68
msgid "Add muscle"
msgstr "新增肌肉"
@@ -1422,15 +1760,15 @@ msgstr "开始时间"
msgid "End date"
msgstr "结束时间"
-#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:65
+#: gym/models/contract.py:263 gym/models/gym.py:73 gym/views/export.py:66
msgid "ZIP code"
msgstr "邮政编码"
-#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:66
+#: gym/models/contract.py:271 gym/models/gym.py:81 gym/views/export.py:67
msgid "City"
msgstr "城市"
-#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:67
+#: gym/models/contract.py:279 gym/models/gym.py:89 gym/views/export.py:68
msgid "Street"
msgstr "街道"
@@ -1522,7 +1860,7 @@ msgstr "健身房列表"
msgid "Global gym configuration"
msgstr "健身房全局配置"
-#: gym/templates/gym/list.html:69 gym/views/gym.py:171
+#: gym/templates/gym/list.html:69 gym/views/gym.py:174
msgid "Add new gym"
msgstr "新增健身房"
@@ -1599,11 +1937,11 @@ msgid ""
"password."
msgstr "该用户的密码已被重置.请提醒用户使用他们的新密码."
-#: gym/views/admin_notes.py:95 gym/views/document.py:95
+#: gym/views/admin_notes.py:96 gym/views/document.py:96
msgid "Add note"
msgstr "新增备注"
-#: gym/views/contract.py:69
+#: gym/views/contract.py:70
msgid "Add contract"
msgstr "新增合同"
@@ -1620,15 +1958,15 @@ msgstr "删除{0}"
msgid "Add contract type"
msgstr "新增合同类型"
-#: gym/views/export.py:63
+#: gym/views/export.py:64
msgid "Gender"
msgstr "性别"
-#: gym/views/gym.py:344
+#: gym/views/gym.py:347
msgid "Add user to gym"
msgstr "添加用户到健身房"
-#: gym/views/gym.py:443
+#: gym/views/gym.py:451
msgid "Edit gym"
msgstr "编辑健身房"
@@ -2031,26 +2369,26 @@ msgstr "训练"
msgid "Routine will expire soon"
msgstr "训练计划即将过期"
-#: manager/models/routine.py:154 manager/models/session.py:145
-msgid "The start time cannot be after the end time."
-msgstr "开始时间不能晚于结束时间。"
-
-#: manager/models/session.py:40
+#: manager/models/session.py:41
msgid "Bad"
msgstr "糟糕"
-#: manager/models/session.py:41
+#: manager/models/session.py:42
msgid "Neutral"
msgstr "一般"
-#: manager/models/session.py:42
+#: manager/models/session.py:43
msgid "Good"
msgstr "很赞"
-#: manager/models/session.py:142
+#: manager/models/session.py:149
msgid "If you enter a time, you must enter both start and end time."
msgstr "如果你想设置时间,那么你必须同时设置开始和结束时间。"
+#: manager/models/session.py:152
+msgid "The start time cannot be after the end time."
+msgstr "开始时间不能晚于结束时间。"
+
#: manager/templates/routines/email_reminder.tpl:3
#, python-format
msgid "Your current workout '%(routine)s' expired %(days)s days ago."
@@ -2110,53 +2448,53 @@ msgstr "健身"
msgid "Workout for %s"
msgstr "训练%s"
-#: nutrition/extract_info/off.py:72 nutrition/extract_info/off.py:91
+#: nutrition/extract_info/off.py:71 nutrition/extract_info/off.py:90
msgid "Serving"
msgstr ""
-#: nutrition/forms.py:71 nutrition/forms.py:208
+#: nutrition/forms.py:71 nutrition/forms.py:212
msgid "Unit"
msgstr "单元"
-#: nutrition/forms.py:179 nutrition/templates/rate/form.html:77
+#: nutrition/forms.py:183 nutrition/templates/rate/form.html:77
msgid "Basic caloric intake"
msgstr "基础热量摄入"
-#: nutrition/forms.py:180
+#: nutrition/forms.py:184
msgid "Your basic caloric intake as calculated for your data"
msgstr "根据你的数据算得的基础热量摄入"
-#: nutrition/forms.py:185
+#: nutrition/forms.py:189
msgid "Additional calories"
msgstr "额外卡路里"
-#: nutrition/forms.py:187
+#: nutrition/forms.py:191
msgid ""
"Additional calories to add to the base rate (to substract, enter a negative "
"number)"
msgstr "基础热量外额外的卡路里(若有缺口,则输入负数)"
-#: nutrition/forms.py:209
+#: nutrition/forms.py:213
msgid "grams (g)"
msgstr ""
-#: nutrition/forms.py:219
+#: nutrition/forms.py:223
msgid "Ingredient"
msgstr "食谱"
-#: nutrition/forms.py:223
+#: nutrition/forms.py:227
msgid "Also search for names in English"
msgstr "且以英文名字搜索"
-#: nutrition/forms.py:239
+#: nutrition/forms.py:243
msgid "Quantity"
msgstr ""
-#: nutrition/forms.py:241
+#: nutrition/forms.py:245
msgid "Enter a quantity and choose grams (g) or one of the serving units."
msgstr ""
-#: nutrition/models/ingredient.py:526
+#: nutrition/models/ingredient.py:476
#, fuzzy
#| msgid "Correction"
msgid "Portion"
@@ -2210,81 +2548,105 @@ msgstr ""
"的时候留了邮箱,流程结束后,你会收到提醒。"
#: nutrition/templates/ingredient/overview.html:32
-#: nutrition/templates/ingredient/overview.html:68
-#: nutrition/templates/ingredient/view.html:143
+#: nutrition/templates/ingredient/overview.html:104
+#: nutrition/templates/ingredient/view.html:173
msgid "Vegan"
msgstr ""
#: nutrition/templates/ingredient/overview.html:34
-#: nutrition/templates/ingredient/overview.html:79
-#: nutrition/templates/ingredient/view.html:155
+#: nutrition/templates/ingredient/overview.html:115
+#: nutrition/templates/ingredient/view.html:188
#, fuzzy
#| msgid "Variations"
msgid "Vegetarian"
msgstr "变体"
-#: nutrition/templates/ingredient/overview.html:43
+#: nutrition/templates/ingredient/overview.html:44
+#: nutrition/templates/ingredient/overview.html:47
msgid "No ingredients."
msgstr "没有成分。"
#: nutrition/templates/ingredient/overview.html:54
+#, fuzzy
+#| msgid "Ingredient Categories"
+msgid "Ingredient pagination"
+msgstr "成分类别"
+
+#: nutrition/templates/ingredient/overview.html:59
+#, fuzzy
+#| msgid "First name"
+msgid "First page"
+msgstr "名字"
+
+#: nutrition/templates/ingredient/overview.html:66
+#: nutrition/templates/ingredient/overview.html:71
+msgid "previous"
+msgstr "前"
+
+#: nutrition/templates/ingredient/overview.html:77
+#: nutrition/templates/ingredient/overview.html:82
+msgid "next"
+msgstr "后"
+
+#: nutrition/templates/ingredient/overview.html:90
msgid "Search"
msgstr "搜索"
-#: nutrition/templates/ingredient/overview.html:57
+#: nutrition/templates/ingredient/overview.html:93
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
+#: nutrition/templates/ingredient/view.html:78 nutrition/views/plan.py:237
msgid "Macronutrients"
msgstr "常量营养物"
-#: nutrition/templates/ingredient/view.html:55
+#: nutrition/templates/ingredient/view.html:87
msgid "kJ"
msgstr "千焦"
-#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:266
+#: nutrition/templates/ingredient/view.html:103 nutrition/views/plan.py:267
msgid "Sugar content in carbohydrates"
msgstr "碳水中的糖含量"
-#: nutrition/templates/ingredient/view.html:76
-#: nutrition/templates/ingredient/view.html:92
-#: nutrition/templates/ingredient/view.html:114
+#: nutrition/templates/ingredient/view.html:108
#: nutrition/templates/ingredient/view.html:124
+#: nutrition/templates/ingredient/view.html:146
+#: nutrition/templates/ingredient/view.html:156
+#: nutrition/templates/ingredient/view.html:176
+#: nutrition/templates/ingredient/view.html:191
+#: nutrition/templates/ingredient/view.html:212
msgid "n.A."
msgstr "不可用"
-#: nutrition/templates/ingredient/view.html:87 nutrition/views/plan.py:280
+#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:281
msgid "Saturated fat content in fats"
msgstr "脂肪中的饱和脂肪含量"
-#: nutrition/templates/ingredient/view.html:103
+#: nutrition/templates/ingredient/view.html:135
msgid "Others"
msgstr "其它"
-#: nutrition/templates/ingredient/view.html:109 nutrition/views/plan.py:286
+#: nutrition/templates/ingredient/view.html:141 nutrition/views/plan.py:287
msgid "Fiber"
msgstr "纤维素"
-#: nutrition/templates/ingredient/view.html:119 nutrition/views/plan.py:292
+#: nutrition/templates/ingredient/view.html:151 nutrition/views/plan.py:293
msgid "Sodium"
msgstr "钠"
-#: nutrition/templates/ingredient/view.html:136
+#: nutrition/templates/ingredient/view.html:167
#, fuzzy
#| msgid "Click here for more information"
msgid "Dietary information"
msgstr "点击获取更多信息"
-#: nutrition/templates/ingredient/view.html:184
+#: nutrition/templates/ingredient/view.html:203
+#, fuzzy
+#| msgid "Nutrition"
+msgid "Nutri-Score"
+msgstr "营养"
+
+#: nutrition/templates/ingredient/view.html:234
msgid "Add new weight unit"
msgstr "新增计量单位"
@@ -2370,36 +2732,36 @@ msgstr ""
"如果你要参考你的热量计划,请一定\n"
"观察自己几个星期,按需变更。"
-#: nutrition/views/ingredient.py:163
+#: nutrition/views/ingredient.py:250
msgid "Add a new ingredient"
msgstr "新增一个食谱"
-#: nutrition/views/plan.py:127
+#: nutrition/views/plan.py:128
msgid "Nutritional plan"
msgstr "营养计划"
-#: nutrition/views/plan.py:129
+#: nutrition/views/plan.py:130
#, python-format
msgid "Nutritional plan for %s"
msgstr "%s的计划"
-#: nutrition/views/plan.py:201
+#: nutrition/views/plan.py:202
msgid "<i>This is an empty plan, what did you expect on the PDF?</i>"
msgstr "<i>这是一个空的计划,你希望在 PDF 上有什么?</i>"
-#: nutrition/views/plan.py:229
+#: nutrition/views/plan.py:230
msgid "Nutritional data"
msgstr "营养数据"
-#: nutrition/views/plan.py:237
+#: nutrition/views/plan.py:238
msgid "Total"
msgstr "总量"
-#: nutrition/views/plan.py:238
+#: nutrition/views/plan.py:239
msgid "Percent of energy"
msgstr "能量比例"
-#: nutrition/views/plan.py:239
+#: nutrition/views/plan.py:240
msgid "g per body kg"
msgstr "克(以每1千克体重记)"
@@ -2778,35 +3140,35 @@ msgstr "源代码"
msgid "Translation"
msgstr "翻译"
-#: utils/generic_views.py:246
+#: utils/generic_views.py:241
msgid "Yes, delete"
msgstr "是,删除"
-#: utils/models.py:51
+#: utils/models.py:75
msgid "The original title of this object, if available"
msgstr "此对象的原始标题(如果有)"
-#: utils/models.py:57
+#: utils/models.py:81
msgid "Link to original object, if available"
msgstr "链接到原始对象(如果有)"
-#: utils/models.py:63
+#: utils/models.py:87
msgid "Author(s)"
msgstr "作者"
-#: utils/models.py:67
+#: utils/models.py:91
msgid "If you are not the author, enter the name or source here."
msgstr "如果你不是作者,请在此处输入原作者或来源。"
-#: utils/models.py:71
+#: utils/models.py:95
msgid "Link to author profile, if available"
msgstr "如果有的话,链接到作者简介"
-#: utils/models.py:77
+#: utils/models.py:101
msgid "Link to the original source, if this is a derivative work"
msgstr "如果这是衍生作品,请链接到原始来源"
-#: utils/models.py:79
+#: utils/models.py:103
msgid ""
"Note that a derivative work is one which is not only based on a previous "
"work, but which also contains sufficient new, creative content to entitle it "
@@ -2947,6 +3309,61 @@ msgstr ""
msgid "Re-Submit"
msgstr "重新提交"
+#~ msgid "Used for password resets and, optionally, e-mail reminders."
+#~ msgstr "用来重设密码和邮件提醒,如果你选择了邮件提醒。"
+
+#~ msgid "Workout reminders"
+#~ msgstr "健身提醒"
+
+#~ msgid "Show exercise comments"
+#~ msgstr "显示健身项目的评论"
+
+#~ msgid "Check to show exercise comments on the workout view"
+#~ msgstr "勾选用来在健身版块显示该健身项目的评论"
+
+#~ msgid "Also use ingredients in English"
+#~ msgstr "使用食谱时用英文显示"
+
+#~ msgid ""
+#~ "Check to also show ingredients in English while creating\n"
+#~ "a nutritional plan. These ingredients are extracted from a list provided\n"
+#~ "by the US Department of Agriculture. It is extremely complete, with "
+#~ "around\n"
+#~ "7000 entries, but can be somewhat overwhelming and make the search "
+#~ "difficult."
+#~ msgstr ""
+#~ "勾选以在创建营养计划时,使用英文来显示食谱.\n"
+#~ "这些食谱摘录自美国农业部提供的食谱列表.它大概有7000多个食谱,\n"
+#~ "这是极其完善的,但是,在某些程度上,\n"
+#~ "也会让人抓狂并且让搜索变得困难."
+
+#~ msgid "Allow external access"
+#~ msgstr "允许外部访问"
+
+#~ 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 ""
+#~ "允许外网用户以只读模式访问你的健身和日志等数据.在你分享链接到社交媒体之前,"
+#~ "你需要勾选这个选项."
+
+#~ msgid "Your API key"
+#~ msgstr "你的API密钥"
+
+#~ msgid "You need to verify your email to contribute exercises"
+#~ msgstr "您需要验证您的邮箱来添加锻炼项目"
+
+#~ msgid "You were successfully registered"
+#~ msgstr "你已成功注册"
+
+#, python-format
+#~ msgid "A verification email was sent to %(email)s"
+#~ msgstr "一封验证邮箱已发送至 %(email)s"
+
+#~ msgid "View Object"
+#~ msgstr "查看对象"
+
#~ msgid "Email verification"
#~ msgstr "邮箱验证"
@@ -3117,9 +3534,6 @@ msgstr "重新提交"
#~ msgid "Brand name of product"
#~ msgstr "产品品牌"
-#~ msgid "Ingredient Categories"
-#~ msgstr "成分类别"
-
#~ msgid "Amount in grams"
#~ msgstr "以克记的重量"
@@ -3317,9 +3731,6 @@ msgstr "重新提交"
#~ "for a superset."
#~ msgstr "你可以搜索多个健身项目,它们将会被聚合成一个超集."
-#~ msgid "Type"
-#~ msgstr "类型"
-
#~ msgid "Table"
#~ msgstr "表格"
@@ -3414,9 +3825,6 @@ msgstr "重新提交"
#~ msgid "Log overview"
#~ msgstr "日志概述"
-#~ msgid "Workout session"
-#~ msgstr "锻炼课程"
-
#~ msgid "Delete with logs"
#~ msgstr "删除日志"
@@ -3555,9 +3963,6 @@ msgstr "重新提交"
#~ "你仅需要一个值:例如,对于四组,你只需要输入一个“10”,\n"
#~ "它就自动会变成“四乘十”。"
-#~ msgid "Edit set"
-#~ msgstr "编辑组"
-
#~ msgid "Update"
#~ msgstr "更新"
@@ -3604,9 +4009,6 @@ msgstr "重新提交"
#~ msgid "Delete workout log"
#~ msgstr "删除健身日志"
-#~ msgid "Create schedule"
-#~ msgstr "创建规划"
-
#~ msgid "Edit workout"
#~ msgstr "编辑健身"
@@ -3743,9 +4145,6 @@ msgstr "重新提交"
#~ "者\n"
#~ "食谱搜索中出现."
-#~ msgid "Please select one of the options below."
-#~ msgstr "请选择通过或者拒绝."
-
#~ msgid "Accept"
#~ msgstr "接受"