diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.yml index a6e4fb06c..2170f7223 100644 --- a/.github/workflows/docker-base.yml +++ b/.github/workflows/docker-base.yml @@ -39,4 +39,4 @@ jobs: push: true file: extras/docker/base/Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7 - tags: ${{ vars.REGISTRY_REPO }}/base:latest,${{ vars.REGISTRY_REPO }}/base:2.2-dev + tags: ${{ vars.REGISTRY_REPO }}/base:latest,${{ vars.REGISTRY_REPO }}/base:2.3-dev diff --git a/.github/workflows/docker-demo.yml b/.github/workflows/docker-demo.yml index b0385798d..7f976b6a5 100644 --- a/.github/workflows/docker-demo.yml +++ b/.github/workflows/docker-demo.yml @@ -41,4 +41,4 @@ jobs: push: true file: extras/docker/demo/Dockerfile platforms: linux/amd64,linux/arm64 - tags: ${{ vars.REGISTRY_REPO }}/demo:latest,${{ vars.REGISTRY_REPO }}/demo:2.2-dev,${{ vars.REGISTRY_REPO }}/apache:latest,${{ vars.REGISTRY_REPO }}/apache:2.2-dev + tags: ${{ vars.REGISTRY_REPO }}/demo:latest,${{ vars.REGISTRY_REPO }}/demo:2.3-dev,${{ vars.REGISTRY_REPO }}/apache:latest,${{ vars.REGISTRY_REPO }}/apache:2.3-dev diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2fcc4ad24..a27f686bd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,7 +34,7 @@ jobs: # https://github.com/docker/metadata-action tags: | type=raw,value=latest - type=raw,value=2.2-dev + type=raw,value=2.3-dev images: | ${{ env.REGISTRY_IMAGE }} ${{ env.REGISTRY_IMAGE_ALT }} @@ -114,12 +114,10 @@ jobs: - name: Docker meta id: meta uses: docker/metadata-action@v5 - # Think if we want to also build branches, PRs, tags, etc. - # https://github.com/docker/metadata-action with: tags: | type=raw,value=latest - type=raw,value=2.2-dev + type=raw,value=2.3-dev images: | ${{ env.REGISTRY_IMAGE }} ${{ env.REGISTRY_IMAGE_ALT }} diff --git a/package.json b/package.json index aa1dc22b0..4fe1fa174 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wger", - "version": "2.2.dev1", + "version": "2.3.dev1", "description": "Self hosted FLOSS fitness/workout and weight tracker", "repository": "github:wger-project/wger", "author": "", diff --git a/wger/__init__.py b/wger/__init__.py index 54dfffc4a..152ab2b07 100644 --- a/wger/__init__.py +++ b/wger/__init__.py @@ -10,7 +10,7 @@ MIN_APP_VERSION = (1, 6, 0, 'final', 1) -VERSION = (2, 2, 0, 'alpha', 4) +VERSION = (2, 3, 0, 'alpha', 1) RELEASE = True diff --git a/wger/locale/ar_SA/LC_MESSAGES/django.po b/wger/locale/ar_SA/LC_MESSAGES/django.po index a13f025fe..1bd4693d0 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-06-24 20:53+0000\n" "Last-Translator: SlyBat \n" "Language-Team: Arabic (Saudi Arabia) This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3364,6 +3160,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3812,6 +3612,12 @@ msgstr "تم الحذف بنجاح." msgid "Delete weight entry for the %s" msgstr "" +#~ msgid "Add a new meal" +#~ msgstr "اضافة اكلة جديدة" + +#~ msgid "Goal" +#~ msgstr "الهدف" + #~ msgid "Ingredients" #~ msgstr "مقادير" diff --git a/wger/locale/bg/LC_MESSAGES/django.po b/wger/locale/bg/LC_MESSAGES/django.po index 84dc4f6aa..6d4c41ed2 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2021-04-15 07:27+0000\n" "Last-Translator: Allan Nordhøy \n" "Language-Team: Bulgarian \n" @@ -36,8 +36,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -54,59 +54,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Поправи" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Примерна тренировка" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Примерен ден" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Друг примерен ден" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "Примерен план за хранене" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Място за тренировка № {0} по план" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Моята готина тренировъчна схема" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Празно място за тренировъчен план" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Вход" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -148,26 +147,26 @@ msgstr "Запази" msgid "Used for password resets and, optionally, email reminders." msgstr "" -#: core/forms.py:205 +#: core/forms.py:206 #, fuzzy #| msgid "This email is already used." msgid "This e-mail address is already in use." msgstr "Този email е вече използван." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "" -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -182,41 +181,39 @@ msgstr "" #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Изтрии" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Регистрация" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Коментирай" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Какво искаш да кажеш?" @@ -246,7 +243,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "" @@ -407,7 +404,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Единица за тегло" @@ -434,16 +431,16 @@ msgid "The sum of all hours has to be 24" msgstr "" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -455,8 +452,8 @@ msgid "Forbidden!" msgstr "Забранено!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Нещо се случи, което не е позволено." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -466,13 +463,20 @@ msgstr "Страницата не е намерена" msgid "The page you requested does not exist." msgstr "Страницата, която потърсихте не съществува" -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Нещо се случи, което причини грешка." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -488,7 +492,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "" @@ -497,8 +501,10 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Сигурен ли си, че искаш да изтриеш това? Това действие е невъзвратимо!" #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Administration" +msgid "Email verification" +msgstr "Администрация" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -556,9 +562,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -566,38 +572,7 @@ msgstr "" msgid "Close" msgstr "" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -608,94 +583,37 @@ msgstr "" msgid "Workout" msgstr "Упражнение" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Тази тренировка е част от график:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Не са намерени тренировки." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Добави сега." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "План за хранене" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Енергия" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Протеин" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Въглехидрати" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Мазнини" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Няма план за хранене" - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -704,12 +622,12 @@ msgstr "Няма план за хранене" msgid "Weight" msgstr "Тегло" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Добави тегло" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "" @@ -720,8 +638,8 @@ msgstr "" #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -744,7 +662,7 @@ msgstr "Добави" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Опции" @@ -755,8 +673,8 @@ msgstr "" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -774,8 +692,7 @@ msgstr "" msgid "Nothing found" msgstr "" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -790,8 +707,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Това е свършено" @@ -820,154 +735,160 @@ msgstr "График на тренировки" msgid "Calendar" msgstr "" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Макронутриенти" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 #, fuzzy #| msgid "Workouts schedules" msgid "Workout templates" msgstr "График на тренировки" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 #, fuzzy #| msgid "Your schedules" msgid "Your templates" msgstr "Твоите графици" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Упражнения" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Администрация" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercise day" msgid "Exercise edit history" msgstr "Ден за упражнение" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Мускули" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Хранене" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "План за хранене" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Преглед на съставките" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Единици за тежест на съставки" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Съставки без преглед" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Преглед на тегло" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Относно този код" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "За нас" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Лиценз" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Грабни кода" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Преведи" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Промени парола" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Моите преференции" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Изход" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Единици за тегло" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "" @@ -1021,14 +942,6 @@ msgstr "Мерси че ползвахте нашият сайт!" msgid "The %(site_name)s team" msgstr "Отбора на %(site_name)s." -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "предишно" @@ -1069,19 +982,19 @@ msgstr "Повторения" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" "Вие сте влезли като гост и всички данни, които добавяте ще бъдат изтрити " "след една седмица." -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Направи демонстративни попълнения" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "" @@ -1157,15 +1070,15 @@ msgstr "Забравена парола?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1178,24 +1091,25 @@ msgid "Add workout" msgstr "Добави упражнение" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Дата" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Описание" @@ -1218,7 +1132,7 @@ msgstr "" msgid "General impression" msgstr "" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1228,18 +1142,37 @@ msgstr "Бележки" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Добави план за хранене" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Енергия" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Протеин" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Въглехидрати" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Мазнини" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1249,110 +1182,110 @@ msgstr "Добави план за хранене" msgid "Actions" msgstr "Действия" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Потвърждение за нулиране на паролата" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "№" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "" @@ -1380,7 +1313,7 @@ msgstr "" msgid "Change password" msgstr "Смени парола" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "" @@ -1396,7 +1329,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "" @@ -1410,7 +1343,7 @@ msgstr "" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "" @@ -1421,8 +1354,7 @@ msgstr "" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "" @@ -1436,12 +1368,12 @@ msgstr "" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1452,19 +1384,19 @@ msgstr "" "този сайт да направи за теб. Чувствай се свободен да ги редактираш или " "изтриеш!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Ден за почивка" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Обратна връзка" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Вашият съвет/коментар бе изпратен успешно. Благодарим ви!" @@ -1514,19 +1446,19 @@ msgstr "" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Категория" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Основни мускули" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Второстепенни мускули" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1544,8 +1476,8 @@ msgstr "Упражнение" msgid "A comment about how to correctly do this exercise." msgstr "Коментар как да се направи упражнението правилно." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Език" @@ -1691,8 +1623,8 @@ msgstr "Действия" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Потребител" @@ -1817,7 +1749,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Количество" @@ -2138,65 +2070,69 @@ msgid "Legs" msgstr "" #: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 #, fuzzy #| msgid "Reps" msgid "Max Reps" msgstr "Повторения" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Повторения" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2283,7 +2219,7 @@ msgstr "Също използвай съставки на Английски" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "" @@ -2358,7 +2294,7 @@ msgid "The duration in weeks" msgstr "Времетраене в седмици" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Ред" @@ -2413,7 +2349,7 @@ msgstr "Номер на серии" msgid "Sets" msgstr "Серии" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Дата на създаване" @@ -2644,7 +2580,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Свали като PDF" @@ -2871,7 +2806,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2916,61 +2851,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Съставка" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "в кило калории за 100гр" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "В гр. за 100гр продукт" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Състав на захар в въглехидратите" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Наситени мазнини в мазнини" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Фибри" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Натрий" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2978,15 +2902,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Съставката е успешно добавен към общата база данни." -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Нова съставка добавена от потребител" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Потребителя {0} добави нова съставка \"{1}\"." @@ -3003,27 +2927,32 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Единица количество, напр. \"1 Чаша\" или \"1/2 лъжица\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "План за хранене" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Ядене" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 #, fuzzy #| msgid "Time (approx)" msgid "Date and Time (Approx.)" msgstr "Време (приблизително)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Време (приблизително)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3031,11 +2960,11 @@ msgstr "" "Пояснение за целта на плана, напр. \"Работа са Маса\" или \"Подготви се за " "лятото\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3190,14 +3119,11 @@ msgstr "Приемам" msgid "Decline" msgstr "Отказвам" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Макронутриенти" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3209,8 +3135,6 @@ msgid "n.A." msgstr "Не е налично" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Други" @@ -3228,133 +3152,6 @@ msgstr "Промени съставка" msgid "Delete ingredient" msgstr "Изтрий съставка" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Твоите планове за хранене" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Съставки" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Няма артикули за това ядене." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Няма яденета за този план." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Добави ново ядене" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Хранителни данни" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Цел" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Ако намирате списъка на съставки твърде кратък, може да активирате " -"предпочитанието да се показват също английски съставки." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Промени плана за хранене" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Направи копие на този план за хранене" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Изтрий план за хранене" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3439,37 +3236,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "Добави нова съставка" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Съставката бе успешно маркирана като отхвърлена" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Добави ново ядене" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" +msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Промени ядене" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" +msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Промени артикул в яденето" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Хранителни данни" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3480,6 +3277,10 @@ msgstr "Добави единица за тегло" msgid "Edit a weight unit to ingredient connection" msgstr "Промени единица за тегло към хранителната съставка" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3954,6 +3755,61 @@ msgstr "" msgid "Delete weight entry for the %s" msgstr "" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Нещо се случи, което не е позволено." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Нещо се случи, което причини грешка." + +#~ msgid "No nutrition plans." +#~ msgstr "Няма план за хранене" + +#~ msgid "Add nutrition plan" +#~ msgstr "Добави план за хранене" + +#~ msgid "Your nutrition plans" +#~ msgstr "Твоите планове за хранене" + +#~ msgid "Contents" +#~ msgstr "Съставки" + +#~ msgid "No items for this meal." +#~ msgstr "Няма артикули за това ядене." + +#~ msgid "No meals for this plan." +#~ msgstr "Няма яденета за този план." + +#~ msgid "Add a new meal" +#~ msgstr "Добави ново ядене" + +#~ msgid "Goal" +#~ msgstr "Цел" + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Ако намирате списъка на съставки твърде кратък, може да активирате " +#~ "предпочитанието да се показват също английски съставки." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Промени плана за хранене" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Направи копие на този план за хранене" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Изтрий план за хранене" + +#~ msgid "Add new meal" +#~ msgstr "Добави ново ядене" + +#~ msgid "Edit meal" +#~ msgstr "Промени ядене" + +#~ msgid "Edit meal item" +#~ msgstr "Промени артикул в яденето" + #~ msgid "Free license" #~ msgstr "Свободен лиценз" diff --git a/wger/locale/ca/LC_MESSAGES/django.po b/wger/locale/ca/LC_MESSAGES/django.po index 08414053e..2f26ba82c 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2022-02-08 01:58+0000\n" "Last-Translator: guillem \n" "Language-Team: Catalan \n" @@ -35,8 +35,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -53,59 +53,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Edita" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Entrenament de mostra" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Dia de mostra" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Un altre dia de mostra" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "Pla nutricional de mostra" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Reserva d'espai per l'entrenament núm. {0} per al programa" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "El meu programa d'entrenament xamós" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Programa buit per a reservar l'espai" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Accedeix" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Nom" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Cognom" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -151,24 +150,24 @@ msgstr "" "Usada per a reinicialitzar contrasenyes i, opcionalment, recordatoris per " "correu." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Aquesta adreça ja s'està usant." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Contrasenya" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Introduïu la contrasenya actual." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -183,41 +182,39 @@ msgstr "Introduïu la contrasenya actual." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Esborra" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Contrasenya invàlida" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "El formulari està protegit amb reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Enregistreu-vos" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Contacte" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Algun medi per respondre-us (adreça electrònica, etc.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Comentari" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Què voleu dir?" @@ -249,7 +246,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Nom curt, p. e. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Vincle" @@ -417,7 +414,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Ingesta calòrica total, inclosos p. e. qualsevol extra" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Unitat de pes" @@ -449,16 +446,16 @@ msgid "The sum of all hours has to be 24" msgstr "La suma de totes les hores ha de ser 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -470,8 +467,8 @@ msgid "Forbidden!" msgstr "Prohibit!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "S'ha produït alguna cosa no permesa." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -481,13 +478,20 @@ msgstr "No s'ha trobat la pàgina" msgid "The page you requested does not exist." msgstr "La pàgina sol·licitada no existeix." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "S'ha produït un error" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Ha succeït alguna cosa que ha produït un error." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, fuzzy, python-format @@ -512,7 +516,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Enrere a \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Comparteix" @@ -521,8 +525,10 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Esteu segur que voleu esborrar això? Aquesta acció no es pot desfer." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Configuration" +msgid "Email verification" +msgstr "Configuració" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -587,9 +593,9 @@ msgstr "" "Feu clic per a afegir registres de pes a un\n" "dia del vostre entrenament:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -597,41 +603,7 @@ msgstr "" msgid "Close" msgstr "Tanca" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Afegeix nova entrada al diari" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Feu clic per a afegir una entrada al vostre diari nutricional. Podeu " -"registrar un àpat com l'heu definit, o entrar qualsevol quantitat d'entrades " -"personalitzades." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Afegeix entrada de diari personalitzada" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -642,11 +614,11 @@ msgstr "Afegeix entrada de diari personalitzada" msgid "Workout" msgstr "Entrenament" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Aquest entrenament és part d'un programa:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -654,84 +626,27 @@ msgstr "" "L'entrenament actual se selecciona del vostre programa actiu o, si no en " "teniu un, simplement per data." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Afegeix nou registre" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "No s'han trobat entrenaments." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Afegeix-ne un ara." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Pla nutricional" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energia" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Proteïna" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Carbohidrats" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Greix" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "No s'han trobat plans nutricionals." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -740,12 +655,12 @@ msgstr "No s'han trobat plans nutricionals." msgid "Weight" msgstr "Pes" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Afegeix entrada de pes" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Llengües" @@ -756,8 +671,8 @@ msgstr "No s'ha trobat res." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -780,7 +695,7 @@ msgstr "Afegeix" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Opcions" @@ -791,8 +706,8 @@ msgstr "Llista de llicències" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -810,8 +725,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:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Colofó" @@ -830,8 +744,6 @@ msgstr "" "Abans de compartir vincles a xarxes socials heu de permetre l'accés extern." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Es fa aquí" @@ -866,150 +778,154 @@ msgstr "Plans d'entrenament" msgid "Calendar" msgstr "Calendari" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galeria" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Plantilles d'entrenaments" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Les vostres plantilles" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Plantilles públiques" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Exercicis" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administració" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercise day" msgid "Exercise edit history" msgstr "Dia d'entrenament" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Equipament" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Músculs" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Categories" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Nutrició" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Plans de nutrició" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Calculadora de l'IMC" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Calculadora de calories diàries" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Ingredients en un cop d'ull" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Unitats de pes dels ingredients" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ingredients pendents de revisar" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Pes corporal" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "El pes en un cop d'ull" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Quant a aquest programari" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Quant a nosaltres" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "API REST" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Llicència" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Documentació per a desenvolupadors" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Obteniu el codi font" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Traduïu" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Reinicialitza la contrasenya" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Les meves preferències" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Surt" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Llicències" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Unitats de repetició" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Unitats de pes" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Llista d'usuaris" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Gimnasos" @@ -1063,14 +979,6 @@ msgstr "Gràcies per usar el nostre lloc web!" msgid "The %(site_name)s team" msgstr "L'equip de %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "enrere" @@ -1111,19 +1019,19 @@ msgstr "Repeticions" msgid "RiR" msgstr "RER" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Crea algunes entrades de mostra" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Condicions del servei" @@ -1209,15 +1117,15 @@ msgstr "Contrasenya oblidada?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "darrers %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1230,24 +1138,25 @@ msgid "Add workout" msgstr "Afegeix entrenament" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Data" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Descripció" @@ -1270,7 +1179,7 @@ msgstr "Registre" msgid "General impression" msgstr "Impressió general" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1280,18 +1189,37 @@ msgstr "Notes" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Temps" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Afegeix pla de nutrició" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energia" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Proteïna" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Carbohidrats" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Greix" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1301,112 +1229,112 @@ msgstr "Afegeix pla de nutrició" msgid "Actions" msgstr "Accions" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Desactiva l'usuari" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Activa l'usuari" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Reinicialitza contrasenya de l'usuari" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Rols" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Confirmació de reinicialització de la contrasenya" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Voleu canviar la contrasenya d'aquest usuari?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "No" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Sí" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Detalls" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Núm." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telèfon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adreça" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Registrat" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Darrera connexió" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Estat" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Actiu" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inactiu" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Contractes" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Documents" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Descarrega" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Configuració" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Inclou a la vista general d'inactius" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Connecta amb aquest compte" @@ -1436,7 +1364,7 @@ msgstr "" msgid "Change password" msgstr "Canvia la contrasenya" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1452,7 +1380,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1466,7 +1394,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Esborrat amb èxit" @@ -1477,8 +1405,7 @@ msgstr "Esborrat amb èxit" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Esborrar {0}?" @@ -1492,12 +1419,12 @@ msgstr "Esborrar {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Edita {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1507,19 +1434,19 @@ msgstr "" "entrades de pla nutricional per a que podeu veure millor què pot fer aquest " "web. Podeu editar-les o esborrar-les!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Dia de repòs" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Escriviu-nos" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Envia" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Els vostres comentaris s'han enviat amb èxit. Gràcies!" @@ -1569,19 +1496,19 @@ msgstr "Gimnàs" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Categoria" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Músculs primaris" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Músculs secundaris" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Variacions" @@ -1599,8 +1526,8 @@ msgstr "Exercici" msgid "A comment about how to correctly do this exercise." msgstr "Un comentari sobre com fer aquest exercici correctament." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Llengua" @@ -1749,8 +1676,8 @@ msgstr "Accions" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Usuari" @@ -1878,7 +1805,7 @@ msgstr "Tipus de contracte" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Quantitat" @@ -2211,65 +2138,69 @@ msgid "Legs" msgstr "" #: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 #, fuzzy #| msgid "Reps" msgid "Max Reps" msgstr "Repeticions" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Repeticions" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2354,7 +2285,7 @@ msgstr "Usa també ingredients en anglès" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Unitat" @@ -2430,7 +2361,7 @@ msgid "The duration in weeks" msgstr "La duració en setmanes" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Ordre" @@ -2487,7 +2418,7 @@ msgstr "Nombre de sèries" msgid "Sets" msgstr "Sèries" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Data de creació" @@ -2754,7 +2685,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Descarrega com a PDF" @@ -2988,7 +2918,7 @@ msgstr "Nova impressió de l'entrenament per a {0}" msgid "This will delete all weight logs for this day as well." msgstr "Això esborrarà també tots els registres de pes per a aquest dia." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Valor" @@ -3035,61 +2965,50 @@ msgstr "" "un número negatiu)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Ingredient" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "En kcal per 100g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "En g per 100g de producte" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3097,15 +3016,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -3122,35 +3041,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Pla nutricional" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3294,14 +3218,11 @@ msgstr "Accepta" msgid "Decline" msgstr "Refusa" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3313,8 +3234,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3332,131 +3251,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3541,37 +3335,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3582,6 +3376,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4052,6 +3850,32 @@ msgstr "" msgid "Delete weight entry for the %s" msgstr "" +#~ msgid "Something happened that is not allowed." +#~ msgstr "S'ha produït alguna cosa no permesa." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Ha succeït alguna cosa que ha produït un error." + +#~ msgid "Add new diary entry" +#~ msgstr "Afegeix nova entrada al diari" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Feu clic per a afegir una entrada al vostre diari nutricional. Podeu " +#~ "registrar un àpat com l'heu definit, o entrar qualsevol quantitat " +#~ "d'entrades personalitzades." + +#~ msgid "Add custom diary entry" +#~ msgstr "Afegeix entrada de diari personalitzada" + +#~ msgid "No nutrition plans." +#~ msgstr "No s'han trobat plans nutricionals." + +#~ msgid "Add nutrition plan" +#~ msgstr "Afegeix pla de nutrició" + #~ msgid "Free license" #~ msgstr "Llicència lliure" diff --git a/wger/locale/cs/LC_MESSAGES/django.po b/wger/locale/cs/LC_MESSAGES/django.po index b4772a441..9dc2a6334 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-09-06 09:53+0000\n" "Last-Translator: CaptainDolphy \n" "Language-Team: Czech \n" @@ -42,8 +42,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -60,57 +60,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Upravit" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Ukázkový trénink" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Ukázkový den" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Další ukázkový den" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Ukázkový nutriční plán." -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Ukázkový trénink č.{0} pro rozvrh" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Můj suprový tréninkový rozvrh" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Prázdný ukázkový rozvrh" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Přihlášení" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Jméno" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Příjmení" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -154,26 +153,26 @@ msgstr "Uložit" 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:205 +#: core/forms.py:206 #, fuzzy #| msgid "This email is already used." msgid "This e-mail address is already in use." msgstr "Tento email je již registrován." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Heslo" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Zadejte prosím vaše současné heslo." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -188,43 +187,41 @@ msgstr "Zadejte prosím vaše současné heslo." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Smazat" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Chybné heslo" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 #, fuzzy #| msgid "Form is secured with reCaptcha" msgid "The form is secured with reCAPTCHA" msgstr "Zabezpečeno reCaptcha" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Registrace" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Kontakt" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Nějaký kontakt na vás (email, apod.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Komentář" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Co cheš říci?" @@ -256,7 +253,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Krátké jméno, například CC-BY-SA-3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Odkaz" @@ -421,7 +418,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Celkový energetický příjem, který zahrnuje třeba jakýkoliv přebytek." #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Jednotka váhy" @@ -453,16 +450,16 @@ msgid "The sum of all hours has to be 24" msgstr "Součet všech hodin musí být 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -474,8 +471,8 @@ msgid "Forbidden!" msgstr "Zakázané!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Něco se stalo, když to není povoleno." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -485,13 +482,20 @@ msgstr "Stránka nenalezena" msgid "The page you requested does not exist." msgstr "Požadovaná stránka neexistuje." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Nastala chyba" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Nastalo něco, co způsobilo chybu." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -511,7 +515,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Zpět na \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Sdílet" @@ -520,7 +524,9 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Jsi si jistý, že to chceš smazat? Tuhle akci už nejde pak odvolat." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "Email ověřen" #: core/templates/email_verification/confirm_template.html:18 @@ -581,9 +587,9 @@ msgstr "" " tréninkového " "dne v aktuálním tréninku." -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -591,40 +597,7 @@ msgstr "" msgid "Close" msgstr "Zavřít" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Přidat nový záznam" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Klepni sem pro přidání do tvého nutričního deníku pro dnešní den. Můžeš buď " -"zapsat jídlo podle sebe nebo vložit jakékoliv množství vlastních záznamů." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Vložit vlastní záznam" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -635,11 +608,11 @@ msgstr "Vložit vlastní záznam" msgid "Workout" msgstr "Trénink" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Tenhle trénink je součásti rozvrhu:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -647,84 +620,27 @@ msgstr "" "Aktivní cvičení je vybráno z aktivního rozvrhu\n" "nebo, pokud nemáte, bude vybráno podle data." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Přidat nový záznam" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Žádný trénink" -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Přidat nyní" -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Nutriční plán" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energie" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Bílkoviny" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Sacharidy" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Tuky" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Žádný nutriční plán." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -733,12 +649,12 @@ msgstr "Žádný nutriční plán." msgid "Weight" msgstr "Váha" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Zaznamenat váhu" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Jazyky" @@ -749,8 +665,8 @@ msgstr "Nic nenalezeno" #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -773,7 +689,7 @@ msgstr "Přidat" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Nastavení" @@ -784,8 +700,8 @@ msgstr "Seznam licencí" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -803,8 +719,7 @@ msgstr "Seznam licencí" msgid "Nothing found" msgstr "Nic nenalezeno" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Tiráž" @@ -824,8 +739,6 @@ msgstr "" "povolit externí přístup." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "A je to provedo" @@ -860,148 +773,154 @@ msgstr "Rozvrhy tréninků" msgid "Calendar" msgstr "Kalendář" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Makroživiny" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galerie" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Tréninkové šablony" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Tvé šablony" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Veřejné šablony" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Cviky" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administrace" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Historie úprav cvičení" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Nářadí" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Svaly" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Kategorie" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Výživa" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Nutriční plány" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Kalkulačka BMI" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Kalkulačka denních kalorii" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Přehled jídel" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Jednotka váhy položek" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Potraviny čekající na kontrolu" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Tělesná hmotnost" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Přehled váhy" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "O programu" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "O nás" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licence" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Dokumentace vývojáře" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Získat kód." -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Překlad" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Reset hesla" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Má nastavení" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Odhlásit" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licence" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Opakující jednotky" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Jednotka hmostnosti" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Uživatelský seznam" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Posilovny" @@ -1056,14 +975,6 @@ 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/rest_framework/api.html:37 -msgid "request info" -msgstr "žádané info" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "předchozí" @@ -1104,17 +1015,17 @@ msgstr "Opakování" msgid "RiR" msgstr "RiR" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Vytvořit nějaké testovací potraviny" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Obecná pravidla." @@ -1199,15 +1110,15 @@ msgstr "Zapomenuté heslo?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "poslední %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1220,24 +1131,25 @@ msgid "Add workout" msgstr "Přidat trénink" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Datum" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Popis" @@ -1260,7 +1172,7 @@ msgstr "Záznam" msgid "General impression" msgstr "Celkový dojem" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1270,18 +1182,37 @@ msgstr "Poznámky" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Čas" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Přidat nutriční plán" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energie" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Bílkoviny" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Sacharidy" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Tuky" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1291,110 +1222,110 @@ msgstr "Přidat nutriční plán" msgid "Actions" msgstr "Akce" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Deaktivovat uživatele" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Aktivovat uživatele" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Reset hesla" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Role" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Potvrzení obnovy hesla" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Opravdu chcete změnit těmto uživatelům's hesla?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Ne" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Ano" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Podrobnosti" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Č." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adresa" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Registrován" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Poslední příhlášení" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Stavy" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Aktivní" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Neaktivní" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Zakázky" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Dokumenty" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Stáhnout" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Konfigurace" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Zahrnout v přehledu neaktivních" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Přihlásit se jako tento uživatel" @@ -1422,7 +1353,7 @@ msgstr "Abyste mohli přidávat cvičení, musíte ověřit svůj email" msgid "Change password" msgstr "Změna hesla" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1438,7 +1369,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1452,7 +1383,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Úspěšně smazáno" @@ -1463,8 +1394,7 @@ msgstr "Úspěšně smazáno" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Smazat {0}?" @@ -1478,12 +1408,12 @@ msgstr "Smazat {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Upravit {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1493,19 +1423,19 @@ 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/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Odpočinkový den" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Zpětná vazba" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Zaslat" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Vaše zpětná vazba byla zaslána. Děkujeme." @@ -1555,19 +1485,19 @@ msgstr "Posilovna" msgid "A verification email was sent to %(email)s" msgstr "Ověřovací e-mail byl zaslán na %(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Kategorie" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Hlavní svaly" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Vedlejší svaly" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Variace" @@ -1585,8 +1515,8 @@ msgstr "Cvik" msgid "A comment about how to correctly do this exercise." msgstr "Komentář o tom, jak správně provést tento cvik" -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Jazyk" @@ -1727,8 +1657,8 @@ msgstr "Akce" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Uživatel" @@ -1849,7 +1779,7 @@ msgstr "Typ zakázky" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Množství" @@ -2182,65 +2112,69 @@ msgid "Legs" msgstr "Nohy" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Dolní část zad" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Maximum Opakování" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Míle" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "Míle za hodinu" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minuty" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "Kotouče" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Hrazda" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Čtyřhlavý sval stehenní" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Opakování" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "SZ-Bar" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Sekundy" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Ramena" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Gymnastický míč" -#: i18n.tpl:34 +#: i18n.tpl:35 #, fuzzy #| msgid "Triceps brachii" msgid "Triceps" msgstr "Trojhlavý sval pažní" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Do Selhání" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "nic (cvičení s tělesnou váhou)" @@ -2324,7 +2258,7 @@ msgstr "Použít také jména v Angličtině" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Jednotka" @@ -2400,7 +2334,7 @@ msgid "The duration in weeks" msgstr "Trvání v týdnech" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Řazení" @@ -2458,7 +2392,7 @@ msgstr "Počet sad" msgid "Sets" msgstr "Sady" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Datum vytvoření" @@ -2725,7 +2659,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Stáhnout jako PDF" @@ -2965,7 +2898,7 @@ msgstr "Nový dojem z tréninku pro {0}" msgid "This will delete all weight logs for this day as well." msgstr "Toto smaže všechny záznamy váhy pro tento den" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Hodnota" @@ -3012,61 +2945,50 @@ msgstr "" "zadejte záporné číslo)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Potravina" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "V kcal na 100g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "V g na 100g produktu" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Cukr v sacharidech" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Nasycené mastné kyseliny" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Vláknina" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Sodík" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Odkaz na produkt" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Značka produktu" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3076,15 +2998,15 @@ msgstr "" "Celková energie ({energy}kcal) není přibližná energie, kterou poskytují " "bílkoviny, sacharidy a tuky ({energy_calculated}kcal +/-{energy_approx}%)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Potravina byla přidána do základní databáze" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Uživatelem zaslané nové složky" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Uživatel {0} zaslan novou složku \"{1}\" ." @@ -3101,28 +3023,33 @@ msgstr "Množství v gramech" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Jednotka množství, např. \"1 pohár\" nebo \"1/2 lžíce\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Nutriční plán" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Jídlo" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 #, fuzzy #| msgid "Time (approx)" msgid "Date and Time (Approx.)" msgstr "Čas (cca)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Čas (cca)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 #, fuzzy msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "textový popis/název jídla, například \"snídaně\" nebo \"po tréninku\"." -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3130,11 +3057,11 @@ msgstr "" "Popis cíle plánu, například \"Získat svalovou hmotu\", nebo \"Shodit do " "plavek\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Použít denní kalorie" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3297,14 +3224,11 @@ msgstr "Povolit" msgid "Decline" msgstr "Zamítnout" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Makroživiny" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "kJ" @@ -3316,8 +3240,6 @@ msgid "n.A." msgstr "neuvedeno" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Další" @@ -3335,140 +3257,6 @@ msgstr "Upravit ingredience" msgid "Delete ingredient" msgstr "Smazat ingredience" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Nutriční deník" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Naplánováno" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Zaznamenáno" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Rozdíl" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Záznamy" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "nic nenalezeno" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Vaše nutriční plány" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Obsah" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Zaznamenat toto jídlo" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Přidat ingredienci do jídla" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Žádné potraviny pro toto jídlo." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Tento plán je bez stravy" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Zaznamenat tento plán" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Přidat nové jídlo" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Nutriční data" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "Založeno na záznamu váhy ze dne %(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Celkem" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Procent z energie" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g na kg tělesné váhy" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz na lb tělesné váhy" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Zobrazit kompletní nutriční log" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Cíl" - -#: nutrition/templates/plan/view.html:387 -#, fuzzy -#| msgid "" -#| "You have selected that this nutritional plan has a\n" -#| " goal amount of calories. Use the calculator or enter the value " -#| "yourself." -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Zvolili jste, že tento nutriční plán má jako cíl\n" -"množství kalorií. Použijte kalkulačku, nebo zadejte hodnotu sami." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Pokud seznam jídel je malý, můžete si aktivovat v nastevení, aby se také " -"zobrazovali jídla v Angličtině." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Upravit nutriční plán" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Vytvořit kopii tohoto nutričního plánu" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Smazat nutriční plán" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Hodnota Bazálního metabolismu" @@ -3567,39 +3355,39 @@ msgstr "" msgid "Add a new ingredient" msgstr "Přidat novou složku" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Složka byla označena jako zamítnuta" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Smazat?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Přidat nové jídlo" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Upravit jídlo" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Upravit položku jídla" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Nutriční plán" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Nutriční plán pro %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Tento plán je prázdný. Co jste očekávali v PDF?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Nutriční data" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Celkem" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Procent z energie" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g na kg tělesné váhy" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Přidat novou jednotku váhy" @@ -3608,6 +3396,10 @@ msgstr "Přidat novou jednotku váhy" msgid "Edit a weight unit to ingredient connection" msgstr "Upravit jednotku hmotnosti spojenou se složkou" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Smazat?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4136,6 +3928,132 @@ msgstr "Úspěšně smazáno." msgid "Delete weight entry for the %s" msgstr "Vymazat záznam váhy pro %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Něco se stalo, když to není povoleno." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Nastalo něco, co způsobilo chybu." + +#~ msgid "Add new diary entry" +#~ msgstr "Přidat nový záznam" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Klepni sem pro přidání do tvého nutričního deníku pro dnešní den. Můžeš " +#~ "buď zapsat jídlo podle sebe nebo vložit jakékoliv množství vlastních " +#~ "záznamů." + +#~ msgid "Add custom diary entry" +#~ msgstr "Vložit vlastní záznam" + +#~ msgid "No nutrition plans." +#~ msgstr "Žádný nutriční plán." + +#~ msgid "request info" +#~ msgstr "žádané info" + +#~ msgid "Add nutrition plan" +#~ msgstr "Přidat nutriční plán" + +#~ msgid "Nutrition diary" +#~ msgstr "Nutriční deník" + +#~ msgid "Planned" +#~ msgstr "Naplánováno" + +#~ msgid "Logged" +#~ msgstr "Zaznamenáno" + +#~ msgid "Difference" +#~ msgstr "Rozdíl" + +#~ msgid "Entries" +#~ msgstr "Záznamy" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "nic nenalezeno" + +#~ msgid "Your nutrition plans" +#~ msgstr "Vaše nutriční plány" + +#~ msgid "Contents" +#~ msgstr "Obsah" + +#~ msgid "Log this meal" +#~ msgstr "Zaznamenat toto jídlo" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Přidat ingredienci do jídla" + +#~ msgid "No items for this meal." +#~ msgstr "Žádné potraviny pro toto jídlo." + +#~ msgid "No meals for this plan." +#~ msgstr "Tento plán je bez stravy" + +#~ msgid "Log this Plan" +#~ msgstr "Zaznamenat tento plán" + +#~ msgid "Add a new meal" +#~ msgstr "Přidat nové jídlo" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Založeno na záznamu váhy ze dne %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "oz na lb tělesné váhy" + +#~ msgid "View complete nutrition log" +#~ msgstr "Zobrazit kompletní nutriční log" + +#~ msgid "Goal" +#~ msgstr "Cíl" + +#, fuzzy +#~| msgid "" +#~| "You have selected that this nutritional plan has a\n" +#~| " goal amount of calories. Use the calculator or enter the value " +#~| "yourself." +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Zvolili jste, že tento nutriční plán má jako cíl\n" +#~ "množství kalorií. Použijte kalkulačku, nebo zadejte hodnotu sami." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Pokud seznam jídel je malý, můžete si aktivovat v nastevení, aby se také " +#~ "zobrazovali jídla v Angličtině." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Upravit nutriční plán" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Vytvořit kopii tohoto nutričního plánu" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Smazat nutriční plán" + +#~ msgid "Add new meal" +#~ msgstr "Přidat nové jídlo" + +#~ msgid "Edit meal" +#~ msgstr "Upravit jídlo" + +#~ msgid "Edit meal item" +#~ msgstr "Upravit položku jídla" + #~ msgid "Free license" #~ msgstr "Free licence" @@ -4154,9 +4072,6 @@ msgstr "Vymazat záznam váhy pro %s" #~ "%(name_original)sje příliš podobné již existujícímu cvičení " #~ "\"%(exercise_name)s\"" -#~ msgid "Lower back" -#~ msgstr "Dolní část zad" - #~ msgid "Add training day" #~ msgstr "Přidat tréninkový den" diff --git a/wger/locale/da/LC_MESSAGES/django.po b/wger/locale/da/LC_MESSAGES/django.po index 13d9d4da6..827f118c3 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-07-09 18:48+0000\n" "Last-Translator: Tomasz Cielecki \n" "Language-Team: Danish \n" @@ -37,8 +37,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -55,59 +55,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Rediger" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Eksempel-træning" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Eksempel-dag" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Anden eksempel-dag" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "Eksempel-ernæringsplan" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Tom træning nr. {0} for plan" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Min seje trænings-plan" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Tom plan" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Login" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Fornavn" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Efternavn" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -151,24 +150,24 @@ msgstr "Gem" msgid "Used for password resets and, optionally, email reminders." msgstr "Bruges til kode-nulstilling og, hvis ønsket, email-påmindelser." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Denne emailadresse er allerede i brug." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Kodeord" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Indtast venligst dit nuværende kodeord." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -183,43 +182,41 @@ msgstr "Indtast venligst dit nuværende kodeord." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Slet" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Ukorrekt kodeord" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Denne formular er sikret med reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Registrer" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Kontakt" -#: core/forms.py:306 +#: core/forms.py:307 #, fuzzy #| msgid "Some way of answering you (email, etc.)" msgid "Some way of answering you (e-mail, etc.)" msgstr "Måder du kan kontaktes på (email, etc.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Kommentar" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Hvad vil du gerne sige?" @@ -251,7 +248,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Kort navn, f.eks. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Link" @@ -311,8 +308,8 @@ msgid "" "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" +"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" @@ -418,7 +415,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Total kalorieindtag, inklusive eventuelle overskud" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Vægt enhed" @@ -448,16 +445,16 @@ msgid "The sum of all hours has to be 24" msgstr "Summen af alle timer skal være 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -469,8 +466,8 @@ msgid "Forbidden!" msgstr "Forbudt!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Der skete noget som ikke er tilladt." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -480,13 +477,20 @@ msgstr "Side ikke fundet" msgid "The page you requested does not exist." msgstr "Siden du prøvede at tilgå eksisterer ikke." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Der skete en fejl" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Der skete noget som forsagede en fejl." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -506,7 +510,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "TIlbage til \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Del" @@ -515,7 +519,9 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Er du sikker på at du vil slette dette? Handlingen kan ikke fortrydes." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "Email verificeret" #: core/templates/email_verification/confirm_template.html:18 @@ -574,9 +580,9 @@ msgstr "" "Klik for at tilføje vægtlogs til en træningdag\n" " i din nuværende træningsplan:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -584,41 +590,7 @@ msgstr "" msgid "Close" msgstr "Luk" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Ny dagbogspost" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Klik for at tilføje en post til din ernæringsdagbog for idag. Du kan enten " -"tilføje et måltid som du har defineret det, eller tilføje vilkårligt antal " -"af brugerdefinererde poster." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Tilføj brugerdefineret dagbogspost" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -629,11 +601,11 @@ msgstr "Tilføj brugerdefineret dagbogspost" msgid "Workout" msgstr "Træning" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Denne træning er en del af skema:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -641,84 +613,27 @@ msgstr "" "Den nuværende træning er valgt ud fra dit aktive skema eller, hvis du ikke " "har et, ud fra dato." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Tilføj ny log" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Ingen træninger fundet." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Tilføj en ny." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Ernæringsplan" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energi" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Protein" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Kulhydrater" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Fedt" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Ingen ernæringsplaner." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -727,12 +642,12 @@ msgstr "Ingen ernæringsplaner." msgid "Weight" msgstr "Vægt" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Tilføj vægtpost" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Sprog" @@ -743,8 +658,8 @@ msgstr "Intet fundet." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -767,7 +682,7 @@ msgstr "Tilføj" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Indstillinger" @@ -778,8 +693,8 @@ msgstr "Licens liste" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -797,8 +712,7 @@ msgstr "Licens liste" msgid "Nothing found" msgstr "Ingenting fundet" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Aftryk" @@ -815,8 +729,6 @@ msgstr "" " adgang." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Det er gjort her" @@ -847,148 +759,152 @@ msgstr "Træningsplaner" msgid "Calendar" msgstr "Kaldender" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galleri" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Træningsskabeloner" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Dine skabeloner" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Offentlige skabeloner" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Øvelser" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administration" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Øvelsesredigeringshistorik" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Udstyr" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Muskler" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Kategorier" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Ernæring" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Ernæringsplaner" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "BMI lommeregner" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Daglige kalorier lommeregner" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Ingrediensoversigt" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Ingrediens vægtenheder" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ingredienser afventer gennemgang" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Kropsvægt" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Vægt oversigt" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Om denne software" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Om os" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licens" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Udviklerdokumentation" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Hent koden" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Oversæt" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Nulstil kodeord" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Mine indstillinger" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Log ud" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licenser" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Gentagelsesenheder" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Vægtenheder" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Brugerliste" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Fitnescentre" @@ -1042,14 +958,6 @@ msgstr "Tak fordi du bruger vores side!" msgid "The %(site_name)s team" msgstr "%(site_name)s teamet" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "anmodningsinformation" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "svarinformation" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "forrige" @@ -1090,17 +998,18 @@ msgstr "Repetitioner" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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." +msgstr "" +"Du bruger en gæstekonto, date indtastet vil blive slettet efter en uge." -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Indtast nogle demo-poster" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Vilkår for brug" @@ -1185,15 +1094,15 @@ msgstr "Glemt kodeord?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "sidste %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1206,24 +1115,25 @@ msgid "Add workout" msgstr "Tilføj træning" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Dato" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Beskrivelse" @@ -1246,7 +1156,7 @@ msgstr "Log" msgid "General impression" msgstr "Generelt indtryk" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1256,18 +1166,37 @@ msgstr "Noter" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Tid" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Tilføj ernæringsplan" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energi" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Protein" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Kulhydrater" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Fedt" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1277,110 +1206,110 @@ msgstr "Tilføj ernæringsplan" msgid "Actions" msgstr "Handlinger" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Deaktiver bruger" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Aktiver bruger" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Nulstil brugerens kodeord" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Roller" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Bekræft nulstilling af kodeord" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Vil du virkelig ændre denne brugers kodeord?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Nej" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Ja" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Detaljer" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Nr." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adresse" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Registreret" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Sidste login" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Status" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Aktiv" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inaktiv" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Kontrakter" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Dokumenter" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Konfiguration" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Inkluder i inaktiv oversigt" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Log ind som bruger" @@ -1408,7 +1337,7 @@ msgstr "Du skal bekræfte din email for at tilføje øvelser" msgid "Change password" msgstr "Ændre kodeord" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1424,7 +1353,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1438,7 +1367,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Sletning udført" @@ -1449,8 +1378,7 @@ msgstr "Sletning udført" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Slet {0}?" @@ -1464,12 +1392,12 @@ msgstr "Slet {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Rediger {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1479,19 +1407,19 @@ msgstr "" "og ernærningsplanposter så du bedre kan se hvad denne hjemmeside kan. Du kan " "redigere eller slette dem!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Hviledag" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Indsend" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Din feedback blev sendt. Tak!" @@ -1541,19 +1469,19 @@ msgstr "Fitnescenter" msgid "A verification email was sent to %(email)s" msgstr "En bekræftelsesemail blev sendt til %(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Kategori" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Primære muskler" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Sekundære muskler" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Variationer" @@ -1571,8 +1499,8 @@ msgstr "Øvelse" msgid "A comment about how to correctly do this exercise." msgstr "En kommentar om hvordan øvelsen udføres korrekt." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Sprog" @@ -1709,8 +1637,8 @@ msgstr "Indstillinger" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Bruger" @@ -1831,7 +1759,7 @@ msgstr "Kontrakttype" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Mængde" @@ -2160,63 +2088,67 @@ msgid "Legs" msgstr "Ben" #: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Maksimale Repetitioner" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Mil" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "Mil I Timen" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minutter" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "Vægtskiver" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Quadmuskler" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Repetitioner" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Sekunder" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Skuldre" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Schweizisk Bold" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Indtil Fejl" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "ingen (kropsvægt øvelse)" @@ -2300,7 +2232,7 @@ msgstr "Søg også navne på Engelsk" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Enhed" @@ -2376,7 +2308,7 @@ msgid "The duration in weeks" msgstr "Varighed i uger" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Orden" @@ -2431,7 +2363,7 @@ msgstr "Antal sæt" msgid "Sets" msgstr "Sæt" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Oprettelsesdato" @@ -2671,7 +2603,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Hent som PDF" @@ -2890,7 +2821,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2929,61 +2860,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2991,15 +2911,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -3016,35 +2936,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Ernæringsplan" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3188,14 +3113,11 @@ msgstr "" msgid "Decline" msgstr "" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3207,8 +3129,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3226,131 +3146,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3435,37 +3230,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3476,6 +3271,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3928,6 +3727,38 @@ msgstr "" msgid "Delete weight entry for the %s" msgstr "" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Der skete noget som ikke er tilladt." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Der skete noget som forsagede en fejl." + +#~ msgid "Add new diary entry" +#~ msgstr "Ny dagbogspost" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Klik for at tilføje en post til din ernæringsdagbog for idag. Du kan " +#~ "enten tilføje et måltid som du har defineret det, eller tilføje " +#~ "vilkårligt antal af brugerdefinererde poster." + +#~ msgid "Add custom diary entry" +#~ msgstr "Tilføj brugerdefineret dagbogspost" + +#~ msgid "No nutrition plans." +#~ msgstr "Ingen ernæringsplaner." + +#~ msgid "request info" +#~ msgstr "anmodningsinformation" + +#~ msgid "response info" +#~ msgstr "svarinformation" + +#~ msgid "Add nutrition plan" +#~ msgstr "Tilføj ernæringsplan" + #~ msgid "Ingredients" #~ msgstr "Ingredienser" diff --git a/wger/locale/de/LC_MESSAGES/django.po b/wger/locale/de/LC_MESSAGES/django.po index c65c9b9e6..e63634334 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-10-21 12:02+0000\n" "Last-Translator: m4skedbyte \n" "Language-Team: German \n" @@ -39,8 +39,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -57,57 +57,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Bearbeiten" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Beispiel Trainingsplan" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Beispieltag" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Noch ein Beispieltag" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Beispiel Ernährungsplan" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Platzhalter Trainingsplan {0} für Zeitplan" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Mein cooler Zeitplan" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Leerer Platzhalter Zeitplan" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Anmelden" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Vorname" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Nachname" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -153,24 +152,24 @@ msgstr "" "Wird für das Zurücksetzen von Passwörter und, optional, für E-Mail-" "Erinnerungen verwendet." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Diese E-Mail-Adresse wird bereits verwendet." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Passwort" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Bitte dein aktuelles Passwort eingeben." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -185,41 +184,39 @@ msgstr "Bitte dein aktuelles Passwort eingeben." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Löschen" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Ungültiges Passwort" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Das Formular ist mit reCaptcha gesichert" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Registrieren" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Kontakt" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Eine Möglichkeit, dich zu erreichen (E-Mail, usw.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Kommentar" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Was willst du sagen?" @@ -251,7 +248,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Kürzel, z.B. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Verweis" @@ -419,7 +416,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Gesamt Kalorieneinnahme inkl. Überschuss" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Gewichtseinheit" @@ -451,16 +448,16 @@ msgid "The sum of all hours has to be 24" msgstr "Die Summe aller Stunden muss 24 sein" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -472,8 +469,8 @@ msgid "Forbidden!" msgstr "Verboten!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Etwas Unerlaubtes ist passiert." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -483,13 +480,20 @@ msgstr "Seite nicht gefunden" msgid "The page you requested does not exist." msgstr "Diese Seite existiert nicht." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Ein Fehler ist passiert" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Etwas hat einen Fehler verursacht." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -508,7 +512,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Zurück zu „%(target)s“" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Teilen" @@ -519,7 +523,9 @@ msgstr "" "rückgängig gemacht werden." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "E-Mail verifiziert" #: core/templates/email_verification/confirm_template.html:18 @@ -586,9 +592,9 @@ msgstr "" "Klicken, um einen Gewichtseintrag zu einem Trainingstag in\n" "deinem aktuellen Trainingsplan hinzuzufügen:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -596,42 +602,7 @@ msgstr "" msgid "Close" msgstr "Schließen" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Neuen Tagebucheintrag hinzufügen" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Klicken Sie hier, um einen Eintrag zu Ihrem Ernährungstagebuch für heute " -"hinzuzufügen. Sie können entweder eine Mahlzeit so protokollieren, wie Sie " -"sie definiert haben, oder eine beliebige Anzahl von benutzerdefinierten " -"Einträgen eingeben." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Benutzerdefinierten Tagebucheintrag hinzufügen" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -642,11 +613,11 @@ msgstr "Benutzerdefinierten Tagebucheintrag hinzufügen" msgid "Workout" msgstr "Trainingsplan" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Dieser Traininsplan ist teil eines Zeitplans:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -654,84 +625,27 @@ msgstr "" "Dein aktueller Traininsplan wird aus deinem gerade aktiven Zeitplan " "ausgewählt oder, wenn du keinen hast, nach Datum." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Neuen Tagebucheintrag hinzufügen" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Keine Trainingspläne gefunden." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Jetzt hinzufügen." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Ernährungsplan" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energie" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Eiweiß" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Kohlenhydrate" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Fett" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Keine Ernährungspläne." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -740,12 +654,12 @@ msgstr "Keine Ernährungspläne." msgid "Weight" msgstr "Gewicht" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Gewichtseintrag hinzufügen" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Sprachen" @@ -756,8 +670,8 @@ msgstr "Nichts gefunden." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -780,7 +694,7 @@ msgstr "Hinzufügen" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Optionen" @@ -791,8 +705,8 @@ msgstr "Lizenzliste" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -810,8 +724,7 @@ msgstr "Lizenzliste" msgid "Nothing found" msgstr "Nichts gefunden" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Impressum" @@ -828,8 +741,6 @@ msgstr "" "aktivieren." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Das wird hier gemacht" @@ -864,148 +775,154 @@ msgstr "Trainingszeitpläne" msgid "Calendar" msgstr "Kalender" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Makronährstoffe" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galerie" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Trainingsvorlagen" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Ihre Vorlagen" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Öffentliche Vorlagen" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Übungen" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administration" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Übungen - Bearbeitungshistorie" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Gerät" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Muskeln" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Kategorien" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Ernährung" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Ernährungspläne" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "BMI-Rechner" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Kalorienrechner" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Zutatenübersicht" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Gewichtseinheiten für Zutaten" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Zutaten ohne Freigabe" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Körpergewicht" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Gewichtsübersicht" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Über diese Software" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Über uns" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Lizenz" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Entwickler-Dokumentation" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Quellcode" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Übersetze" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Passwort zurücketzen" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Meine Einstellungen" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Abmelden" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Lizenzen" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Wiederholungs-Einheiten" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Gewichtseinheiten" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Benutzerliste" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Studios" @@ -1059,14 +976,6 @@ msgstr "Vielen Dank, dass du unsere Website benutzt!" msgid "The %(site_name)s team" msgstr "Das Team von %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "Infos anfordern" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "Antwortinfo" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "zurück" @@ -1107,19 +1016,19 @@ msgstr "Wdh." msgid "RiR" msgstr "RiR" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Beispieldaten erstellen" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Allgemeine Nutzungsbedingungen" @@ -1206,15 +1115,15 @@ msgstr "Passwort vergessen?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "letzte %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1227,24 +1136,25 @@ msgid "Add workout" msgstr "Trainingsplan hinzufügen" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Datum" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Beschreibung" @@ -1267,7 +1177,7 @@ msgstr "Tagebucheintrag" msgid "General impression" msgstr "Allgemeiner Eindruck" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1277,18 +1187,37 @@ msgstr "Notizen" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Zeit" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Ernährungsplan hinzufügen" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energie" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Eiweiß" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Kohlenhydrate" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Fett" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1298,110 +1227,110 @@ msgstr "Ernährungsplan hinzufügen" msgid "Actions" msgstr "Aktionen" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Benutzer deaktivieren" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Benutzer aktivieren" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Benutzerpasswort zurücksetzen" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Rollen" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Zurücksetzen des Passworts bestätigen" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Möchtest du wirklich das Passwort vom diesem Benutzer zurücksetzen?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Nein" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Ja" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Details" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Nr." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adresse" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Registriert" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Letzter Login" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Status" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Aktiv" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inaktiv" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Verträge" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Dokumente" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Runterladen" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Konfiguration" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "In Inaktivübersicht aufnehmen" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Als diesen Benutzer einloggen" @@ -1429,7 +1358,7 @@ msgstr "Du musst deine E-Mail-Adresse bestätigen, um Übungen beizutragen" msgid "Change password" msgstr "Passwort ändern" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1445,7 +1374,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1459,7 +1388,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Erfolgreich gelöscht" @@ -1470,8 +1399,7 @@ msgstr "Erfolgreich gelöscht" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "{0} löschen?" @@ -1485,12 +1413,12 @@ msgstr "{0} löschen?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "{0} bearbeiten" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1501,19 +1429,19 @@ msgstr "" "du besser sehen was diese Seite machen kann. Du kannst diese Einträge " "natürlich bearbeiten oder löschen!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Ruhetag" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Rückmeldung" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Abschicken" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Dein Feedback wurde erfolgeich versendet. Danke!" @@ -1563,19 +1491,19 @@ msgstr "Studio" msgid "A verification email was sent to %(email)s" msgstr "Eine Bestätigungs-E-Mail wurde an %(email)s gesendet" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Kategorie" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Primärmuskeln" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Sekundärmuskeln" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Variationen" @@ -1593,8 +1521,8 @@ msgstr "Übung" msgid "A comment about how to correctly do this exercise." msgstr "Ein Kommentar über die korrekte Durchführung der Übung." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Sprache" @@ -1730,8 +1658,8 @@ msgstr "Aktionen" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Benutzer" @@ -1855,7 +1783,7 @@ msgstr "Vertragstyp" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Menge" @@ -2183,63 +2111,67 @@ msgid "Legs" msgstr "Beine" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Unterer Rücken" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Max. Wdh." -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Meilen" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "Meilen pro Stunde" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minuten" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Klimmzugstange" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Quadrizeps" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Wiederholungen" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "ß-Stange" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Sekunden" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Schultern" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Swissball" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "Trizeps" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Bis zum Muskelversagen" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "keine (Körpergewichtübung)" @@ -2324,7 +2256,7 @@ msgstr "Auch Zutaten auf Englisch suchen" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Einheit" @@ -2401,7 +2333,7 @@ msgid "The duration in weeks" msgstr "Die Dauer in Wochen" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Reihenfolge" @@ -2459,7 +2391,7 @@ msgstr "Anzahl der Sätze" msgid "Sets" msgstr "Sätze" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Erstellungsdatum" @@ -2730,7 +2662,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Als PDF runterladen" @@ -2972,7 +2903,7 @@ msgstr "Trainingseindruck für den {0} bearbeiten" msgid "This will delete all weight logs for this day as well." msgstr "Dies wird ebenfalls alle Gewichtslogs für diesen Tag löschen." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Wert" @@ -3011,61 +2942,50 @@ msgid "" msgstr "Zusat" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Zutat" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "In kcal/100 g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "In g pro 100 g Produkt" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Davon Zucker" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Davon gesättigte Fettsäuren" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Ballastoffe" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Natrium" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Link zum Produkt" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Markenname des Produkts" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3076,15 +2996,15 @@ msgstr "" "aus Eiweiß, Kohlenhydraten und Fett ({energy_calculated} kcal +/-" "{energy_approx} %)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Die Zutat wurde erfolgreich zur Datenbank hinzugefügt" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Neue Zutat von Benutzer eingereicht" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Der Nutzer {0} hat erfolgreich die neue Zutat „{1}“ eingereicht." @@ -3101,19 +3021,24 @@ msgstr "Menge in Gramm" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Menge der Einheit, z.B. „1 Tasse“ or „1/2 Löffel“" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Ernährungsplan" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Mahlzeit" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "Uhrzeit und Datum (ca.)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Uhrzeit (ca.)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" @@ -3121,18 +3046,18 @@ msgstr "" "Mahlzeiten eine Textbeschreibung / Name wie \"Frühstück oder\" \"nach dem " "Training\" geben" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" "Eine Beschreibung des Ernährungplanes, z.B. „Vorbereitung für den Sommer“" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Tägliche Kalorien benutzen" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3296,14 +3221,11 @@ msgstr "Freigeben" msgid "Decline" msgstr "Ablehnen" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Makronährstoffe" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "kJ" @@ -3315,8 +3237,6 @@ msgid "n.A." msgstr "k.A." #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Andere" @@ -3334,136 +3254,6 @@ msgstr "Zutat bearbeiten" msgid "Delete ingredient" msgstr "Zutat entfernen" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Ernährungstagebuch" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Geplant" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Protokolliert" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Unterschied" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Einträge" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "Nichts gefunden" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Deine ernährungspläne" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Inhalt" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Diese Mahlzeit protokollieren" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Zutat zur Mahlzeit hinzufügen" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Keine Zutaten für diese Mahlzeit." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Keine Mahlzeiten für diesen Ernährungsplan." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Diesen Plan protokollieren" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Neue Mahlzeit hinzufügen" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Ernährungswerte" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "Basierend auf dem Gewichtseintrag vom %(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Gesamt" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Prozent der Energie" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g pro Körper-kg" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz pro Körper-lb" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Komplettes Ernährungsprotokoll anzeigen" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Ziel" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Du hast angegeben, dass dieser Ernährungsplan eine Zielmenge an Kalorien " -"hat.\n" -"Benutze den Kalorienrechner oder gebe einen Wert ein." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Wenn die Liste der verfügbaren Zutaten zu kurz ist, kannst du die Option " -"benutzen, um auch Zutaten auf englisch anzuzeigen." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Ernährungplan bearbeiten" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Eine Kopie des Ernährungplanes machen" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Ernährungplan löschen" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Grundumsatz" @@ -3566,39 +3356,39 @@ msgstr "56 bis 90" msgid "Add a new ingredient" msgstr "Zutat hinzufügen" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Zutat wurde erfolgreich als abgelehnt markiert" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Löschen?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Neue Mahlzeit hinzufügen" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Mahlzeit bearbeiten" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Mahlzeitzutat bearbeiten" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Ernährungsplan" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Ernährungsplan für %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Das ist ein leerer Plan, was hast du im PDF erwartet?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Ernährungswerte" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Gesamt" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Prozent der Energie" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g pro Körper-kg" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Eine neue Gewichtseinheit hinzufügen" @@ -3607,6 +3397,10 @@ msgstr "Eine neue Gewichtseinheit hinzufügen" msgid "Edit a weight unit to ingredient connection" msgstr "Verbindung Gewichtseinheit-Zutat bearbeiten" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Löschen?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4146,6 +3940,132 @@ msgstr "Erfolgreich gelöscht." msgid "Delete weight entry for the %s" msgstr "Gewichtseintrag für den %s löschen" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Etwas Unerlaubtes ist passiert." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Etwas hat einen Fehler verursacht." + +#~ msgid "Add new diary entry" +#~ msgstr "Neuen Tagebucheintrag hinzufügen" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Klicken Sie hier, um einen Eintrag zu Ihrem Ernährungstagebuch für heute " +#~ "hinzuzufügen. Sie können entweder eine Mahlzeit so protokollieren, wie " +#~ "Sie sie definiert haben, oder eine beliebige Anzahl von " +#~ "benutzerdefinierten Einträgen eingeben." + +#~ msgid "Add custom diary entry" +#~ msgstr "Benutzerdefinierten Tagebucheintrag hinzufügen" + +#~ msgid "No nutrition plans." +#~ msgstr "Keine Ernährungspläne." + +#~ msgid "request info" +#~ msgstr "Infos anfordern" + +#~ msgid "response info" +#~ msgstr "Antwortinfo" + +#~ msgid "Add nutrition plan" +#~ msgstr "Ernährungsplan hinzufügen" + +#~ msgid "Nutrition diary" +#~ msgstr "Ernährungstagebuch" + +#~ msgid "Planned" +#~ msgstr "Geplant" + +#~ msgid "Logged" +#~ msgstr "Protokolliert" + +#~ msgid "Difference" +#~ msgstr "Unterschied" + +#~ msgid "Entries" +#~ msgstr "Einträge" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "Nichts gefunden" + +#~ msgid "Your nutrition plans" +#~ msgstr "Deine ernährungspläne" + +#~ msgid "Contents" +#~ msgstr "Inhalt" + +#~ msgid "Log this meal" +#~ msgstr "Diese Mahlzeit protokollieren" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Zutat zur Mahlzeit hinzufügen" + +#~ msgid "No items for this meal." +#~ msgstr "Keine Zutaten für diese Mahlzeit." + +#~ msgid "No meals for this plan." +#~ msgstr "Keine Mahlzeiten für diesen Ernährungsplan." + +#~ msgid "Log this Plan" +#~ msgstr "Diesen Plan protokollieren" + +#~ msgid "Add a new meal" +#~ msgstr "Neue Mahlzeit hinzufügen" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Basierend auf dem Gewichtseintrag vom %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "oz pro Körper-lb" + +#~ msgid "View complete nutrition log" +#~ msgstr "Komplettes Ernährungsprotokoll anzeigen" + +#~ msgid "Goal" +#~ msgstr "Ziel" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Du hast angegeben, dass dieser Ernährungsplan eine Zielmenge an Kalorien " +#~ "hat.\n" +#~ "Benutze den Kalorienrechner oder gebe einen Wert ein." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Wenn die Liste der verfügbaren Zutaten zu kurz ist, kannst du die Option " +#~ "benutzen, um auch Zutaten auf englisch anzuzeigen." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Ernährungplan bearbeiten" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Eine Kopie des Ernährungplanes machen" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Ernährungplan löschen" + +#~ msgid "Add new meal" +#~ msgstr "Neue Mahlzeit hinzufügen" + +#~ msgid "Edit meal" +#~ msgstr "Mahlzeit bearbeiten" + +#~ msgid "Edit meal item" +#~ msgstr "Mahlzeitzutat bearbeiten" + #~ msgid "Free license" #~ msgstr "Freie Lizenz" @@ -4159,9 +4079,6 @@ msgstr "Gewichtseintrag für den %s löschen" #~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\"" #~ msgstr "%(name)s ist zu ähnlich zur bestehenden Übung „%(exercise_name)s“" -#~ msgid "Lower back" -#~ msgstr "Unterer Rücken" - #~ msgid "Add training day" #~ msgstr "Trainingstag hinzufügen" diff --git a/wger/locale/el/LC_MESSAGES/django.po b/wger/locale/el/LC_MESSAGES/django.po index 0e82b3267..234d21fa5 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-10-01 07:01+0000\n" "Last-Translator: Antonis-geo \n" "Language-Team: Greek \n" @@ -38,8 +38,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -56,57 +56,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Επεξεργασία" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Δείγμα προπόνησης" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Δείγμα ημέρας" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Άλλο δείγμα ημέρας" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Δείγμα πλάνου διατροφής" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Υποκατάστατη προπόνηση αρ {0} για το πρόγραμμα" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Το τέλειο πρόγραμμα γυμναστικής μου" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Άδειο placeholder ημερολογίου" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Σύνδεση" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Όνομα" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Επίθετο" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -152,24 +151,24 @@ msgstr "" "Χρησιμοποιείται για επαναφορά κωδικού πρόσβασης και, προαιρετικά, " "υπενθυμίσεις ηλεκτρονικού ταχυδρομείου." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Αυτή η διεύθυνση email χρησιμοποιείται ήδη." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Κωδικός" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Παρακαλώ πληκτρολογήστε τον τρέχων κωδικό σας." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -184,41 +183,39 @@ msgstr "Παρακαλώ πληκτρολογήστε τον τρέχων κωδ #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Διαγραφή" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Λάθος κωδικός" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Η φόρμα είναι ασφαλισμένη με reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Εγγραφή" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Επικοινωνία" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Κάποιος τρόπος απάντησής σας (ηλεκτρονικό ταχυδρομείο κ.λπ.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Σχόλια" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Τί θέλετε να πείτε;" @@ -250,7 +247,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Μικρό όνομα, π.χ. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Σύνδεσμος" @@ -419,7 +416,7 @@ msgstr "" "Συνολική εισαγωγή θερμίδων, συμπεριλαμβάνοντας π.χ. οποιαδήποτε υπερβολή" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Μονάδα βάρους" @@ -451,16 +448,16 @@ msgid "The sum of all hours has to be 24" msgstr "Το σύνολο όλων των ωρών θα πρέπει να είναι 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -472,8 +469,8 @@ msgid "Forbidden!" msgstr "Απαγορεύεται!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Κάτι έγινε που δεν επιτρέπεται." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -483,13 +480,20 @@ msgstr "Η σελίδα δεν βρέθηκε" msgid "The page you requested does not exist." msgstr "Η σελίδα που ζητήσατε δεν υπάρχει." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Προέκυψε κάποιο πρόβλημα" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Κάτι συνέβει που προκάλεσε ένα σφάλμα." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -509,7 +513,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Πίσω στο \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Κοινοποίηση" @@ -519,7 +523,9 @@ msgstr "" "Θέλετε σίγουρα να διαγράψετε αυτό; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομίου επιβεβαιώθηκε" #: core/templates/email_verification/confirm_template.html:18 @@ -581,9 +587,9 @@ msgstr "" "Κάντε κλικ για να προσθέσετε αρχεία καταγραφής βάρους σε μια\n" "ημέρα προπόνησης στην τρέχουσα προπόνησή σας:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -591,41 +597,7 @@ msgstr "" msgid "Close" msgstr "Κλείσιμο" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Προσθήκη νέας καταχώρισης ημερολογίου" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Κάντε κλικ για να προσθέσετε μια καταχώρηση στο ημερολόγιο διατροφής σας για " -"σήμερα. Μπορείτε είτε να καταγράψετε ένα γεύμα όπως το ορίσατε εσείς, είτε " -"να καταχωρήσετε οποιονδήποτε αριθμό προσαρμοσμένων καταχωρήσεων." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Προσθήκη προσαρμοσμένης καταχώρησης ημερολογίου" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -636,11 +608,11 @@ msgstr "Προσθήκη προσαρμοσμένης καταχώρησης η msgid "Workout" msgstr "Προπόνηση" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Αυτή η προπόνηση είναι μέρος του προγράμματος:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -648,84 +620,27 @@ msgstr "" "Η τρέχουσα προπόνηση επιλέγεται από το ενεργό πρόγραμμά σας ή, αν δεν έχετε " "πρόγραμμα, επιλέγεται απλά με βάση την ημερομηνία." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Νέα εγγραφή" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Δεν βρέθηκαν προπονήσεις." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Προσθήκη τώρα." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Πρόγραμμα διατροφής" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Ενέργεια" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Προτεϊνες" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Υδατάνθρακες" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Λιπαρή ύλη" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Κανένα πρόγραμμα διατροφής." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -734,12 +649,12 @@ msgstr "Κανένα πρόγραμμα διατροφής." msgid "Weight" msgstr "Βάρος" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Νέα εγγραφή βάρους" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Γλώσσες" @@ -750,8 +665,8 @@ msgstr "Δεν βρέθηκε τίποτα." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -774,7 +689,7 @@ msgstr "Προσθήκη" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Επιλογές" @@ -785,8 +700,8 @@ msgstr "Λίστα αδειών" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -804,8 +719,7 @@ msgstr "Λίστα αδειών" msgid "Nothing found" msgstr "Δεν βρέθηκε τίποτα" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Εκτύπωση" @@ -823,8 +737,6 @@ msgstr "" "πρόσβαση." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Αυτό γίνεται εδώ" @@ -855,148 +767,154 @@ msgstr "Προγράμματα προπονήσεων" msgid "Calendar" msgstr "Ημερολόγιο" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Θρεπτικά στοιχεία" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Γκαλερί" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Πρότυπα προπόνησης" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Τα πρότυπά σας" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Δημόσια υποδείγματα" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Ασκήσεις" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Διαχείριση" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Ιστορικό επεξεργασίας της άσκησης" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Όργανα" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Μύες" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Κατηγορίες" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Διατροφή" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Προγράμματα διατροφής" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Υπολογιστής BMI" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Υπολογιστής ημερήσιων θερμίδων" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Επισκόπηση συστατικών" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Μονάδες βάρους συστατικών" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Συστατικά που αναμένουν εξέταση" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Σωματικό βάρος" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Επισκόπηση βάρους" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Σχετικά" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Σχετικά με μας" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Άδεια" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Τεκμηρίωση προγραμματιστή" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Κατεβάστε τον κώδικα" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Μετάφραση" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Επαναφορά κωδικού" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Οι προτιμήσεις μου" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Έξοδος" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Άδειες" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Μονάδες επανάληψης" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Μονάδες βάρους" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Λίστα χρήστη" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Γυμναστήρια" @@ -1053,14 +971,6 @@ msgstr "Ευχαριστούμε που χρησιμοποιήσατε τις υ msgid "The %(site_name)s team" msgstr "Η ομάδα %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "ζητήστε πληροφορίες" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "πληροφορίες απάντησης" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "προηγούμενο" @@ -1101,19 +1011,19 @@ msgstr "Επαναλήψεις" msgid "RiR" msgstr "Απόθεμα Επαναλήψεων" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" "Χρησιμοποιείτε έναν λογαριασμό επισκέπτη. Τα δεδομένα που εισάγετε θα " "διαγραφούν σε μία εβδομάδα." -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Δημιουργήστε μερικές δοκιμαστικές εγγραφές" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Όροι χρήσης" @@ -1199,15 +1109,15 @@ msgstr "Ξεχάσατε τον κωδικό σας;" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "τελευταίο %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1220,24 +1130,25 @@ msgid "Add workout" msgstr "Νέα προπόνηση" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Ημερομηνία" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Περιγραφή" @@ -1260,7 +1171,7 @@ msgstr "Ιστορικό" msgid "General impression" msgstr "Γενική εικόνα" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1270,18 +1181,37 @@ msgstr "Σημειώσεις" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Ώρα" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Νέο πρόγραμμα διατροφής" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Ενέργεια" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Προτεϊνες" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Υδατάνθρακες" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Λιπαρή ύλη" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1291,110 +1221,110 @@ msgstr "Νέο πρόγραμμα διατροφής" msgid "Actions" msgstr "Ενέργειες" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Απενεργοποίηση χρήστη" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Ενεργοποίηση χρήστη" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Επαναφορά κωδικού πρόσβασης χρήστη" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Ρόλοι" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Επιβεβαίωση αλλαγής κωδικού" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Θέλετε πραγματικά να αλλάξετε τον κωδικό πρόσβασης αυτού του χρήστη;" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Οχι" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Ναι" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Λεπτομέρειες" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Νο." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Τηλέφωνο" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Διεύθυνση" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Εγγεγραμμένοι" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Τελευταία είσοδος" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Κατάσταση" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Ενεργό" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Ανενεργό" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Συμβόλαια" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Έγγραφα" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Μεταφόρτωση" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Παραμετροποίηση" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Να συμπεριλαμβάνεται στην μη ενεργή επισκόπηση" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "Η σύνδεση διαχειριστή είναι διαθέσιμη μόνο για χρήστες σε%(gym_name)s" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Είσοδος ως αυτόν τον χρήστη" @@ -1422,7 +1352,7 @@ msgstr "Πρέπει να επαληθεύσετε το email σας για να msgid "Change password" msgstr "Αλλάξτε κωδικό" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1438,7 +1368,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "γρ" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1452,7 +1382,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Επιτυχής διαγραφή" @@ -1463,8 +1393,7 @@ msgstr "Επιτυχής διαγραφή" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Διαγραφή {0};" @@ -1478,12 +1407,12 @@ msgstr "Διαγραφή {0};" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Επεξεργασία {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1494,19 +1423,19 @@ msgstr "" "δείτε τι\tμπορεί να κάνει αυτός ο ιστότοπος. Νιώστε ελεύθερος να τις " "επεξεργαστείτε ή να τις διαγράψετε!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Μέρα ανάπαυσης" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Αναπληροφόρηση" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Υποβολή" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Η αναπληροφόρηση σας αποστάλθηκε με επιτυχία. Ευχαριστούμε!" @@ -1556,19 +1485,19 @@ msgstr "Γυμναστήριο" msgid "A verification email was sent to %(email)s" msgstr "Ένα μήνυμα ηλεκτρονικού ταχυδρομείου επαλήθευσης εστάλη στον%(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Κατηγορία" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Κύριοι μύς" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Δευτερεύοντες μύς" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Διαφοροποιήσεις" @@ -1586,8 +1515,8 @@ msgstr "Άσκηση" msgid "A comment about how to correctly do this exercise." msgstr "Ένα σχόλιο για τον σωστό τρόπο εφαρμογής της άσκησης." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Γλώσσα" @@ -1722,8 +1651,8 @@ msgstr "Δράση" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Χρήστης" @@ -1848,7 +1777,7 @@ msgstr "Τύπος συμβολαίου" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Ποσότητα" @@ -2176,63 +2105,67 @@ msgid "Legs" msgstr "Πόδια" #: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Μέγιστες επαναλήψεις" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Μίλια" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "Μίλια ανά ώρα" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Λεπτά" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "Πλάκες" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Μπάρα έλξης" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Τετρακέφαλοι" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Επαναλήψεις" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "Στραβόμπαρα" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Δευτερόλεπτα" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Ώμοι" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Ελβετική μπάλα" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "Τρικέφαλοι" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Μέχρι την αποτυχία" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "κανένα (άσκηση με το βάρος σώματος)" @@ -2319,7 +2252,7 @@ msgstr "Αναζητήστε επίσης ονόματα στα αγγλικά" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Μονάδα" @@ -2397,7 +2330,7 @@ msgid "The duration in weeks" msgstr "Η διάρκεια σε εβδομάδες" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Διάταξη" @@ -2457,7 +2390,7 @@ msgstr "Αριθμός σέτ" msgid "Sets" msgstr "Σετ" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Ημερομηνία δημιουργίας" @@ -2698,7 +2631,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Αποθήκευση ώς PDF" @@ -2941,7 +2873,7 @@ msgid "This will delete all weight logs for this day as well." msgstr "" "Αυτή η λειτουργία θα διαγράψει και όλες τις ασκήσεις σε αυτήν την κατηγορία." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Αξία" @@ -2982,61 +2914,50 @@ msgstr "" "αρνητικό αριθμό)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Συστατικά" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "Σε kcal ανα 100g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "Σε g ανα 100g προϊόντος" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Περιεχόμενο σάκχαρων σε υδατάνθρακες" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Εκ των οποίων κορεσμένα λίπη" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Ίνες" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Νάτριο" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Σύνδεσμος προς το προϊόν" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Επωνυμία του προϊόντος" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3047,15 +2968,15 @@ msgstr "" "ενέργειας που παρέχουν οι πρωτεΐνες, οι υδατάνθρακες και τα λιπαρά " "{energy_calculated}kcal+/-{energy_approx}%" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Το συστατικό προστέθηκε με επιτυχία στην γενική βάση δεδομένων" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Ένας χρήστης υπέβαλλε συστατικό" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Ο χρήστης {0} υπέβαλλε ένα νέο συστατικό \"{1}\"." @@ -3072,19 +2993,24 @@ msgstr "Ποσότητα σε γραμμάρια" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Μονάδα ποσότητας, π.χ. \"1 Φλιτζάνι\" ή \"1/2 κουτάλι\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Πρόγραμμα διατροφής" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Γεύμα" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "Ημερομηνία και ώρα (περίπου)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Ώρα (περίπου)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" @@ -3092,7 +3018,7 @@ msgstr "" "Δώστε στα γεύματα μια περιγραφή / όνομα κειμένου, όπως \"Πρωινό\" ή \"μετά " "την προπόνηση\"" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3100,11 +3026,11 @@ msgstr "" "Μια περιγραφή του στόχου ενός προγράμματος, π.χ. \"Προετοιμασία για το " "καλοκαίρι\" ή \"Πρόσθεση μάζας\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Χρήση ημερήσιων θερμίδων" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3274,14 +3200,11 @@ msgstr "Αποδοχή" msgid "Decline" msgstr "Άρνηση" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Θρεπτικά στοιχεία" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "kJ" @@ -3293,8 +3216,6 @@ msgid "n.A." msgstr "Μη διαθέσιμο" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Άλλα" @@ -3312,137 +3233,6 @@ msgstr "Επεξεργασία συστατικού" msgid "Delete ingredient" msgstr "Διαγραφή συστατικού" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Ημερολόγιο διατροφής" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Προγραμματισμένο" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Καταγεγραμμένο" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Διαφορά" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Καταχωρήσεις" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "δεν βρέθηκε τίποτα" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Τα διατροφικά σας προγράμματα" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Περιεχόμενα" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Καταχωρήστε αυτό το γεύμα" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Προσθέστε συστατικό στο γεύμα" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Δεν υπάρχουν εγγραφές σε αυτό το γεύμα." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Δεν υπάρχουν γεύματα για αυτό το πρόγραμμα." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Καταγράψτε αυτό το πλάνο" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Προσθήκη νέου γεύματος" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Διατροφικά δεδομένα" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "Με βάση την καταχώρηση βάρους με ημερομηνία %(date)s%(weight)s" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Σύνολο" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Ποσοστό ενέργειας" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g ανα kg σώματος" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz ανα lb σώματος" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Προβολή πλήρους ημερολογίου διατροφής" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Στόχος" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Έχετε επιλέξει ότι αυτό το διατροφικό πρόγραμμα έχει εναν\n" -"\tστόχο ποσότητας θερμίδων. Χρησιμοποιήστε την αριθμομηχανή ή εισάγετε τις " -"τιμές\n" -"\tεσείς." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Αν βρείτε την λίστα συστατικών πολύ μικρή, ίσως θελήσετε να ενεργοποιήσετε " -"απο τις προτιμήσεις τα αγγλικά συστατικά επίσης." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Επεξεργασία προγραμματος διατροφής" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Δημιουργήστε ένα αντίγραφο αυτού του προγράμματος διατροφής" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Διαγραφή προγράμματος διατροφής" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Βασικός μεταβολικός ρυθμός" @@ -3550,40 +3340,40 @@ msgstr "Από 56 εώς 90" msgid "Add a new ingredient" msgstr "Προσθήκη νέου συστατικού" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Το συστατικό απορρίφθηκε με επιτυχία" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Διαγραφη;" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Προσθήκη νέου γεύματος" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Επεξεργασία γεύματος" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Επεξεργασία εγγραφής γεύματος" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Διατροφικό σχέδιο" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Διατροφικό σχέδιο για %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" "Αυτό είναι ένα άδειο πρόγραμμα, τί περιμένατε να δείτε σε αυτό το PDF;" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Διατροφικά δεδομένα" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Σύνολο" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Ποσοστό ενέργειας" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g ανα kg σώματος" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Προσθήκη μιας νέας μονάδας βάρους" @@ -3592,6 +3382,10 @@ msgstr "Προσθήκη μιας νέας μονάδας βάρους" msgid "Edit a weight unit to ingredient connection" msgstr "Επεξεργασία μια μονάδας βάρους στον συσχετισμό συστατικού" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Διαγραφη;" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4117,6 +3911,132 @@ msgstr "Διαγράφηκε με επιτυχία." msgid "Delete weight entry for the %s" msgstr "Διαγραφή καταχώρισης βάρους για το %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Κάτι έγινε που δεν επιτρέπεται." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Κάτι συνέβει που προκάλεσε ένα σφάλμα." + +#~ msgid "Add new diary entry" +#~ msgstr "Προσθήκη νέας καταχώρισης ημερολογίου" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Κάντε κλικ για να προσθέσετε μια καταχώρηση στο ημερολόγιο διατροφής σας " +#~ "για σήμερα. Μπορείτε είτε να καταγράψετε ένα γεύμα όπως το ορίσατε εσείς, " +#~ "είτε να καταχωρήσετε οποιονδήποτε αριθμό προσαρμοσμένων καταχωρήσεων." + +#~ msgid "Add custom diary entry" +#~ msgstr "Προσθήκη προσαρμοσμένης καταχώρησης ημερολογίου" + +#~ msgid "No nutrition plans." +#~ msgstr "Κανένα πρόγραμμα διατροφής." + +#~ msgid "request info" +#~ msgstr "ζητήστε πληροφορίες" + +#~ msgid "response info" +#~ msgstr "πληροφορίες απάντησης" + +#~ msgid "Add nutrition plan" +#~ msgstr "Νέο πρόγραμμα διατροφής" + +#~ msgid "Nutrition diary" +#~ msgstr "Ημερολόγιο διατροφής" + +#~ msgid "Planned" +#~ msgstr "Προγραμματισμένο" + +#~ msgid "Logged" +#~ msgstr "Καταγεγραμμένο" + +#~ msgid "Difference" +#~ msgstr "Διαφορά" + +#~ msgid "Entries" +#~ msgstr "Καταχωρήσεις" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "δεν βρέθηκε τίποτα" + +#~ msgid "Your nutrition plans" +#~ msgstr "Τα διατροφικά σας προγράμματα" + +#~ msgid "Contents" +#~ msgstr "Περιεχόμενα" + +#~ msgid "Log this meal" +#~ msgstr "Καταχωρήστε αυτό το γεύμα" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Προσθέστε συστατικό στο γεύμα" + +#~ msgid "No items for this meal." +#~ msgstr "Δεν υπάρχουν εγγραφές σε αυτό το γεύμα." + +#~ msgid "No meals for this plan." +#~ msgstr "Δεν υπάρχουν γεύματα για αυτό το πρόγραμμα." + +#~ msgid "Log this Plan" +#~ msgstr "Καταγράψτε αυτό το πλάνο" + +#~ msgid "Add a new meal" +#~ msgstr "Προσθήκη νέου γεύματος" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Με βάση την καταχώρηση βάρους με ημερομηνία %(date)s%(weight)s" + +#~ msgid "oz per body lb" +#~ msgstr "oz ανα lb σώματος" + +#~ msgid "View complete nutrition log" +#~ msgstr "Προβολή πλήρους ημερολογίου διατροφής" + +#~ msgid "Goal" +#~ msgstr "Στόχος" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Έχετε επιλέξει ότι αυτό το διατροφικό πρόγραμμα έχει εναν\n" +#~ "\tστόχο ποσότητας θερμίδων. Χρησιμοποιήστε την αριθμομηχανή ή εισάγετε " +#~ "τις τιμές\n" +#~ "\tεσείς." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Αν βρείτε την λίστα συστατικών πολύ μικρή, ίσως θελήσετε να " +#~ "ενεργοποιήσετε απο τις προτιμήσεις τα αγγλικά συστατικά επίσης." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Επεξεργασία προγραμματος διατροφής" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Δημιουργήστε ένα αντίγραφο αυτού του προγράμματος διατροφής" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Διαγραφή προγράμματος διατροφής" + +#~ msgid "Add new meal" +#~ msgstr "Προσθήκη νέου γεύματος" + +#~ msgid "Edit meal" +#~ msgstr "Επεξεργασία γεύματος" + +#~ msgid "Edit meal item" +#~ msgstr "Επεξεργασία εγγραφής γεύματος" + #~ msgid "Free license" #~ msgstr "Δωρεάν αδειοδότηση" diff --git a/wger/locale/es/LC_MESSAGES/django.po b/wger/locale/es/LC_MESSAGES/django.po index 223297e81..06f3ffb68 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-07-16 04:01+0000\n" "Last-Translator: hhugoac \n" "Language-Team: Spanish \n" @@ -43,8 +43,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -61,57 +61,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Editar" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Rutina de ejemplo" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Día de ejemplo" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Otro día de ejemplo" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Ejemplo de plan nutricional" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Entrenamiento marcador de posición nº {0} para la programación" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Mi programa de rutinas" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Programación de marcador posición vacía" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Ingresar" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Nombre" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Apellido" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -157,24 +156,24 @@ msgstr "" "Se usa para restablecer constraseñas y, opcionalmente, para enviar avisos " "por correo electrónico." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Esta dirección de correo ya está en uso." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Contraseña" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Por favor, ingrese su contraseña actual." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -189,41 +188,39 @@ msgstr "Por favor, ingrese su contraseña actual." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Borrar" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Contraseña incorrecta" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "El Formulario está asegurado por recaptcha" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Registrarse" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Contacto" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Alguna manera de responderte (correo electrónico u otros)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Comentario" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "¿Qué quieres decir?" @@ -255,7 +252,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Nombre corto, por ejemplo CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Enlace" @@ -426,7 +423,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Ingesta total de calorías, incluyendo cualquier suplemento" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Unidad de peso" @@ -458,16 +455,16 @@ msgid "The sum of all hours has to be 24" msgstr "La suma de todas las horas tiene que ser 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -479,8 +476,8 @@ msgid "Forbidden!" msgstr "¡Prohibido!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Algo ha pasado que no está permitido." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -490,13 +487,20 @@ msgstr "Página no encontrada" msgid "The page you requested does not exist." msgstr "La página que has solicitado no existe." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Ha ocurrido un error" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Algo ha sucedido que ha causadi un error." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -516,7 +520,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Volver a \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Comparte" @@ -526,7 +530,9 @@ msgstr "" "¿Estás seguro de que quieres borrar esto? Esta acción no se puede deshacer." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "Correo electrónico verificado" #: core/templates/email_verification/confirm_template.html:18 @@ -589,9 +595,9 @@ msgstr "" " de entrenamiento en el " "entreno actual:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -599,41 +605,7 @@ msgstr "" msgid "Close" msgstr "Cerrar" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Añadir una entrada nueva" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Haga clic para agregar una entrada a su diario de nutrición de hoy. Puede " -"registrar una comida como la definió o ingresar cualquier número de entradas " -"personalizadas." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Añadir una entrada personalizada" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -644,11 +616,11 @@ msgstr "Añadir una entrada personalizada" msgid "Workout" msgstr "Rutina" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Esta rutina es parte de un programa:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -656,84 +628,27 @@ msgstr "" "El entrenamiento actual se selecciona de su programa activo o, si no tiene " "uno, simplemente por fecha." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Agregar nuevo registro" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "No se han encontrado rutinas." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Añadir ahora." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Plan nutricional" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energía" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Proteínas" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Hidratos de carbono" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Grasa" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "No hay planes nutricionales." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -742,12 +657,12 @@ msgstr "No hay planes nutricionales." msgid "Weight" msgstr "Peso" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Añadir entrada de peso" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Idiomas" @@ -758,8 +673,8 @@ msgstr "No se ha encontrado nada." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -782,7 +697,7 @@ msgstr "Añadir" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Opciones" @@ -793,8 +708,8 @@ msgstr "Listado de licencias" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -812,8 +727,7 @@ msgstr "Listado de licencias" msgid "Nothing found" msgstr "No se ha encontrado nada" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Imprimir" @@ -831,8 +745,6 @@ msgstr "" " externo." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Eso se hace aqui" @@ -864,148 +776,154 @@ msgstr "Programas" msgid "Calendar" msgstr "Calendario" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Macronutrientes" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galería" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Plantillas de entrenamiento" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Tus plantillas" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Plantillas públicas" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Ejercicios" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administración" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Historial de edición de ejercicios" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Equipo" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Músculos" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Categorias" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Nutrición" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Planes nutritionales" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Calculadora de IMC" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Caluladora de calorias diarias" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Índice de ingredientes" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Unidades de peso de los ingredientes" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ingredientes esperando revisión" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Peso corporal" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Índice de peso" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Sobre este programa" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Sobre nosotros" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licencia" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Documentación para desarrolladores" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Código fuente" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Traduce" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Restablecer la contraseña" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Mis preferencias" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Cerrar sesión" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licencias" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Unidades de repetición" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Unidades de peso" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Lista de usuarios" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Gimnasios" @@ -1062,14 +980,6 @@ msgstr "¡Gracias por usar nuestra página!" msgid "The %(site_name)s team" msgstr "El equipo de %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "solicitar información" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "información de la respuesta" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "anterior" @@ -1110,19 +1020,19 @@ msgstr "Repeticiones" msgid "RiR" msgstr "ReR" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Crear datos de ejemplo" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Términos de servicio" @@ -1207,15 +1117,15 @@ msgstr "¿Olvidaste tu contraseña?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "últimos %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1228,24 +1138,25 @@ msgid "Add workout" msgstr "Añadir rutina" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Fecha" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Descripción" @@ -1268,7 +1179,7 @@ msgstr "Registro" msgid "General impression" msgstr "Impresión general" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1278,18 +1189,37 @@ msgstr "Notas" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Tiempo" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Añadir plan nutricional" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energía" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Proteínas" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Hidratos de carbono" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Grasa" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1299,112 +1229,112 @@ msgstr "Añadir plan nutricional" msgid "Actions" msgstr "Acciones" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Desactivar usuario" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Activar usuario" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Restablecer la contraseña del usuario" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Roles" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Confirmación de restablecimiento de contraseña" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "¿Realmente quieres cambiar la contraseña de este usuario?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "No" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Sí" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Detalles" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Nr." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Teléfono" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Dirección" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Registrado" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Último inicio de sesión" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Estado" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Activo" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inactivo" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Contratos" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Documentos" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Bajar" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Configuración" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Incluir en lista de inactivos" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Inicia sesión como este usuario" @@ -1433,7 +1363,7 @@ msgstr "" msgid "Change password" msgstr "Cambiar contraseña" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1449,7 +1379,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1463,7 +1393,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Borrado con éxito" @@ -1474,8 +1404,7 @@ msgstr "Borrado con éxito" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "¿Borrar {0}?" @@ -1489,12 +1418,12 @@ msgstr "¿Borrar {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Editar {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1504,19 +1433,19 @@ 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/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Día de descanso" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Comentarios" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Enviar" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Tu comentario ha sido enviado con éxito, ¡gracias!" @@ -1566,19 +1495,19 @@ msgstr "Gimnasio" msgid "A verification email was sent to %(email)s" msgstr "Se envió un correo electrónico de verificación a %(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Categoría" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Músculos primarios" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Músculos secundarios" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Variantes" @@ -1596,8 +1525,8 @@ msgstr "Ejercicio" msgid "A comment about how to correctly do this exercise." msgstr "Comentario describiendo como hacer correctamente el ejercicio." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Idioma" @@ -1732,8 +1661,8 @@ msgstr "Acción" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Usuario" @@ -1855,7 +1784,7 @@ msgstr "Tipo de contrato" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Cantidad" @@ -2184,63 +2113,67 @@ msgid "Legs" msgstr "Piernas" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Espalda baja" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Repeticiones máximas" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Millas" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "Millas por hora" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minutos" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "Platos" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Barra hacia arriba" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Cuádriceps" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Repeticiones" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "Barra de curl" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Segundos" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Hombros" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Balón suizo" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "Tríceps" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Hasta fallo muscular" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "ninguno (ejercicio de peso corporal)" @@ -2325,7 +2258,7 @@ msgstr "Busque también los nombres en inglés" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Unidad" @@ -2399,7 +2332,7 @@ msgid "The duration in weeks" msgstr "La duración, en semanas" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Orden" @@ -2458,7 +2391,7 @@ msgstr "Número de series" msgid "Sets" msgstr "Series" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Fecha de creación" @@ -2695,7 +2628,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Bajar como PDF" @@ -2931,7 +2863,7 @@ msgstr "Nueva impresión de entrenamiento para el {0}" msgid "This will delete all weight logs for this day as well." msgstr "Esto también eliminará todos los registros de peso de este día." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Valor" @@ -2972,61 +2904,50 @@ msgstr "" "un número negativo)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Ingrediente" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "En kcal por 100g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "En g por 100g de producto" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Azúcar en los hidratos de carbono" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Contenido de grasas saturadas en grasas" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Fibras" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Sodio" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Enlace al producto" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Marca del producto" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3037,15 +2958,15 @@ msgstr "" "aportada por las proteínas, carbohidratos y grasas ({energy_calculated}kcal " "+/-{energy_approx}%)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "El ingrediente se ha añadido con éxito a la base de datos" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Nuevo ingrediente enviado por un usuario" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "El usuario {0} ha enviado un nuevo ingrediente \"{1}\"." @@ -3062,26 +2983,31 @@ msgstr "Cantidad en gramos" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Unidad, p.ej. \"1 taza\" o \"1/2 cuchara\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Plan nutricional" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Comida" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "Fecha y Hora (aprox.)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Hora (aprox.)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" "Dé a las comidas una descripción/nombre como \"Desayuno\" o \"Post entreno\"" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3089,11 +3015,11 @@ msgstr "" "Una descripción o meta del plan, p.ej. \"Ganar masa\" o \"Prepararse para el " "verano\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Usar calorías diarias" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3256,14 +3182,11 @@ msgstr "Aceptar" msgid "Decline" msgstr "Rechazar" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Macronutrientes" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "kJ" @@ -3275,8 +3198,6 @@ msgid "n.A." msgstr "n.d." #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Otros" @@ -3294,137 +3215,6 @@ msgstr "Editar ingrediente" msgid "Delete ingredient" msgstr "Borrar ingrediente" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Diario nutricional" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Planeado" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Logueado" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Diferencia" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Entradas" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "no se encontraron resultados" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Tus planes nutricionales" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Contenidos" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Registrar esta comida" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Añadir ingrendiente a la comida" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "No hay artículos para esta comida." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "No hay comidas para este plan." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Registrar este plan" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Añadir nueva comida" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Valores nutricionales" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "Basado en la entrada de peso con fecha %(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Total" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Porcentaje de la energía" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g por kg peso" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz por lb de peso" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Ver el registro completo de nutrición" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Meta" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Ha seleccionado que este plan nutricional tiene una\n" -" cantidad objetivo de calorías. Use la calculadora o introduzca " -"el valor\n" -" manualmente." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Si encuentras la lista de ingredientes demasiado corta, puedes activar la " -"preferencia para mostrar también ingredientes en inglés." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Editar plan nutricional" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Hacer una copia de este plan nutricional" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Borrar plan nutricional" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Metabolismo basal" @@ -3525,39 +3315,39 @@ msgstr "56 a 90" msgid "Add a new ingredient" msgstr "Añadir nuevo ingrediente" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "El ingrediente se ha marcado como rechazado con éxito" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "¿Borrar?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Añadir nueva comida" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Editar comida" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Editar ítem de alimentación" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Plan nutricional" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Plan nutricional para %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Esto es un plan vacío, ¿qué esperabas en el PDF?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Valores nutricionales" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Total" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Porcentaje de la energía" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g por kg peso" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Añadir una unidad de peso" @@ -3566,6 +3356,10 @@ msgstr "Añadir una unidad de peso" msgid "Edit a weight unit to ingredient connection" msgstr "Editar una conexión unidad de peso - ingrediente" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "¿Borrar?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4075,6 +3869,132 @@ msgstr "Borrado con éxito." msgid "Delete weight entry for the %s" msgstr "Eliminar la entrada de peso para el %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Algo ha pasado que no está permitido." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Algo ha sucedido que ha causadi un error." + +#~ msgid "Add new diary entry" +#~ msgstr "Añadir una entrada nueva" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Haga clic para agregar una entrada a su diario de nutrición de hoy. Puede " +#~ "registrar una comida como la definió o ingresar cualquier número de " +#~ "entradas personalizadas." + +#~ msgid "Add custom diary entry" +#~ msgstr "Añadir una entrada personalizada" + +#~ msgid "No nutrition plans." +#~ msgstr "No hay planes nutricionales." + +#~ msgid "request info" +#~ msgstr "solicitar información" + +#~ msgid "response info" +#~ msgstr "información de la respuesta" + +#~ msgid "Add nutrition plan" +#~ msgstr "Añadir plan nutricional" + +#~ msgid "Nutrition diary" +#~ msgstr "Diario nutricional" + +#~ msgid "Planned" +#~ msgstr "Planeado" + +#~ msgid "Logged" +#~ msgstr "Logueado" + +#~ msgid "Difference" +#~ msgstr "Diferencia" + +#~ msgid "Entries" +#~ msgstr "Entradas" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "no se encontraron resultados" + +#~ msgid "Your nutrition plans" +#~ msgstr "Tus planes nutricionales" + +#~ msgid "Contents" +#~ msgstr "Contenidos" + +#~ msgid "Log this meal" +#~ msgstr "Registrar esta comida" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Añadir ingrendiente a la comida" + +#~ msgid "No items for this meal." +#~ msgstr "No hay artículos para esta comida." + +#~ msgid "No meals for this plan." +#~ msgstr "No hay comidas para este plan." + +#~ msgid "Log this Plan" +#~ msgstr "Registrar este plan" + +#~ msgid "Add a new meal" +#~ msgstr "Añadir nueva comida" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Basado en la entrada de peso con fecha %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "oz por lb de peso" + +#~ msgid "View complete nutrition log" +#~ msgstr "Ver el registro completo de nutrición" + +#~ msgid "Goal" +#~ msgstr "Meta" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Ha seleccionado que este plan nutricional tiene una\n" +#~ " cantidad objetivo de calorías. Use la calculadora o " +#~ "introduzca el valor\n" +#~ " manualmente." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Si encuentras la lista de ingredientes demasiado corta, puedes activar la " +#~ "preferencia para mostrar también ingredientes en inglés." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Editar plan nutricional" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Hacer una copia de este plan nutricional" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Borrar plan nutricional" + +#~ msgid "Add new meal" +#~ msgstr "Añadir nueva comida" + +#~ msgid "Edit meal" +#~ msgstr "Editar comida" + +#~ msgid "Edit meal item" +#~ msgstr "Editar ítem de alimentación" + #~ msgid "Free license" #~ msgstr "Licencia libre" @@ -4089,9 +4009,6 @@ msgstr "Eliminar la entrada de peso para el %s" #~ msgstr "" #~ "%(name)s es demasiado similar al ejercicio existente \"%(exercise_name)s\"" -#~ msgid "Lower back" -#~ msgstr "Espalda baja" - #~ msgid "Add training day" #~ msgstr "Añadir día de entrenamiento" diff --git a/wger/locale/fa/LC_MESSAGES/django.po b/wger/locale/fa/LC_MESSAGES/django.po index 9bb853bf6..0cadfe3c7 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2022-02-15 09:56+0000\n" "Last-Translator: anyBlackSoul \n" "Language-Team: Persian \n" @@ -36,8 +36,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -54,59 +54,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "ویرایش" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "نمونه تمرینات" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "روز نمونه" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "یک روز نمونه دیگر" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "نمونه برنامه غذایی" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "تمرین نگه دارنده مکان شماره {0} برای برنامه" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "برنامه تمرینی جالب من" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "برنامه خالی" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "ورود" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "نام" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "نام خانوادگی" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -149,26 +148,26 @@ msgstr "ذخیره" msgid "Used for password resets and, optionally, email reminders." msgstr "استفاده شده برای بازیابی رمز عبور و به صورت اختیاری, یادآوری ایمیل" -#: core/forms.py:205 +#: core/forms.py:206 #, fuzzy #| msgid "This email is already used." msgid "This e-mail address is already in use." msgstr "این ایمیل قبلا استفاده شده است" -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "پسورد" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "لطفا رمز عبور فعلی خود را وارد کنید." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -183,41 +182,39 @@ msgstr "لطفا رمز عبور فعلی خود را وارد کنید." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "حذف" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "رمز نامعتبر" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "این فرم با ریکپچا امن شده است" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "ثبت" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "ارتباط" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "راه های ارتباطی با شما(ایمیل و ... )" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "نظر" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "چه میخواهید بگویید؟" @@ -250,7 +247,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "مخفف نام شما، e.g. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "پیوند" @@ -416,7 +413,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "مصرف کل کالری" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "واحد وزن" @@ -447,16 +444,16 @@ msgid "The sum of all hours has to be 24" msgstr "مجموع تمام ساعت ها باید 24 باشد" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -468,8 +465,8 @@ msgid "Forbidden!" msgstr "ممنوع" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "اتفاق غیر مجازی رخ داده است" +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -479,13 +476,20 @@ msgstr "صفحه ای یافت نشد" msgid "The page you requested does not exist." msgstr "این صفحه وجو ندارد" -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "اتفاقی موجب خطا شده است" +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -501,7 +505,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "بازگشت به \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "اشتراک" @@ -512,8 +516,10 @@ msgstr "" "نخواهد بود" #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Configuration" +msgid "Email verification" +msgstr "تنظیمات" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -571,9 +577,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -581,38 +587,7 @@ msgstr "" msgid "Close" msgstr "بستن" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "کیلو کالری" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -623,94 +598,37 @@ msgstr "" msgid "Workout" msgstr "تمرین" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "این تمرین بخشی از برنامه است:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "اضافه کردن گزارش جدید" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "تمرین یافت نشد" -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "اضافه کن" -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "برنامه غذایی" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "انرژی" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "پروتئین" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "کربوهیدارت ها" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "چربی" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "برنامه وجود ندارد" - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -719,12 +637,12 @@ msgstr "برنامه وجود ندارد" msgid "Weight" msgstr "وزن" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "وزن را وارد کنید" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "زبان ها" @@ -735,8 +653,8 @@ msgstr "چیزی یافت نشد!" #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -759,7 +677,7 @@ msgstr "اضافه کردن" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "امکانات" @@ -770,8 +688,8 @@ msgstr "لیست مجوز ها" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -789,8 +707,7 @@ msgstr "لیست مجوز ها" msgid "Nothing found" msgstr "چیزی یافت نشد" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -805,8 +722,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "انجام شده" @@ -838,152 +753,156 @@ msgstr "برنامه تمرین" msgid "Calendar" msgstr "ماشین حساب" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 #, fuzzy #| msgid "Workouts schedules" msgid "Workout templates" msgstr "برنامه تمرین" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "تمرینات" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercises" msgid "Exercise edit history" msgstr "تمرینات" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "مواد غذایی" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "بازنگری وزن " -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "درباره ما" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "" @@ -1035,14 +954,6 @@ msgstr "از شما برای استفاده از این سایت ممنونیم! msgid "The %(site_name)s team" msgstr "تیم %(site_name)s " -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "" @@ -1083,17 +994,17 @@ msgstr "" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "چند نمونه پر کنید" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "" @@ -1169,15 +1080,15 @@ msgstr "" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1190,24 +1101,25 @@ msgid "Add workout" msgstr "" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "" @@ -1230,7 +1142,7 @@ msgstr "" msgid "General impression" msgstr "" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1240,18 +1152,37 @@ msgstr "" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "اضافه کردن برنامه" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "انرژی" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "پروتئین" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "کربوهیدارت ها" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "چربی" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "کیلو کالری" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1261,110 +1192,110 @@ msgstr "اضافه کردن برنامه" msgid "Actions" msgstr "" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "تنظیمات" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "" @@ -1392,7 +1323,7 @@ msgstr "" msgid "Change password" msgstr "" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "" @@ -1408,7 +1339,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "" @@ -1422,7 +1353,7 @@ msgstr "" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "" @@ -1433,8 +1364,7 @@ msgstr "" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "" @@ -1448,31 +1378,31 @@ msgstr "" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " "do. Feel free to edit or delete them!" msgstr "" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "" @@ -1522,19 +1452,19 @@ msgstr "" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1552,8 +1482,8 @@ msgstr "" msgid "A comment about how to correctly do this exercise." msgstr "" -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "زبان" @@ -1691,8 +1621,8 @@ msgstr "امکانات" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "" @@ -1813,7 +1743,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "" @@ -2138,65 +2068,69 @@ msgid "Legs" msgstr "" #: i18n.tpl:22 -msgid "Max Reps" +msgid "Lower back" msgstr "" #: i18n.tpl:23 +msgid "Max Reps" +msgstr "" + +#: i18n.tpl:24 msgid "Miles" msgstr "مایل" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "دقیقه" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "دومین" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "" -#: i18n.tpl:34 +#: i18n.tpl:35 #, fuzzy #| msgid "Triceps brachii" msgid "Triceps" msgstr "سه سر بازو" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "تا حد ناتوانی" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2277,7 +2211,7 @@ msgstr "همچنین عناصر مورد نیاز را به انگلیسی نم #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "" @@ -2346,7 +2280,7 @@ msgid "The duration in weeks" msgstr "" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "" @@ -2401,7 +2335,7 @@ msgstr "" msgid "Sets" msgstr "" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "" @@ -2607,7 +2541,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "" @@ -2824,7 +2757,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2869,61 +2802,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2931,15 +2853,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -2956,35 +2878,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "برنامه غذایی" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3128,14 +3055,11 @@ msgstr "" msgid "Decline" msgstr "" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3147,8 +3071,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3166,131 +3088,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3375,37 +3172,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3416,6 +3213,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3870,6 +3671,18 @@ msgstr "" msgid "Delete weight entry for the %s" msgstr "" +#~ msgid "Something happened that is not allowed." +#~ msgstr "اتفاق غیر مجازی رخ داده است" + +#~ msgid "Something happened that caused an error." +#~ msgstr "اتفاقی موجب خطا شده است" + +#~ msgid "No nutrition plans." +#~ msgstr "برنامه وجود ندارد" + +#~ msgid "Add nutrition plan" +#~ msgstr "اضافه کردن برنامه" + #~ msgid "Ingredients" #~ msgstr "عناصر" diff --git a/wger/locale/fi/LC_MESSAGES/django.po b/wger/locale/fi/LC_MESSAGES/django.po index 257b9a650..e8f5f1b8f 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2022-08-31 10:16+0000\n" "Last-Translator: Juuso Haapanen \n" "Language-Team: Finnish \n" @@ -36,8 +36,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -54,59 +54,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Muokkaa" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Esimerkkiharjoitus" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Esimerkkipäivä" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Toinen esimerkkipäivä" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "esimerkkiravinto-ohjelma" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Minun hieno harjoitusohjelmani" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Tyhjä tilanvaraaja-aikataulu" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Kirjaudu sisään" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Etunimi" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Sukunimi" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -154,26 +153,26 @@ msgstr "" "Käytetään uuden salasanan hankkimiseen ja valinnaisesti " "sähköpostimuistutuksiin." -#: core/forms.py:205 +#: core/forms.py:206 #, fuzzy #| msgid "This email is already used." msgid "This e-mail address is already in use." msgstr "Tämä sähköpostiosoite on jo käytössä." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Salasana" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Anna nykyinen salasanasi." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -188,43 +187,41 @@ msgstr "Anna nykyinen salasanasi." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Poista" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Väärä salasana" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Lomake on suojattu reCAPTCHA:lla" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Rekisteröidy" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Yhteydenotto" -#: core/forms.py:306 +#: core/forms.py:307 #, fuzzy #| msgid "Some way of answering you (email, etc.)" msgid "Some way of answering you (e-mail, etc.)" msgstr "Jokin vastaustapa(sähköposti, etc.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Kommentti" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Mitä haluat sanoa?" @@ -254,7 +251,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Lyhenne" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Linkki" @@ -413,7 +410,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Syötävien kaloreiden määrä, sisältäen mahdolliset lisäkalorit" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Painoyksikkö" @@ -444,16 +441,16 @@ msgid "The sum of all hours has to be 24" msgstr "Tuntien summa tarvitsee olla 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -465,9 +462,8 @@ msgid "Forbidden!" msgstr "Kielletty!" #: core/templates/403.html:7 -#, fuzzy -msgid "Something happened that is not allowed." -msgstr "Jotakin kiellettyä tapahtui" +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -478,13 +474,20 @@ msgstr "Sivua ei löydy" msgid "The page you requested does not exist." msgstr "Hakemaasi sivua ei ole olemassa." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Tapahtui virhe" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Tapahtui jotakin, joka aiheutti virheen." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -500,7 +503,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Jaa" @@ -510,8 +513,10 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Oletko varma, että haluat poistaa tämän? Toimintoa ei voi perua." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Configuration" +msgid "Email verification" +msgstr "Asetukset" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -569,9 +574,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -579,38 +584,7 @@ msgstr "" msgid "Close" msgstr "" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -621,94 +595,37 @@ msgstr "" msgid "Workout" msgstr "" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "" -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "" -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "" - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -717,12 +634,12 @@ msgstr "" msgid "Weight" msgstr "" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Kielet" @@ -733,8 +650,8 @@ msgstr "Mitään ei löytynyt." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -757,7 +674,7 @@ msgstr "Lisää" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Asetukset" @@ -768,8 +685,8 @@ msgstr "" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -787,8 +704,7 @@ msgstr "" msgid "Nothing found" msgstr "" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -803,8 +719,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "" @@ -833,150 +747,154 @@ msgstr "" msgid "Calendar" msgstr "" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Harjoitukset" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercises" msgid "Exercise edit history" msgstr "Harjoitukset" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Painoindeksilaskuri" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Meistä" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "" @@ -1026,14 +944,6 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "edellinen" @@ -1074,17 +984,17 @@ msgstr "Toistot" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Käyttöehdot" @@ -1160,15 +1070,15 @@ msgstr "" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1181,24 +1091,25 @@ msgid "Add workout" msgstr "" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "" @@ -1221,7 +1132,7 @@ msgstr "" msgid "General impression" msgstr "" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1231,18 +1142,37 @@ msgstr "" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" msgstr "" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1252,110 +1182,110 @@ msgstr "" msgid "Actions" msgstr "" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Puhelin" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Osoite" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Asetukset" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "" @@ -1383,7 +1313,7 @@ msgstr "" msgid "Change password" msgstr "" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1399,7 +1329,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "" @@ -1413,7 +1343,7 @@ msgstr "" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Poistettu onnistuneesti" @@ -1424,8 +1354,7 @@ msgstr "Poistettu onnistuneesti" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Poista {0}?" @@ -1439,31 +1368,31 @@ msgstr "Poista {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Muokkaa {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " "do. Feel free to edit or delete them!" msgstr "" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Lepopäivä" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "" @@ -1513,19 +1442,19 @@ msgstr "" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1543,8 +1472,8 @@ msgstr "" msgid "A comment about how to correctly do this exercise." msgstr "" -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "" @@ -1680,8 +1609,8 @@ msgstr "Asetukset" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "" @@ -1802,7 +1731,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "" @@ -2121,65 +2050,69 @@ msgid "Legs" msgstr "Jalat" #: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 #, fuzzy #| msgid "Reps" msgid "Max Reps" msgstr "Toistot" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Leuanvetotanko" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Hartiat" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2260,7 +2193,7 @@ msgstr "Näytä raaka-aineet myös englanniksi" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "" @@ -2329,7 +2262,7 @@ msgid "The duration in weeks" msgstr "" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "" @@ -2384,7 +2317,7 @@ msgstr "Sarjojen määrä" msgid "Sets" msgstr "Sarjat" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "" @@ -2588,7 +2521,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Lataa PDF:nä" @@ -2803,7 +2735,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2848,61 +2780,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2910,15 +2831,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -2935,35 +2856,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3111,14 +3037,11 @@ msgstr "" msgid "Decline" msgstr "" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3130,8 +3053,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3149,131 +3070,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3358,37 +3154,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3399,6 +3195,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3853,6 +3653,16 @@ msgstr "" msgid "Delete weight entry for the %s" msgstr "" +#, fuzzy +#~ msgid "Something happened that is not allowed." +#~ msgstr "Jotakin kiellettyä tapahtui" + +#~ msgid "Something happened that caused an error." +#~ msgstr "Tapahtui jotakin, joka aiheutti virheen." + +#~ msgid "g" +#~ msgstr "g" + #~ msgid "Ingredients" #~ msgstr "Raaka-aineet" diff --git a/wger/locale/fr/LC_MESSAGES/django.po b/wger/locale/fr/LC_MESSAGES/django.po index 9fd3714aa..f13733540 100644 --- a/wger/locale/fr/LC_MESSAGES/django.po +++ b/wger/locale/fr/LC_MESSAGES/django.po @@ -21,16 +21,16 @@ msgid "" msgstr "" "Project-Id-Version: wger Workout Manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-06 11:42+0200\n" -"PO-Revision-Date: 2023-12-01 13:05+0000\n" -"Last-Translator: yoyomax80400 \n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" +"PO-Revision-Date: 2023-05-30 17:48+0000\n" +"Last-Translator: Célian \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 5.3-dev\n" +"X-Generator: Weblate 4.18-dev\n" #: config/models/gym_config.py:46 gym/templates/gym/list.html:53 msgid "Default gym" @@ -49,8 +49,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -67,57 +67,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Modifier" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Exemple de séance" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Exemple de jour" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Autre exemple de jour" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Exemple de plan nutritionnel" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Séance d'exemple n° {0} pour programmation" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Mon programme d’entraînement" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Programme vide de démonstration" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Se connecter" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Prénom" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Nom" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -163,24 +162,24 @@ msgstr "" "Utilisé pour réinitialiser votre mot de passe et, optionnellement, vous " "envoyer des rappels par courriel." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Cette adresse courriel est déjà utilisée." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Mot de passe" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Veuillez entrer votre mot de passe actuel." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -195,41 +194,39 @@ msgstr "Veuillez entrer votre mot de passe actuel." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Supprimer" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Mot de passe invalide" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Le formulaire est sécurisé avec reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "S’inscrire" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Contact" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Un moyen de vous répondre (courriel, etc.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Commentaire" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Que voulez-vous nous dire ?" @@ -261,7 +258,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Abbréviation, e.g. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Lien" @@ -430,7 +427,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Total des entrées caloriques, incluant les suppléments" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Unité de poids" @@ -462,16 +459,16 @@ msgid "The sum of all hours has to be 24" msgstr "La somme des heures doit être de 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -483,8 +480,8 @@ msgid "Forbidden!" msgstr "Interdit !" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Quelque-chose s'est produit, quelque-chose de non-autorisé." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -494,16 +491,28 @@ msgstr "Page introuvable" msgid "The page you requested does not exist." msgstr "La page demandée n'existe pas." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Une erreur est survenue" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Quelque-chose s'est passé et a causé un erreur." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 -#, python-format +#, fuzzy, python-format +#| msgid "" +#| "You are\n" +#| " browsing the site as the user \"%(current_user)s\", all actions are " +#| "performed on their data.\n" +#| " " msgid "" "You are\n" " browsing the site as the user \"%(current_user)s\", all " @@ -511,16 +520,16 @@ msgid "" " " msgstr "" "Vous êtes\n" -" en train de naviguer sur le site en tant qu’utilisateur « %(current_user)" -"s », toutes les actions sont effectuées sur ses données.\n" -" " +" en train de naviguer sur le site en tant qu’utilisateur « " +"%(current_user)s », toutes les actions sont effectuées sur ses données.\n" +" " #: core/templates/base.html:16 core/templates/base_wide.html:14 #, python-format msgid "Back to \"%(target)s\"" msgstr "Retour vers « %(target)s »" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Partager" @@ -529,7 +538,9 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Êtes-vous sûr·e de vouloir supprimer ceci ? C’est irréversible." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "Email vérifié" #: core/templates/email_verification/confirm_template.html:18 @@ -590,9 +601,9 @@ msgstr "" "Cliquer pour ajouter des journaux\n" "de poids à un jour d'entraînement dans votre séance :" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -600,41 +611,7 @@ msgstr "" msgid "Close" msgstr "Fermer" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Ajouter une nouvelle entrée de journal" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Cliquez pour ajouter une entrée à votre journal nutritionnel pour " -"aujourd'hui. Vous pouvez enregistrer un repas tel que vous l'avez défini ou " -"saisir un nombre quelconque d'entrées personnalisées." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Ajouter item personnalisé dans le journal" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -645,11 +622,11 @@ msgstr "Ajouter item personnalisé dans le journal" msgid "Workout" msgstr "Séance" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Cette séance fait partie d'un programme :" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -657,84 +634,27 @@ msgstr "" "L'entraînement en cours est sélectionné à partir de votre programme actif " "ou, si vous n'en avez pas, simplement par date." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Ajouter un journal" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Pas de séance trouvée." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "En ajouter une." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Plan de nutrition" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Énergie" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Protéines" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Glucides" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Lipides" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Aucun plan de nutrition." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -743,12 +663,12 @@ msgstr "Aucun plan de nutrition." msgid "Weight" msgstr "Poids" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Ajouter une entrée" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Langues" @@ -759,8 +679,8 @@ msgstr "Rien trouvé." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -783,7 +703,7 @@ msgstr "Ajouter" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Options" @@ -794,8 +714,8 @@ msgstr "Liste des licences" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -813,8 +733,7 @@ msgstr "Liste des licences" msgid "Nothing found" msgstr "Rien trouvé" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Informations légales" @@ -834,8 +753,6 @@ msgstr "" "autoriser l’accès externe." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Ça se fait ici" @@ -870,148 +787,154 @@ msgstr "Planifications d’entraînements" msgid "Calendar" msgstr "Calendrier" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Macronutriments" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galerie" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Modèles d'entraînement" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Vos modèles" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Modèles publics" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Exercices" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administration" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Historique d'édition d'exercice" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Équipement" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Muscles" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Catégories" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Nutrition" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Plans de nutrition" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Calculateur d’IMC" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Calculateur de calories quotidiennes" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Aperçu ingrédients" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Unité de poids des ingrédients" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ingrédients en attente d'examen" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Poids corporel" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Aperçu poids" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "À propos de ce logiciel" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "À propos de nous" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "API REST" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licence" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Documentation du développeur" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Récupérer le code" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Traduire" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Réinitialiser le mot de passe" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Mes préférences" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Se déconnecter" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licences" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Unités de répétition" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Unité de poids" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Liste des utilisateurs" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Activités" @@ -1068,14 +991,6 @@ msgstr "Merci d’utiliser notre site !" msgid "The %(site_name)s team" msgstr "L’équipe de %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "Demande d'info" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "informations sur la réponse" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "précédent" @@ -1116,19 +1031,19 @@ msgstr "Reps" msgid "RiR" msgstr "ReR" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Créer des entrées de démo" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Conditions d’utilisation" @@ -1215,15 +1130,15 @@ msgstr "Mot de passe oublié ?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "dernier %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1236,24 +1151,25 @@ msgid "Add workout" msgstr "Ajouter une séance" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Date" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Description" @@ -1276,7 +1192,7 @@ msgstr "Journal" msgid "General impression" msgstr "Impression générale" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1286,18 +1202,37 @@ msgstr "Notes" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Temps" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Ajouter un plan de nutrition" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Énergie" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Protéines" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Glucides" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Lipides" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1307,112 +1242,112 @@ msgstr "Ajouter un plan de nutrition" msgid "Actions" msgstr "Actions" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Désactiver l'utilisateur" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Activer l'utilisateur" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Réinitialiser le mot de passe utilisateur" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Rôles" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Confirmation de mot de passe réinitialisé" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Voulez-vous vraiment changer ce mot de passe utilisateur's ?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Non" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Oui" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Détails" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "N°" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Téléphone" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adresse" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Enregistré" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Dernière connexion" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Statut" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Actif" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inactifs" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Contrats" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Documents" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Télécharger" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Configuration" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Inclure dans un aperçu inactif" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Connectez-vous en tant que cet utilisateur" @@ -1440,7 +1375,7 @@ msgstr "Vous devez vérifier votre email pour contribuer aux exercices" msgid "Change password" msgstr "Changer le mot de passe" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1456,7 +1391,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1470,7 +1405,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Supprimé avec succès" @@ -1481,8 +1416,7 @@ msgstr "Supprimé avec succès" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Supprimer {0} ?" @@ -1496,12 +1430,12 @@ msgstr "Supprimer {0} ?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Modifier {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1512,19 +1446,19 @@ msgstr "" "vous puissiez mieux voir ce que ce site web peut faire. N’hésitez pas à les " "modifier ou à les supprimer !" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Jour de repos" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Remarques" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Envoyer" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Votrecommentaire a été envoyé avec succès. Merci !" @@ -1574,19 +1508,19 @@ msgstr "Activités" msgid "A verification email was sent to %(email)s" msgstr "Un email de vérification a été envoyé à %(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Catégorie" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Muscles primaires" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Muscles secondaires" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Variations" @@ -1604,8 +1538,8 @@ msgstr "Exercice" msgid "A comment about how to correctly do this exercise." msgstr "Un commentaire sur la meilleure manière de réaliser cet exercice." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Langue" @@ -1740,8 +1674,8 @@ msgstr "Action" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Utilisateur" @@ -1866,7 +1800,7 @@ msgstr "Type de contrat" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Quantité" @@ -2152,7 +2086,7 @@ msgstr "Mollets" #: i18n.tpl:10 msgid "Cardio" -msgstr "Cardio" +msgstr "" #: i18n.tpl:11 msgid "Chest" @@ -2187,8 +2121,10 @@ msgid "Kilometers" msgstr "kilomètres" #: i18n.tpl:19 +#, fuzzy +#| msgid "Kilometers" msgid "Kilometers Per Hour" -msgstr "Kilomètres par heure" +msgstr "kilomètres" #: i18n.tpl:20 msgid "Lats" @@ -2199,63 +2135,67 @@ msgid "Legs" msgstr "Jambes" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Bas du dos" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Reps max" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Miles" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" -msgstr "Miles par heure\"" +msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minutes" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" -msgstr "Plaques" +msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Barre de traction" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Quadriceps" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Répétitions" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "Barre Ez" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Secondes" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Épaules" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Médecine ball" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "Triceps" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Jusqu'à l'échec" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "aucun (poids du corps)" @@ -2334,14 +2274,16 @@ msgstr "" "ensemble." #: manager/forms.py:143 nutrition/forms.py:248 +#, fuzzy +#| msgid "Also use ingredients in English" msgid "Also search for names in English" -msgstr "Recherchez également des noms en anglais" +msgstr "Afficher les ingrédients en anglais" #: manager/forms.py:171 manager/forms.py:176 manager/models/log.py:64 #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Unité" @@ -2418,7 +2360,7 @@ msgid "The duration in weeks" msgstr "Durée en semaines" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Ordre" @@ -2476,7 +2418,7 @@ msgstr "Nombre de séries" msgid "Sets" msgstr "Séries" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Date de création" @@ -2603,6 +2545,12 @@ msgstr "" "les uns après les autres." #: manager/templates/schedule/overview.html:39 +#, fuzzy +#| msgid "" +#| "You can indicate how long you want to do each workout\n" +#| "before jumping to the next. It is also possible to create a loop, so you\n" +#| "always do the same workouts in succession, e.g. A > B > C > A > B > C and " +#| "so on." msgid "" "You can indicate how long you want to do each workout\n" " before jumping to the next. It is also possible to create a loop, so " @@ -2664,7 +2612,13 @@ msgid "Start schedule" msgstr "Démarrer le programme" #: manager/templates/schedule/view.html:188 -#, python-format +#, fuzzy, python-format +#| msgid "" +#| "%(weeks)s Week\n" +#| " " +#| msgid_plural "" +#| "%(weeks)s Weeks\n" +#| " " msgid "" "%(weeks)s Week\n" " " @@ -2673,10 +2627,10 @@ msgid_plural "" " " msgstr[0] "" "%(weeks)s semaine\n" -" " +" " msgstr[1] "" "%(weeks)s semaines\n" -" " +" " #: manager/templates/schedule/view.html:222 msgid "Adding workouts" @@ -2737,7 +2691,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Télécharger au format PDF" @@ -2978,7 +2931,7 @@ msgstr "Nouvelle impression sur votre séance d'entrainement pour le {0}" msgid "This will delete all weight logs for this day as well." msgstr "Ceci supprimera également tous les exercices de la catégorie." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Valeur" @@ -2989,12 +2942,16 @@ msgid "Height (in)" msgstr "Taille (cm)" #: nutrition/forms.py:117 +#, fuzzy +#| msgid "Weight log" msgid "Weight (kg)" -msgstr "\"Poids (kg)\"" +msgstr "Journal de pesée" #: nutrition/forms.py:118 +#, fuzzy +#| msgid "Weight log" msgid "Weight (lbs)" -msgstr "Poids (lbs)" +msgstr "Journal de pesée" #: nutrition/forms.py:129 msgid "Calculate" @@ -3021,61 +2978,50 @@ msgstr "" "entrez un nombre négatif)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Ingrédient" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "En kcal/100 g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "En g pour 100 g de produit" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Sucre contenu dans les glucides" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Teneur en acides gras saturés dans les acides gras" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Fibres" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Sodium" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Lien vers le produit" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Nom de la marque du produit" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3086,15 +3032,15 @@ msgstr "" "l’énergie fournie par les protéines, les glucides et les lipides " "({energy_calculated} kcal +/-{energy_approx} %)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "L’ingrédient a été ajouté avec succès à la base de données général" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Nouveau ingrédient soumis par un utilisateur" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "L’utilisateur {0} a soumis un nouvel ingrédient « {1} »." @@ -3111,19 +3057,24 @@ msgstr "Quantité en grammes" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Quantité, par exemple « 1 tasse » ou « 1/2 cuillère »" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Plan de nutrition" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Repas" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "Date et heure (Approx.)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Temps (approx.)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" @@ -3131,7 +3082,7 @@ msgstr "" "Donnez aux repas une description textuelle / un nom tel que \"petit-" "déjeuner\" ou \"après l'entraînement\"" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3139,11 +3090,11 @@ msgstr "" "Une description de l’objectif du régime, par exemple « Gain de masse » ou « " "Se préparer pour l’été »" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Utiliser les calories par jour" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3312,14 +3263,11 @@ msgstr "Accepter" msgid "Decline" msgstr "Refuser" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Macronutriments" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "kJ" @@ -3331,8 +3279,6 @@ msgid "n.A." msgstr "n.A." #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Autres" @@ -3350,137 +3296,6 @@ msgstr "Modifier l’ingrédient" msgid "Delete ingredient" msgstr "Supprimer l'ingrédient" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Journal de nutrition" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Prévu" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Connecté" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Différence" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Entrées" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "Rien n'a été trouvé" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Vos régimes" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Contenus" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Ajouter ce repas" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Ajouter un ingrédient au repas" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Aucun élément pour ce repas." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Pas de repas pour ce régime." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Ajouter ce plan" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Ajouter un nouveau repas" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Donnée nutritionnelle" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "Basé sur l'entrée de poids du %(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Total" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Pour cent de l'énergie" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g par kg de masse corporelle" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz par lb de corps" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Voir le journal de nutrition complet" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Objectif" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Vous avez sélectionné que ce plan nutritionnel a un\n" -" quantité cible de calories. Utilisez la calculatrice ou entrez " -"la valeur\n" -" vous-même." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Si vous trouvez la liste des ingrédients trop petite, vous pouvez activer la " -"préférence de montrer également les ingrédients en anglais." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Modifier le régime" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Faire une copie de ce régime" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Supprimer le régime" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Taux métabolique basal" @@ -3567,54 +3382,54 @@ msgstr "" #: nutrition/views/bmi.py:89 msgid "Please make sure your height is within the appropriate range." -msgstr "Veuillez vous assurer que votre taille est dans la plage appropriée." +msgstr "" #: nutrition/views/bmi.py:92 msgid "140 to 230" -msgstr "140 à 230" +msgstr "" #: nutrition/views/bmi.py:94 msgid "56 to 90" -msgstr "56 à 90" +msgstr "" #: nutrition/views/ingredient.py:165 msgid "Add a new ingredient" msgstr "Ajouter un nouvel ingrédient" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "L'ingrédient a été marqué avec succès comme rejeté" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Supprimer ?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Ajouter un nouveau repas" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Modifier le repas" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Modifier un élément du repas" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Plan de nutrition" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Plan de nutrition pour %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" "Il s'agit d'un régime vide, à quoi vous attendiez-vous sur le PDF?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Donnée nutritionnelle" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Total" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Pour cent de l'énergie" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g par kg de masse corporelle" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Ajouter une nouvelle unité de poids" @@ -3623,6 +3438,10 @@ msgstr "Ajouter une nouvelle unité de poids" msgid "Edit a weight unit to ingredient connection" msgstr "Modifier une unité de poids pour l’ingrédient" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Supprimer ?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3679,23 +3498,33 @@ msgid "Our goal" msgstr "Notre objectif" #: software/templates/about_us.html:53 +#, fuzzy +#| msgid "" +#| "The goal is to build an awesome\n" +#| "and flexible fitness manager, along with a comprehensive and complete " +#| "list of exercises and\n" +#| "ingredients, all released under a free license." msgid "" "The goal is to build an awesome\n" " and flexible fitness manager, along with a comprehensive and " "complete list of exercises and\n" " ingredients, all released under a free license." msgstr "" -"L'objectif est de créer un gestionnaire de fitness impressionnant et " -"flexible, ainsi qu’une liste exhaustive et complète d’exercices et d’" -"ingrédients, le tous publiés sous une licence libre." +"Le but est de construire un entraîneur de conditionnement physique " +"impressionnant et flexible, ainsi qu’une liste exhaustive et complète " +"d’exercices et d’ingrédients, tous publiés sous une licence libre." #: software/templates/features.html:11 +#, fuzzy +#| msgid "" +#| "wger Workout Manager is a free, open source web application that manages " +#| "your exercises and workouts. " msgid "" "wger Workout Manager is a free, open source web application that manages " "your exercises and workouts." msgstr "" -"Le gestionnaire d'entraînement wger est une application web gratuite et open " -"source qui gère vos exercices et entraînements" +"wger Workout Manager est une application web open source gratuit qui gère " +"vos exercices et séances d’entraînement. " #: software/templates/features.html:45 msgid "About" @@ -3703,38 +3532,40 @@ msgstr "À propos" #: software/templates/features.html:50 msgid "Mobile app" -msgstr "Application mobile" +msgstr "" #: software/templates/features.html:56 software/templates/features.html:312 msgid "Donate" -msgstr "Faire un don" +msgstr "" #: software/templates/features.html:61 msgid "Develop" -msgstr "Développer" +msgstr "" #: software/templates/features.html:66 software/templates/features.html:448 +#, fuzzy +#| msgid "Comment" msgid "Community" -msgstr "Communauté" +msgstr "Commentaire" #: software/templates/features.html:100 msgid "Track your
way to your
ideal body" -msgstr "Suivez votre
progressions vers votre
corps idéal" +msgstr "" #: software/templates/features.html:103 msgid "" "Join wger, the community-driven free and open-source fitness tracker" msgstr "" -"Rejoignez wger, le tracker de fitness gratuit et open source piloté " -"par la communauté" #: software/templates/features.html:113 +#, fuzzy +#| msgid "Get the code" msgid "Get Started" -msgstr "Commencer" +msgstr "Récupérer le code" #: software/templates/features.html:123 msgid "people
using wger" -msgstr "Personnes
utilisant wger" +msgstr "" #: software/templates/features.html:127 #, fuzzy @@ -4138,6 +3969,126 @@ msgstr "Supprimé avec succès." msgid "Delete weight entry for the %s" msgstr "Supprimer l’entrée de poids pour le %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Quelque-chose s'est produit, quelque-chose de non-autorisé." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Quelque-chose s'est passé et a causé un erreur." + +#~ msgid "Add new diary entry" +#~ msgstr "Ajouter une nouvelle entrée de journal" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Cliquez pour ajouter une entrée à votre journal nutritionnel pour " +#~ "aujourd'hui. Vous pouvez enregistrer un repas tel que vous l'avez défini " +#~ "ou saisir un nombre quelconque d'entrées personnalisées." + +#~ msgid "Add custom diary entry" +#~ msgstr "Ajouter item personnalisé dans le journal" + +#~ msgid "No nutrition plans." +#~ msgstr "Aucun plan de nutrition." + +#~ msgid "Add nutrition plan" +#~ msgstr "Ajouter un plan de nutrition" + +#~ msgid "Nutrition diary" +#~ msgstr "Journal de nutrition" + +#~ msgid "Planned" +#~ msgstr "Prévu" + +#~ msgid "Logged" +#~ msgstr "Connecté" + +#~ msgid "Difference" +#~ msgstr "Différence" + +#~ msgid "Entries" +#~ msgstr "Entrées" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "Rien n'a été trouvé" + +#~ msgid "Your nutrition plans" +#~ msgstr "Vos régimes" + +#~ msgid "Contents" +#~ msgstr "Contenus" + +#~ msgid "Log this meal" +#~ msgstr "Ajouter ce repas" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Ajouter un ingrédient au repas" + +#~ msgid "No items for this meal." +#~ msgstr "Aucun élément pour ce repas." + +#~ msgid "No meals for this plan." +#~ msgstr "Pas de repas pour ce régime." + +#~ msgid "Log this Plan" +#~ msgstr "Ajouter ce plan" + +#~ msgid "Add a new meal" +#~ msgstr "Ajouter un nouveau repas" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Basé sur l'entrée de poids du %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "oz par lb de corps" + +#~ msgid "View complete nutrition log" +#~ msgstr "Voir le journal de nutrition complet" + +#~ msgid "Goal" +#~ msgstr "Objectif" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Vous avez sélectionné que ce plan nutritionnel a un\n" +#~ " quantité cible de calories. Utilisez la calculatrice ou " +#~ "entrez la valeur\n" +#~ " vous-même." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Si vous trouvez la liste des ingrédients trop petite, vous pouvez activer " +#~ "la préférence de montrer également les ingrédients en anglais." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Modifier le régime" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Faire une copie de ce régime" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Supprimer le régime" + +#~ msgid "Add new meal" +#~ msgstr "Ajouter un nouveau repas" + +#~ msgid "Edit meal" +#~ msgstr "Modifier le repas" + +#~ msgid "Edit meal item" +#~ msgstr "Modifier un élément du repas" + #~ msgid "Free license" #~ msgstr "Licence libre" @@ -4152,9 +4103,6 @@ msgstr "Supprimer l’entrée de poids pour le %s" #~ msgstr "" #~ "%(name)s est trop similaire à l’exercice existant «%(exercise_name)s»" -#~ msgid "Lower back" -#~ msgstr "Bas du dos" - #~ msgid "Add training day" #~ msgstr "Ajouter un jour d’entrainement" diff --git a/wger/locale/he/LC_MESSAGES/django.po b/wger/locale/he/LC_MESSAGES/django.po index 023d4c61d..f4db87426 100644 --- a/wger/locale/he/LC_MESSAGES/django.po +++ b/wger/locale/he/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,8 +32,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -50,57 +50,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -142,24 +141,24 @@ msgstr "" msgid "Used for password resets and, optionally, email reminders." msgstr "" -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "" -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "" -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -174,41 +173,39 @@ msgstr "" #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "" @@ -238,7 +235,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "" @@ -392,7 +389,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "" @@ -419,16 +416,16 @@ msgid "The sum of all hours has to be 24" msgstr "" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -440,7 +437,7 @@ msgid "Forbidden!" msgstr "" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." +msgid "You are not allowed to acces this page" msgstr "" #: core/templates/404.html:4 @@ -451,12 +448,19 @@ msgstr "" msgid "The page you requested does not exist." msgstr "" -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 @@ -473,7 +477,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "" @@ -482,7 +486,7 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "" #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +msgid "Email verification" msgstr "" #: core/templates/email_verification/confirm_template.html:18 @@ -539,9 +543,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -549,38 +553,7 @@ msgstr "" msgid "Close" msgstr "" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -591,94 +564,37 @@ msgstr "" msgid "Workout" msgstr "" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "" -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "" -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "" - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -687,12 +603,12 @@ msgstr "" msgid "Weight" msgstr "" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "" @@ -703,8 +619,8 @@ msgstr "" #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -727,7 +643,7 @@ msgstr "" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "" @@ -738,8 +654,8 @@ msgstr "" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -757,8 +673,7 @@ msgstr "" msgid "Nothing found" msgstr "" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -773,8 +688,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "" @@ -803,148 +716,152 @@ msgstr "" msgid "Calendar" msgstr "" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "" @@ -994,14 +911,6 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "" @@ -1042,17 +951,17 @@ msgstr "" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "" @@ -1128,15 +1037,15 @@ msgstr "" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1149,24 +1058,25 @@ msgid "Add workout" msgstr "" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "" @@ -1189,7 +1099,7 @@ msgstr "" msgid "General impression" msgstr "" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1199,18 +1109,37 @@ msgstr "" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" msgstr "" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1220,110 +1149,110 @@ msgstr "" msgid "Actions" msgstr "" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "" @@ -1351,7 +1280,7 @@ msgstr "" msgid "Change password" msgstr "" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "" @@ -1367,7 +1296,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "" @@ -1381,7 +1310,7 @@ msgstr "" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "" @@ -1392,8 +1321,7 @@ msgstr "" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "" @@ -1407,31 +1335,31 @@ msgstr "" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " "do. Feel free to edit or delete them!" msgstr "" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "" @@ -1481,19 +1409,19 @@ msgstr "" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1511,8 +1439,8 @@ msgstr "" msgid "A comment about how to correctly do this exercise." msgstr "" -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "" @@ -1644,8 +1572,8 @@ msgstr "" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "" @@ -1766,7 +1694,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "" @@ -2085,63 +2013,67 @@ msgid "Legs" msgstr "" #: i18n.tpl:22 -msgid "Max Reps" +msgid "Lower back" msgstr "" #: i18n.tpl:23 -msgid "Miles" +msgid "Max Reps" msgstr "" #: i18n.tpl:24 -msgid "Miles Per Hour" +msgid "Miles" msgstr "" #: i18n.tpl:25 -msgid "Minutes" +msgid "Miles Per Hour" msgstr "" #: i18n.tpl:26 -msgid "Plates" +msgid "Minutes" msgstr "" #: i18n.tpl:27 -msgid "Pull-up bar" +msgid "Plates" msgstr "" #: i18n.tpl:28 +msgid "Pull-up bar" +msgstr "" + +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2220,7 +2152,7 @@ msgstr "" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "" @@ -2289,7 +2221,7 @@ msgid "The duration in weeks" msgstr "" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "" @@ -2344,7 +2276,7 @@ msgstr "" msgid "Sets" msgstr "" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "" @@ -2548,7 +2480,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "" @@ -2759,7 +2690,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2798,61 +2729,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2860,15 +2780,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -2885,35 +2805,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3057,14 +2982,11 @@ msgstr "" msgid "Decline" msgstr "" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3076,8 +2998,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3095,131 +3015,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3304,37 +3099,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3345,6 +3140,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " diff --git a/wger/locale/hi/LC_MESSAGES/django.po b/wger/locale/hi/LC_MESSAGES/django.po index f8476ecfb..9cac20881 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2022-10-05 20:25+0000\n" "Last-Translator: Ritish Bhardwaj \n" "Language-Team: Hindi \n" @@ -32,8 +32,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -50,57 +50,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -142,24 +141,24 @@ msgstr "" msgid "Used for password resets and, optionally, email reminders." msgstr "" -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "" -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "" -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -174,41 +173,39 @@ msgstr "" #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "मिटादे" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "" @@ -238,7 +235,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "" @@ -392,7 +389,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "" @@ -419,16 +416,16 @@ msgid "The sum of all hours has to be 24" msgstr "" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -440,7 +437,7 @@ msgid "Forbidden!" msgstr "" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." +msgid "You are not allowed to acces this page" msgstr "" #: core/templates/404.html:4 @@ -451,12 +448,19 @@ msgstr "" msgid "The page you requested does not exist." msgstr "" -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 @@ -473,7 +477,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "" @@ -482,7 +486,7 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "" #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +msgid "Email verification" msgstr "" #: core/templates/email_verification/confirm_template.html:18 @@ -539,9 +543,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -549,38 +553,7 @@ msgstr "" msgid "Close" msgstr "" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -591,94 +564,37 @@ msgstr "" msgid "Workout" msgstr "" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "" -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "एक नया जोड़ें |" -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "" - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -687,12 +603,12 @@ msgstr "" msgid "Weight" msgstr "" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "भाषाएँ" @@ -703,8 +619,8 @@ msgstr "कुछ नहीं मिला" #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -727,7 +643,7 @@ msgstr "जोड़ें" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "" @@ -738,8 +654,8 @@ msgstr "" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -757,8 +673,7 @@ msgstr "" msgid "Nothing found" msgstr "" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -773,8 +688,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "" @@ -803,150 +716,154 @@ msgstr "" msgid "Calendar" msgstr "" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "व्यायाम" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercises" msgid "Exercise edit history" msgstr "व्यायाम" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "" @@ -996,14 +913,6 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "" @@ -1044,17 +953,17 @@ msgstr "" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "" @@ -1130,15 +1039,15 @@ msgstr "" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1151,24 +1060,25 @@ msgid "Add workout" msgstr "" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "" @@ -1191,7 +1101,7 @@ msgstr "" msgid "General impression" msgstr "" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1201,18 +1111,37 @@ msgstr "" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" msgstr "" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1222,110 +1151,110 @@ msgstr "" msgid "Actions" msgstr "" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "" @@ -1353,7 +1282,7 @@ msgstr "" msgid "Change password" msgstr "" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "" @@ -1369,7 +1298,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "" @@ -1383,7 +1312,7 @@ msgstr "" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "" @@ -1394,8 +1323,7 @@ msgstr "" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "" @@ -1409,31 +1337,31 @@ msgstr "" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " "do. Feel free to edit or delete them!" msgstr "" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "" @@ -1483,19 +1411,19 @@ msgstr "" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1513,8 +1441,8 @@ msgstr "" msgid "A comment about how to correctly do this exercise." msgstr "" -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "" @@ -1646,8 +1574,8 @@ msgstr "" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "" @@ -1768,7 +1696,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "" @@ -2087,63 +2015,67 @@ msgid "Legs" msgstr "" #: i18n.tpl:22 -msgid "Max Reps" +msgid "Lower back" msgstr "" #: i18n.tpl:23 -msgid "Miles" +msgid "Max Reps" msgstr "" #: i18n.tpl:24 -msgid "Miles Per Hour" +msgid "Miles" msgstr "" #: i18n.tpl:25 -msgid "Minutes" +msgid "Miles Per Hour" msgstr "" #: i18n.tpl:26 -msgid "Plates" +msgid "Minutes" msgstr "" #: i18n.tpl:27 -msgid "Pull-up bar" +msgid "Plates" msgstr "" #: i18n.tpl:28 +msgid "Pull-up bar" +msgstr "" + +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2222,7 +2154,7 @@ msgstr "" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "" @@ -2291,7 +2223,7 @@ msgid "The duration in weeks" msgstr "" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "" @@ -2346,7 +2278,7 @@ msgstr "" msgid "Sets" msgstr "" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "" @@ -2550,7 +2482,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "" @@ -2761,7 +2692,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2800,61 +2731,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2862,15 +2782,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -2887,35 +2807,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3059,14 +2984,11 @@ msgstr "" msgid "Decline" msgstr "" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3078,8 +3000,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3097,131 +3017,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3306,37 +3101,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3347,6 +3142,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " diff --git a/wger/locale/hr/LC_MESSAGES/django.po b/wger/locale/hr/LC_MESSAGES/django.po index 6f8116990..3160032b3 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: 2023-06-26 15:52+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-10-20 04:16+0000\n" "Last-Translator: Milo Ivir \n" "Language-Team: Croatian \n" @@ -36,8 +36,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -54,7 +54,6 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Uredi" @@ -88,23 +87,23 @@ msgstr "Moj raspored treninga" msgid "Empty placeholder schedule" msgstr "Prazan primjer rasporeda" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Prijava" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Ime" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Prezime" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -148,24 +147,24 @@ 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:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Ova se e-mail adresa već koristi." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Lozinka" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Upiši svoju aktualnu lozinku." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -180,41 +179,39 @@ msgstr "Upiši svoju aktualnu lozinku." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Izbriši" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Neispravna lozinka" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Obrazac je zaštićen pomoću reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Registracija" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Kontakt" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Neki način slanja odgovora (e-mail, itd.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Komentar" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Što želiš reći?" @@ -246,7 +243,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Kratko ime, npr. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:209 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Poveznica" @@ -410,7 +407,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Ukupni dnevni unos kalorija, uključujući npr. višak" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Jedinica težine" @@ -440,16 +437,16 @@ msgid "The sum of all hours has to be 24" msgstr "Zbroj svih sati mora biti 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:120 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -461,8 +458,8 @@ msgid "Forbidden!" msgstr "Zabranjeno!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Dogodilo se nešto što nije dozvoljeno." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -472,13 +469,20 @@ msgstr "Stranica nije pronađena" msgid "The page you requested does not exist." msgstr "Stranica koju tražiš ne postoji." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Dogodila se greška" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Nešto se dogodilo što je prouzročilo grešku." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -498,7 +502,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Natrag na „%(target)s”" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Dijeli" @@ -507,7 +511,9 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Stvarno želiš ovo izbrisati? Ova je nepovratna radnja." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "E-mail adresa ovjerena" #: core/templates/email_verification/confirm_template.html:18 @@ -519,6 +525,40 @@ msgstr "%(username)s, tvoja e-mail adresa je ovjerena" msgid "Error, invalid verification token" msgstr "Greška, neispavni token ovjere" +#: core/templates/email_verification/email_body_html.tpl:6 +#, fuzzy +#| msgid "Configuration" +msgid "Email Confirmation" +msgstr "Konfiguracija" + +#: core/templates/email_verification/email_body_html.tpl:9 +#: core/templates/email_verification/email_body_txt.tpl:3 +#, fuzzy, python-format +#| msgid "Calendar for %(username)s" +msgid "You are almost there, %(username)s!" +msgstr "Kalendar za %(username)s" + +#: core/templates/email_verification/email_body_html.tpl:11 +#, python-format +msgid "Please click here to confirm your email" +msgstr "" + +#: core/templates/email_verification/email_body_html.tpl:12 +#: core/templates/email_verification/email_body_txt.tpl:5 +#, python-format +msgid "The token expires on %(time)s" +msgstr "" + +#: core/templates/email_verification/email_body_html.tpl:14 +#: core/templates/email_verification/email_body_txt.tpl:8 +msgid "the wger Team" +msgstr "" + +#: core/templates/email_verification/email_body_txt.tpl:4 +#, python-format +msgid "Please click the following link to confirm your email: %(link)s" +msgstr "" + #: core/templates/index.html:4 software/templates/features.html:425 msgid "Dashboard" msgstr "Kontrolna ploča" @@ -535,9 +575,9 @@ msgstr "" "Pritisni za dodavanje zapisa težine danu treniranja\n" " u tvom trenutačnom treningu:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -545,40 +585,7 @@ msgstr "" msgid "Close" msgstr "Zatvori" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Dodaj novi unos u dnevnik" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Pritisni za dodavanje unosa u svoj dnevnik prehrane za danas. Možeš zapisati " -"obrok kako si ga definirao/la ili unijeti bilo koji broj prilagođenih unosa." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Dodaj prilagođeni unos u dnevnik" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -589,11 +596,11 @@ msgstr "Dodaj prilagođeni unos u dnevnik" msgid "Workout" msgstr "Trening" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Ovaj je trening dio rasporeda:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -601,84 +608,27 @@ msgstr "" "Trenutačni trening odabire se iz tvog aktivnog rasporeda ili ako ga nemaš, " "jednostavno po datumu." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Dodaj novi zapis" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Nije pronađen nijedan trening." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Dodaj jedan sada." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Plan prehrane" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energija" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:132 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Proteini" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:140 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Ugljikohidrati" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:158 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Mast" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Nema planova prehrane." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -687,12 +637,12 @@ msgstr "Nema planova prehrane." msgid "Weight" msgstr "Težina" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Dodaj unos težine" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Jezici" @@ -703,8 +653,8 @@ msgstr "Ništa nije pronađeno." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -727,7 +677,7 @@ msgstr "Dodaj" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Opcije" @@ -738,8 +688,8 @@ msgstr "Popis licenca" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -757,8 +707,7 @@ msgstr "Popis licenca" msgid "Nothing found" msgstr "Ništa nije pronađeno" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Impresum" @@ -775,8 +724,6 @@ msgstr "" " eksterni pristup." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "To se obavlja ovdje" @@ -807,148 +754,154 @@ msgstr "Rasporedi treninga" msgid "Calendar" msgstr "Kalendar" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Makronutrijenti" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galerija" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Predlošci treninga" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Tvoji predlošci" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Javni predlošci" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Vježbe" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administracija" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Povijest uređivanja vježbe" -#: core/templates/navigation.html:100 exercises/models/base.py:101 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Oprema" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Mišići" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Kategorije" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Prehrana" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Planovi prehrane" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Kalkulator indeksa tjelesne mase" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Kalkulator dnevnih kalorija" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Pregled sastojaka" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Jedinica težine sastojka" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Još nepregledani sastojci" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Tjelesna težina" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Pregled težine" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "O ovom softveru" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "O nama" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licenca" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Dokumentacija za programere" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Nabavi kôd" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Prevodi" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Obnovi lozinku" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Moje postavke" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Odjava" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licence" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Jedinice ponavljanja" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Jedinice težine" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Popis korisnika" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Teretane" @@ -1042,17 +995,18 @@ msgstr "Ponavljanja" msgid "RiR" msgstr "PUR" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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." +msgstr "" +"Koristiš račun gosta, upisani podaci će se izbrisati nakon tjedan dana." -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Stvori neke demo snimke" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Uvjeti usluge" @@ -1137,15 +1091,15 @@ msgstr "Zaboravio/la si lozinku?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "zadnjih %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1158,24 +1112,25 @@ msgid "Add workout" msgstr "Dodaj trening" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:116 exercises/models/base.py:121 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:96 nutrition/models/ingredient.py:102 -#: nutrition/models/ingredient.py:217 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Datum" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Opis" @@ -1198,7 +1153,7 @@ msgstr "Zapis" msgid "General impression" msgstr "Opći dojam" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1208,18 +1163,37 @@ msgstr "Bilješke" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Vrijeme" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Dodaj plan prehrane" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energija" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Proteini" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Ugljikohidrati" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Mast" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1229,110 +1203,110 @@ msgstr "Dodaj plan prehrane" msgid "Actions" msgstr "Radnje" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Deaktiviraj korisnika" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Aktiviraj korisnika" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Obnovi korisničku lozinku" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Uloge" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Potvrda obnavljanja lozinke" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Stvarno želiš promijeniti lozinku ovog korisnika?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Ne" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Da" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Detalji" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Br." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adresa" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Registriran" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Zadnja prijava" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Stanje" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Aktivno" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Neaktivno" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Ugovori" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Dokumenti" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Preuzimanje" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 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:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Uključi u neaktivni pregled" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Prijavi se kao ovaj korisnik" @@ -1360,7 +1334,7 @@ msgstr "Za dodavanje vježbi moraš ovjeriti tvoju e-mail adresu" msgid "Change password" msgstr "Promjeni lozinku" -#: core/templatetags/wger_extras.py:204 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1376,7 +1350,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "funta" @@ -1390,7 +1364,7 @@ msgstr "unca" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Uspješno izbrisano" @@ -1401,8 +1375,7 @@ msgstr "Uspješno izbrisano" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Izbrisati {0}?" @@ -1416,12 +1389,12 @@ msgstr "Izbrisati {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Uredi {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1431,19 +1404,19 @@ msgstr "" "težinu i unose za planove prehrane za bolji prikaz funkcionalnosti ove " "stranice. Slobodno ih uredi ili izbriši!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Dan odmora" -#: core/views/misc.py:183 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Povratne informacije" -#: core/views/misc.py:202 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Pošalji" -#: core/views/misc.py:210 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Tvoje povratne informacije su uspješno poslane. Hvala!" @@ -1493,7 +1466,7 @@ msgstr "Teretana" msgid "A verification email was sent to %(email)s" msgstr "E-mail za ovjeru je poslan na %(email)s" -#: exercises/models/base.py:80 nutrition/models/ingredient.py:231 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Kategorija" @@ -1523,8 +1496,8 @@ msgstr "Vježba" msgid "A comment about how to correctly do this exercise." msgstr "Komentar o tome kako pravilno izvesti ovu vježbu." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:90 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Jezik" @@ -1572,8 +1545,8 @@ msgid "" "(will be shown e.g. in the search). The first image is automatically marked " "by the system." msgstr "" -"Označi polje ako želiš ovu sliku postaviti kao glavnu sliku za vježbu (" -"prikazat će se npr. u pretrazi). Sustav automatski označava prvu sliku." +"Označi polje ako želiš ovu sliku postaviti kao glavnu sliku za vježbu " +"(prikazat će se npr. u pretrazi). Sustav automatski označava prvu sliku." #: exercises/models/image.py:98 msgid "The art style of your image" @@ -1658,8 +1631,8 @@ msgstr "Radnja" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Korisnik" @@ -1782,7 +1755,7 @@ msgstr "Vrsta ugovora" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Iznos" @@ -2025,6 +1998,157 @@ msgstr "Dodaj korisnika teretani" msgid "Edit gym" msgstr "Uredi teretanu" +#: i18n.tpl:2 +msgid "Abs" +msgstr "" + +#: i18n.tpl:3 +msgid "Arms" +msgstr "" + +#: i18n.tpl:4 +msgid "Back" +msgstr "" + +#: i18n.tpl:5 +msgid "Barbell" +msgstr "" + +#: i18n.tpl:6 +msgid "Bench" +msgstr "" + +#: i18n.tpl:7 +msgid "Biceps" +msgstr "" + +#: i18n.tpl:8 +#, fuzzy +#| msgid "Body weight" +msgid "Body Weight" +msgstr "Tjelesna težina" + +#: i18n.tpl:9 +msgid "Calves" +msgstr "" + +#: i18n.tpl:10 +msgid "Cardio" +msgstr "" + +#: i18n.tpl:11 +msgid "Chest" +msgstr "" + +#: i18n.tpl:12 +msgid "Dumbbell" +msgstr "" + +#: i18n.tpl:13 +msgid "Glutes" +msgstr "" + +#: i18n.tpl:14 +#, fuzzy +#| msgid "Gym manager" +msgid "Gym mat" +msgstr "Menadžer teretane" + +#: i18n.tpl:15 +msgid "Hamstrings" +msgstr "" + +#: i18n.tpl:16 +msgid "Incline bench" +msgstr "" + +#: i18n.tpl:17 +msgid "Kettlebell" +msgstr "" + +#: i18n.tpl:18 +msgid "Kilometers" +msgstr "" + +#: i18n.tpl:19 +msgid "Kilometers Per Hour" +msgstr "" + +#: i18n.tpl:20 +msgid "Lats" +msgstr "" + +#: i18n.tpl:21 +msgid "Legs" +msgstr "" + +#: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 +#, fuzzy +#| msgid "Reps" +msgid "Max Reps" +msgstr "Ponavljanja" + +#: i18n.tpl:24 +msgid "Miles" +msgstr "" + +#: i18n.tpl:25 +msgid "Miles Per Hour" +msgstr "" + +#: i18n.tpl:26 +msgid "Minutes" +msgstr "" + +#: i18n.tpl:27 +msgid "Plates" +msgstr "" + +#: i18n.tpl:28 +msgid "Pull-up bar" +msgstr "" + +#: i18n.tpl:29 +msgid "Quads" +msgstr "" + +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 +#: manager/templates/set/add.html:54 +msgid "Repetitions" +msgstr "Ponavljanja" + +#: i18n.tpl:31 +msgid "SZ-Bar" +msgstr "" + +#: i18n.tpl:32 +msgid "Seconds" +msgstr "" + +#: i18n.tpl:33 +msgid "Shoulders" +msgstr "" + +#: i18n.tpl:34 +msgid "Swiss Ball" +msgstr "" + +#: i18n.tpl:35 +msgid "Triceps" +msgstr "" + +#: i18n.tpl:36 +msgid "Until Failure" +msgstr "" + +#: i18n.tpl:39 +msgid "none (bodyweight exercise)" +msgstr "" + #: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32 msgctxt "As in \"email subject\"" msgid "Subject" @@ -2105,16 +2229,11 @@ msgstr "Također traži imena na engleskom jeziku" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Jedinica" -#: manager/forms.py:185 manager/models/log.py:73 -#: manager/templates/set/add.html:54 -msgid "Repetitions" -msgstr "Ponavljanja" - #: manager/forms.py:282 msgid "Type" msgstr "Vrsta" @@ -2186,7 +2305,7 @@ msgid "The duration in weeks" msgstr "Trajanje u tjednima" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Redoslijed" @@ -2241,7 +2360,7 @@ msgstr "Broj setova" msgid "Sets" msgstr "Setovi" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Datum stvaranja" @@ -2482,7 +2601,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Preuzmi kao PDF" @@ -2519,6 +2637,50 @@ msgstr "Uredi set" msgid "Update" msgstr "Aktualiziraj" +#: manager/templates/workout/email_reminder.tpl:3 +#, python-format +msgid "Your current workout '%(workout)s' expired %(days)s days ago." +msgstr "" + +#: manager/templates/workout/email_reminder.tpl:5 +#, python-format +msgid "Your current workout '%(workout)s' is about to expire in %(days)s days." +msgstr "" + +#: manager/templates/workout/email_reminder.tpl:9 +msgid "" +"You will regularly receive such reminders till you add a new workout.\n" +"Alternatively you can add workouts to a loop schedule, such schedules\n" +"never produce reminders." +msgstr "" + +#: manager/templates/workout/email_reminder.tpl:12 +#: manager/templates/workout/email_weight_reminder.tpl:9 +msgid "" +"If you don't want to ever receive email reminders, deactivate the\n" +"option in your settings." +msgstr "" + +#: manager/templates/workout/email_reminder.tpl:15 +#: manager/templates/workout/email_weight_reminder.tpl:12 +#: nutrition/templates/ingredient/email_new.tpl:9 +#, fuzzy, python-format +#| msgid "The %(site_name)s team" +msgid "The %(site)s team" +msgstr "%(site_name)s tim" + +#: manager/templates/workout/email_weight_reminder.tpl:3 +#, python-format +msgid "" +"Your last weight entry is from %(date)s (%(days)s days ago).\n" +"Please click the link to access the application and enter a new one." +msgstr "" + +#: manager/templates/workout/email_weight_reminder.tpl:8 +msgid "" +"You will regularly receive such reminders till you enter your current weight." +msgstr "" + #: manager/templates/workout/log.html:10 manager/templates/workout/log.html:11 msgid "Weight log" msgstr "Zapis težine" @@ -2663,7 +2825,7 @@ msgstr "Novi dojam treninga za {0}" msgid "This will delete all weight logs for this day as well." msgstr "Ovo će tekođer izbrisati sve zapise težine za ovaj dan." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Vrijednost" @@ -2704,61 +2866,50 @@ msgstr "" "broj)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Sastojak" -#: nutrition/models/ingredient.py:126 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "U kcal po 100 g" -#: nutrition/models/ingredient.py:133 nutrition/models/ingredient.py:141 -#: nutrition/models/ingredient.py:151 nutrition/models/ingredient.py:159 -#: nutrition/models/ingredient.py:169 nutrition/models/ingredient.py:179 -#: nutrition/models/ingredient.py:189 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "U g po 100 g proizvoda" -#: nutrition/models/ingredient.py:150 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Količina šećera u ugljikohidratima" -#: nutrition/models/ingredient.py:168 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Količina zasićene masti u mastima" -#: nutrition/models/ingredient.py:178 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Balastne tvari" -#: nutrition/models/ingredient.py:188 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Natrij" -#: nutrition/models/ingredient.py:210 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Poveznica za proizvod" -#: nutrition/models/ingredient.py:239 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Ime proizvoda" -#: nutrition/models/ingredient.py:299 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2766,18 +2917,18 @@ msgid "" "{energy_approx}%)" msgstr "" "Ukupna energija ({energy} kcal) nije približni zbroj energije koju daju " -"proteini, ugljikohidrati i masti ({energy_calculated} kcal +/−{energy_approx}" -" %)" +"proteini, ugljikohidrati i masti ({energy_calculated} kcal +/" +"−{energy_approx} %)" -#: nutrition/models/ingredient.py:381 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Sastojak je uspješno dodan u opću bazu podataka" -#: nutrition/models/ingredient.py:405 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Novi korisnik je poslao sastojak" -#: nutrition/models/ingredient.py:407 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Korisnik {0} je poslao novi sastojak „{1}”." @@ -2794,37 +2945,42 @@ msgstr "Količina u gramima" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Jedinica količine, npr. „1 šalica” ili „1/2 žlice”" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Plan prehrane" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Obrok" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "Datum i vrijeme (otprilike)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Vrijeme (otprilike)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" "Obrocima zadaj tekstualni opis/ime kao što je „doručak” ili „nakon treninga”" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" "Opis cilja plana, npr. „Povećanje tjelesne mase” ili „Priprema za ljeto”" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Koristi dnevne kalorije" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -2887,6 +3043,28 @@ msgstr "" "Zadnji upisani podaci u odjeljku težine će se automatski koristiti.\n" "Inače će se ovdje upisana težina spremiti u novi unos." +#: nutrition/templates/ingredient/email_new.tpl:1 +#, fuzzy, python-format +#| msgid "Ingredient was successfully added to the general database" +msgid "" +"Your ingredient '%(ingredient)s' was successfully added to the general\n" +"database." +msgstr "Sastojak je uspješno dodan u opću bazu podataka" + +#: nutrition/templates/ingredient/email_new.tpl:4 +msgid "" +"It is now available on the ingredient overview and can be\n" +"added to nutrition plans. You can access it on this address:" +msgstr "" + +#: nutrition/templates/ingredient/email_new.tpl:8 +#, fuzzy +#| msgid "" +#| "Thank you for submitting an ingredient. This is much\n" +#| "appreciated!" +msgid "Thank you for contributing and making this site better!" +msgstr "Puno ti hvala na slanju sastojka!" + #: nutrition/templates/ingredient/form.html:4 msgid "Submitting an ingredient" msgstr "Slanje sastojaka" @@ -2965,14 +3143,11 @@ msgstr "Prihvati" msgid "Decline" msgstr "Odbij" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Makronutrijenti" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "kJ" @@ -2984,8 +3159,6 @@ msgid "n.A." msgstr "--" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Drugi" @@ -3003,137 +3176,6 @@ msgstr "Uredi sastojak" msgid "Delete ingredient" msgstr "Izbriši sastojak" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Dnevnik prehrane" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Planirano" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Zapisano" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Razlika" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Unosi" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "ništa nije pronađeno" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Tvoji planovi prehrane" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Sadržaj" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Zapiši ovaj obrok" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Dodaj sastojak obroku" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Nema elemenata za ovaj obrok." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Nema obroka za ovaj plan." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Zapiši ovaj plan" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Dodaj novi obrok" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Podaci prehrane" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "Na osnovi unosa težine od %(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Ukupno" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Postotak energije" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g po tjelesnim kg" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "unce po tjelesnim funtama" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Prikaži potpuni zapis prehrene" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Cilj" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Odabrao/la si da ovaj plan prehrane ima\n" -" ciljanu količinu kalorija. Koristi kalkulator ili upiši " -"vrijednost\n" -" ručno." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Ako smatraš da je popis sastojaka prekratak, aktiviraj postavku za prikaz " -"sastojaka na engleskom jeziku." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Uredi plan prehrane" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Izradi kopiju ovog plana prehrane" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Izbriši plan prehrane" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Osnovna potreba metabolizma" @@ -3234,39 +3276,39 @@ msgstr "56 do 90" msgid "Add a new ingredient" msgstr "Dodaj novi sastojak" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Sastojak je uspješno označen kao odbijen" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Izbrisati?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Dodaj novi obrok" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Uredi obrok" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Uredi sastojak obroka" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Plan prehrane" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Plan prehrane za %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Ovo je prazan plan. Što si očekivao/la u PDF-u?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Podaci prehrane" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Ukupno" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Postotak energije" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g po tjelesnim kg" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Dodaj novu jedinicu težine" @@ -3275,6 +3317,10 @@ msgstr "Dodaj novu jedinicu težine" msgid "Edit a weight unit to ingredient connection" msgstr "Uredi vezu između jedinice težine i sastojka" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Izbrisati?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3309,7 +3355,8 @@ msgstr "Pošalji pozdrav!" #: software/templates/about_us.html:34 msgid "If you want to chat with us, hop on the Discord server and get in touch" -msgstr "Ako želiš s nama razgovarati, skoči na Discord server i kontaktiraj nas" +msgstr "" +"Ako želiš s nama razgovarati, skoči na Discord server i kontaktiraj nas" #: software/templates/about_us.html:39 software/templates/features.html:496 msgid "Translation" @@ -3774,3 +3821,123 @@ msgstr "Uspješno izbrisano." #, python-format msgid "Delete weight entry for the %s" msgstr "Izbriši unos težine za %s" + +#~ msgid "Something happened that is not allowed." +#~ msgstr "Dogodilo se nešto što nije dozvoljeno." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Nešto se dogodilo što je prouzročilo grešku." + +#~ msgid "Add new diary entry" +#~ msgstr "Dodaj novi unos u dnevnik" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Pritisni za dodavanje unosa u svoj dnevnik prehrane za danas. Možeš " +#~ "zapisati obrok kako si ga definirao/la ili unijeti bilo koji broj " +#~ "prilagođenih unosa." + +#~ msgid "Add custom diary entry" +#~ msgstr "Dodaj prilagođeni unos u dnevnik" + +#~ msgid "No nutrition plans." +#~ msgstr "Nema planova prehrane." + +#~ msgid "Add nutrition plan" +#~ msgstr "Dodaj plan prehrane" + +#~ msgid "Nutrition diary" +#~ msgstr "Dnevnik prehrane" + +#~ msgid "Planned" +#~ msgstr "Planirano" + +#~ msgid "Logged" +#~ msgstr "Zapisano" + +#~ msgid "Difference" +#~ msgstr "Razlika" + +#~ msgid "Entries" +#~ msgstr "Unosi" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "ništa nije pronađeno" + +#~ msgid "Your nutrition plans" +#~ msgstr "Tvoji planovi prehrane" + +#~ msgid "Contents" +#~ msgstr "Sadržaj" + +#~ msgid "Log this meal" +#~ msgstr "Zapiši ovaj obrok" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Dodaj sastojak obroku" + +#~ msgid "No items for this meal." +#~ msgstr "Nema elemenata za ovaj obrok." + +#~ msgid "No meals for this plan." +#~ msgstr "Nema obroka za ovaj plan." + +#~ msgid "Log this Plan" +#~ msgstr "Zapiši ovaj plan" + +#~ msgid "Add a new meal" +#~ msgstr "Dodaj novi obrok" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Na osnovi unosa težine od %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "unce po tjelesnim funtama" + +#~ msgid "View complete nutrition log" +#~ msgstr "Prikaži potpuni zapis prehrene" + +#~ msgid "Goal" +#~ msgstr "Cilj" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Odabrao/la si da ovaj plan prehrane ima\n" +#~ " ciljanu količinu kalorija. Koristi kalkulator ili upiši " +#~ "vrijednost\n" +#~ " ručno." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Ako smatraš da je popis sastojaka prekratak, aktiviraj postavku za prikaz " +#~ "sastojaka na engleskom jeziku." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Uredi plan prehrane" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Izradi kopiju ovog plana prehrane" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Izbriši plan prehrane" + +#~ msgid "Add new meal" +#~ msgstr "Dodaj novi obrok" + +#~ msgid "Edit meal" +#~ msgstr "Uredi obrok" + +#~ msgid "Edit meal item" +#~ msgstr "Uredi sastojak obroka" diff --git a/wger/locale/hu/LC_MESSAGES/django.po b/wger/locale/hu/LC_MESSAGES/django.po index ee3d3397c..52fc2a299 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2021-04-15 07:27+0000\n" "Last-Translator: László Mócsy \n" "Language-Team: Hungarian \n" @@ -34,8 +34,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -52,59 +52,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Módosítás" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Minta edzés" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Minta nap" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Egy másik minta nap" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "Minta tápanyagterv" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Helyfoglaló edzés a(z) {0} számú ütemtervhez" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Az én király edzés ütemtervem" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Üres helyfoglaló ütemterv" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Bejelentkezés" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Keresztnév" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Vezetéknév" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -148,24 +147,24 @@ 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:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Ez az e-mail cím már használatban van." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Jelszó" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Kérlek írd be a jelenlegi jelszavad." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -180,41 +179,39 @@ msgstr "Kérlek írd be a jelenlegi jelszavad." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Törlés" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Érvénytelen jelszó" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Ez az űrlap reCAPTCHA-val van biztosítva" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Regisztráció" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Kapcsolat" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Néhány elérhetőség, hogy válaszolni tudjunk: (e-mail, stb.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Hozzászólás" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Mit szeretnél mondani?" @@ -244,7 +241,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Rövid név, pl.: CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Link" @@ -403,7 +400,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Teljes kalória bevitel, beleérve pl: bármilyen többlet" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Súly egység" @@ -430,16 +427,16 @@ msgid "The sum of all hours has to be 24" msgstr "Az órák összegének meg kell egyeznie 24-el" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -451,8 +448,8 @@ msgid "Forbidden!" msgstr "Tiltott!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Valami olyan történt, ami nem megengedett." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -462,13 +459,20 @@ msgstr "Az oldal nem található" msgid "The page you requested does not exist." msgstr "A kért oldal nem létezik." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Valami történt ami hibát okozott." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -484,7 +488,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Vissza \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "" @@ -493,8 +497,10 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Biztosan törölni akarod? Ez a művelet nem visszavonható." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Configuration" +msgid "Email verification" +msgstr "Beállítás" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -552,9 +558,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -562,38 +568,7 @@ msgstr "" msgid "Close" msgstr "Bezárás" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -604,94 +579,37 @@ msgstr "" msgid "Workout" msgstr "Edzés" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Ez az edzés egy ütemterv része:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Új naplóbejegyzés hozzáadása" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Nem található edzés." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Adj hozzá egyet most." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Táplálkozási terv" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energia" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Fehérje" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Szénhidrát" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Zsír" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Nincs táplálkozási terv." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -700,12 +618,12 @@ msgstr "Nincs táplálkozási terv." msgid "Weight" msgstr "Súly" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Új súly bejegyzés hozzáadása" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Nyelvek" @@ -716,8 +634,8 @@ msgstr "Nincs találat." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -740,7 +658,7 @@ msgstr "Hozzáadás" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Beállítások" @@ -751,8 +669,8 @@ msgstr "Licenc lista" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -770,8 +688,7 @@ msgstr "Licenc lista" msgid "Nothing found" msgstr "Nincs találat" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -786,8 +703,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "" @@ -816,154 +731,158 @@ msgstr "Edzés ütemtervek" msgid "Calendar" msgstr "Naptár" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 #, fuzzy #| msgid "Workout complete!" msgid "Workout templates" msgstr "Edzés befejezve!" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 #, fuzzy #| msgid "Your schedules" msgid "Your templates" msgstr "Ütemterveid" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Gyakorlatok" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Adminisztráció" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercises pending review" msgid "Exercise edit history" msgstr "Ellenőrzésre váró gyakorlatok" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Felszerelés" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Izmok" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Kategóriák" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Táplálkozás" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Táplálkozási tervek" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "BMI kalkulátor" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Napi kalória kalkulátor" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Összetevő áttekintés" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Összetevő súly egységek" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ellenőrzésre váró összetevők" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Súly áttekintés" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Erről a szoftverről" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Rólunk" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licenc" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Szerezd meg a kódot" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Lefordítás" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Új jelszó igénylése" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Beállításaim" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Kijelentkezés" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licencek" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Edzőtermek" @@ -1013,14 +932,6 @@ msgstr "Köszönjük, hogy használod az oldalunkat!" msgid "The %(site_name)s team" msgstr "A %(site_name)s csapat" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "előző" @@ -1061,19 +972,19 @@ msgstr "Ismétlés" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Készíts egy pár demó bejegyzést" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "" @@ -1149,15 +1060,15 @@ msgstr "Elfelejtett jelszó?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "utolsó %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1170,24 +1081,25 @@ msgid "Add workout" msgstr "Edzés hozzáadása" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Dátum" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Leírás" @@ -1210,7 +1122,7 @@ msgstr "Bejegyzések" msgid "General impression" msgstr "Általános benyomás" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1220,18 +1132,37 @@ msgstr "Megjegyzések" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Idő" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Táplálkozási terv hozzáadása" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energia" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Fehérje" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Szénhidrát" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Zsír" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1241,110 +1172,110 @@ msgstr "Táplálkozási terv hozzáadása" msgid "Actions" msgstr "Műveletek" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Felhasználó deaktiviálása" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Felhasználó aktiválása" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Szerepek" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Jelszó igénylés megerősítése" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Részletek" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "sz." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Cím" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Regisztrálva" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Utolsó bejelentkezés" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Státusz" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Aktív" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inaktív" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Dokumentumok" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Letöltés" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Beállítás" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Bejelentkezés mint ez a felhasználó" @@ -1372,7 +1303,7 @@ msgstr "" msgid "Change password" msgstr "Jelszó megváltoztatása" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1388,7 +1319,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "" @@ -1402,7 +1333,7 @@ msgstr "" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Sikeresen törölve" @@ -1413,8 +1344,7 @@ msgstr "Sikeresen törölve" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Töröljem {0}?" @@ -1428,31 +1358,31 @@ msgstr "Töröljem {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "{0} módosítása" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " "do. Feel free to edit or delete them!" msgstr "" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Pihenő nap" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Visszajelzés" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "A visszajelzésed sikeresen elküldtük. Köszönjük!" @@ -1502,19 +1432,19 @@ msgstr "Edzőterem" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Kategória" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Elsődleges izmok" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Másodlagos izmok" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1532,8 +1462,8 @@ msgstr "Gyakorlat" msgid "A comment about how to correctly do this exercise." msgstr "Megjegyzés, hogy hogyan kell helyesen csinálni ezt a gyakorlatot." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Nyelv" @@ -1675,8 +1605,8 @@ msgstr "Műveletek" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Felhasználó" @@ -1803,7 +1733,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "" @@ -2124,65 +2054,69 @@ msgid "Legs" msgstr "" #: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 #, fuzzy #| msgid "Reps" msgid "Max Reps" msgstr "Ismétlés" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Ismétlések" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2265,7 +2199,7 @@ msgstr "Használjon hozzávalókat Angolul is" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "" @@ -2334,7 +2268,7 @@ msgid "The duration in weeks" msgstr "Az időtartam hetekben" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Sorrend" @@ -2389,7 +2323,7 @@ msgstr "Sorozatok száma" msgid "Sets" msgstr "Sorozatok" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Létrehozás dátuma" @@ -2595,7 +2529,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "PDF letöltése" @@ -2810,7 +2743,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2855,61 +2788,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2917,15 +2839,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -2942,35 +2864,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Táplálkozási terv" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3114,14 +3041,11 @@ msgstr "Elfogad" msgid "Decline" msgstr "Elutasít" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3133,8 +3057,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3152,131 +3074,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Cél" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3361,37 +3158,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Törlés?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" +msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3402,6 +3199,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Törlés?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3868,6 +3669,24 @@ msgstr "" msgid "Delete weight entry for the %s" msgstr "" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Valami olyan történt, ami nem megengedett." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Valami történt ami hibát okozott." + +#~ msgid "No nutrition plans." +#~ msgstr "Nincs táplálkozási terv." + +#~ msgid "Add nutrition plan" +#~ msgstr "Táplálkozási terv hozzáadása" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "Goal" +#~ msgstr "Cél" + #~ msgid "Free license" #~ msgstr "Ingyenes licenc" diff --git a/wger/locale/it/LC_MESSAGES/django.po b/wger/locale/it/LC_MESSAGES/django.po index 45ae7e142..953f8d97f 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-08-28 12:54+0000\n" "Last-Translator: Marco Accorinti \n" "Language-Team: Italian \n" @@ -43,8 +43,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -61,57 +61,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Modifica" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Esempio di allenamento" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Esempio di giorno" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Altro esempio di giorno" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Esempio di piano nutrizionale" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Segnaposto allenamento nr {0} per il programma" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Il mio programma di allenamento" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Programma segnaposto vuoto" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Entra" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Nome" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Cognome" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -157,24 +156,24 @@ msgstr "" "Usato per reimpostare la password e, opzionalmente, per i promemoria via e-" "mail." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Questo indirizzo e-mail è già in uso." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Password" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Si prega di inserire la tua password attuale." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -189,41 +188,39 @@ msgstr "Si prega di inserire la tua password attuale." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Elimina" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Password non valida" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Quest formulario è protetto con reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Registrati" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Contatto" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Un modo per contattarti (e-mail, ecc.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Commento" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Che cosa vuoi dire?" @@ -255,7 +252,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Nome corto, e.g. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Link" @@ -425,7 +422,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Totale calorico, incluso es. qualsiasi eccesso calorico" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Unità" @@ -457,16 +454,16 @@ msgid "The sum of all hours has to be 24" msgstr "La somma di tutte le ore deve essere 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -478,8 +475,8 @@ msgid "Forbidden!" msgstr "Proibito!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "È successo qualcosa che non è permesso." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -489,13 +486,20 @@ msgstr "Pagina non trovata" msgid "The page you requested does not exist." msgstr "La pagina richiesta non esiste." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Qualcosa è andato storto" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "È successo qualcosa che ha causato un errore." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -515,7 +519,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Ritorna a «%(target)s»" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Condividi" @@ -524,7 +528,9 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Sei sicuro/a di volerlo eliminare? Questa azione sarà permanente." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "Email verificata" #: core/templates/email_verification/confirm_template.html:18 @@ -588,9 +594,9 @@ msgstr "" "Fare clic per aggiungere i registri del peso a un giorno di\n" "allenamento nel tuo allenamento attuale:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -598,41 +604,7 @@ msgstr "" msgid "Close" msgstr "Chiudi" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Aggiungi nuovo record nel diario" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Clicca aggiungi per inserire informazioni al tuo diario di oggi. Puoi " -"inserire un pasto predefinito, o inserire qualsiasi numero di informazioni " -"personalizzate." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Aggiungi record personalizzato" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -643,11 +615,11 @@ msgstr "Aggiungi record personalizzato" msgid "Workout" msgstr "Allenamento" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Questo allenamento fa parte del programma:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -655,84 +627,27 @@ msgstr "" "L'allenamento è selezionato dalla pianificazione attiva. Oppure, se non ne " "hai una, dalla data." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Aggiorna diario di allenamento" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Nessun allenamento trovato." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Aggiungine uno adesso." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Piano nutrizionale" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energie" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Proteine" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Carboidrati" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Grassi" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Nessun piano nutrizionale trovato." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -741,12 +656,12 @@ msgstr "Nessun piano nutrizionale trovato." msgid "Weight" msgstr "Peso" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Aggiungi peso corporeo" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Lingue" @@ -757,8 +672,8 @@ msgstr "Nessun risultato." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -781,7 +696,7 @@ msgstr "Aggiungi" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Opzioni" @@ -792,8 +707,8 @@ msgstr "Elenco delle licenze" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -811,8 +726,7 @@ msgstr "Elenco delle licenze" msgid "Nothing found" msgstr "Trovato niente" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Impressum" @@ -829,8 +743,6 @@ msgstr "" " devi consentire l'accesso esterno." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Fallo qui" @@ -865,148 +777,154 @@ msgstr "Programma allenamenti" msgid "Calendar" msgstr "Calendario" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Macronutrienti" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galleria" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Modelli di allenamento" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "I tuoi modelli" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Modelli pubblici" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Esercizi" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Amministrazione" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Aggiorna storico esercizi" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Attrezzatura" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Muscoli" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Categorie" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Piano nutrizionale" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Piani nutrizionali" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Calcolatore IMC" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Calcolo calorie giornaliere" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Panoramica alimenti" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Unità di peso ingrediente" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ingredienti in attesa di revisione" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Peso corporeo" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Panoramica peso corporeo" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Informazioni" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Chi siamo" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licenza" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Documentazione dello sviluppatore" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Ottieni il codice" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Traduci" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Reimposta la password" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Preferenze" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Esci" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licenza" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Unità di ripetizione" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Unità peso" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Lista utenti" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Palestre" @@ -1061,14 +979,6 @@ msgstr "Grazie per aver usato il nostro sito!" msgid "The %(site_name)s team" msgstr "I creatori di %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "richiedi informazioni" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "risposta informazioni" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "precedente" @@ -1109,19 +1019,19 @@ msgstr "Ripetizioni" msgid "RiR" msgstr "RiR" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Crea alcune voci demo" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Termini di servizio" @@ -1207,15 +1117,15 @@ msgstr "Password dimenticata?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "ultimo %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1228,24 +1138,25 @@ msgid "Add workout" msgstr "Aggiungi allenamento" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Data" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Descrizione" @@ -1268,7 +1179,7 @@ msgstr "Diario" msgid "General impression" msgstr "Impressioni generali" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1278,18 +1189,37 @@ msgstr "Note" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Tempo" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Aggiungi piano nutrizionale" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energie" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Proteine" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Carboidrati" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Grassi" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1299,110 +1229,110 @@ msgstr "Aggiungi piano nutrizionale" msgid "Actions" msgstr "Azioni" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Disattiva utente" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Attiva utente" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Reset password utente" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Ruoli" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Reset password confermato" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Vuoi veramente cambiare la password di questo user's?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "No" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Si" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Dettagli" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Numero" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Numero" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Via" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Registrato" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Ultimo login" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Stato" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Attivo" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inattivo" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Contratti" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Documenti" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Scarica" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Configurazione" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Includi in una panoramica inattiva" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Entra come questo utente" @@ -1430,7 +1360,7 @@ msgstr "Devi confermare l'email per contribuire agli esercizi" msgid "Change password" msgstr "Cambia la password" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1446,7 +1376,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1460,7 +1390,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Eliminato con successo" @@ -1471,8 +1401,7 @@ msgstr "Eliminato con successo" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Eliminare {0}?" @@ -1486,12 +1415,12 @@ msgstr "Eliminare {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Modifica {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1502,19 +1431,19 @@ msgstr "" "vedere meglio ciò che questo sito può fare. Sentiti libero di modificarli o " "cancellarli!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Giorno di riposo" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Commenti" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Invia" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Il tuo commento è stato mandato con successo. Grazie!" @@ -1564,19 +1493,19 @@ msgstr "Palestra" msgid "A verification email was sent to %(email)s" msgstr "Un'email di verifica è stata inviata a %(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Categoria" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Muscoli primari" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Muscoli secondari" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Variazioni" @@ -1594,8 +1523,8 @@ msgstr "Esercizio" msgid "A comment about how to correctly do this exercise." msgstr "Un commento su come eseguire correttamente l'esercizio." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Lingua" @@ -1730,8 +1659,8 @@ msgstr "Azione" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Utente" @@ -1855,7 +1784,7 @@ msgstr "Tipo di contratto" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Quantità" @@ -2186,63 +2115,67 @@ msgid "Legs" msgstr "Gambe" #: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Numero massimo di ripetizioni" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Miglia" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "Miglia all'ora" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minuti" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "Piatti" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Spalliera" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Quadricipiti" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Ripetizioni" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "Bilanaciere Obliquo SZ" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Secondi" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Spalle" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Palla Da Ginnastica" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "Tricipiti" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Fino al Fallimento" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "nessuno (esercizio a corpo libero)" @@ -2325,7 +2258,7 @@ msgstr "Usa anche i nomi in inglese" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Unità" @@ -2402,7 +2335,7 @@ msgid "The duration in weeks" msgstr "Durata in settimane" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Ordine" @@ -2461,7 +2394,7 @@ msgstr "Numero di serie" msgid "Sets" msgstr "Serie" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Data di creazione" @@ -2722,7 +2655,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Scarica come PDF" @@ -2962,7 +2894,7 @@ msgstr "Nuova impressione allenamento per {0}" msgid "This will delete all weight logs for this day as well." msgstr "Questo cancellerà anche tutti i log del peso per questo giorno." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Valore" @@ -3009,61 +2941,50 @@ msgstr "" "un numero negativo)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Alimenti" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "In kcal/100 g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "In g per 100 g di prodotto" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Zuccheri contenuti nei carboidrati" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Grassi saturi contenuti nei grassi" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Fibre" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Sodio" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Collega al prodotto" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Nome del produttore" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3074,15 +2995,15 @@ msgstr "" "delle proteine, carboidrati e grasso. ({energy_calculated} kcal +/- " "{energy_approx}%)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "L'ingrediente è stato aggiunto con successo al database generale" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Nuovo ingrediente presentato dall'utente" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "L'utente {0} ha inviato un nuovo ingrediente «{1}»." @@ -3099,21 +3020,26 @@ msgstr "Quantità in grammi" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Importo unitario, ad es. «1 tazza» o «1/2 cucchiaio»" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Piano nutrizionale" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Pasto" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 #, fuzzy #| msgid "Time (approx)" msgid "Date and Time (Approx.)" msgstr "Orario (approssimativo)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Orario (approssimativo)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" @@ -3121,7 +3047,7 @@ msgstr "" "Dai ai pasti una descrizione testuale/nome come \"Colazione\" o \"Dopo " "l'allenamento\"" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3129,11 +3055,11 @@ msgstr "" "Una descrizione dell'obiettivo del piano, ad es. «Guadagna massa» o " "«Preparati per l'estate»" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Usa calorie giornaliere" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3302,14 +3228,11 @@ msgstr "Accetta" msgid "Decline" msgstr "Rifiuta" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Macronutrienti" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "kJ" @@ -3321,8 +3244,6 @@ msgid "n.A." msgstr "n.D." #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Altri" @@ -3340,137 +3261,6 @@ msgstr "Modifica ingrediente" msgid "Delete ingredient" msgstr "Cancella ingrediente" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Diario nutrizionale" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Pianificato" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Registrato" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Differenza" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Dati" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "Nessun risultato" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Il tuo piano nutrizionale" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Contenuti" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Registra questo pasto" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Aggiungi ingredienti al pasto" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Nessun alimento per questo pasto." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Nessun pasto per questo piano nutrizionale." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Aggiungi la pianificazione" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Aggiungi un nuovo pasto" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Dati nutrizionali" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "Basato sui dati del peso datato%(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Totale" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Percentuale di energia" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g per peso in kg" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz per corpo lb" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Mostra tutte le registrazioni nutrizionali" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Obiettivo" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Hai selezionato che questo piano nutrizionale ha un\n" -" obbiettivo sulla quantità di calorie. Usa la calcolatrice o " -"inserisci il valore\n" -" tu stesso." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Se trovi che la lista degli ingredienti è troppo corta, potresti voler " -"attivare la preferenza per mostrare anche gli ingredienti Inglesi." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Modifica piano nutrizionale" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Fai una copia di questo piano nutrizionale" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Cancella piano nutrizionale" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Metabolismo basale" @@ -3574,39 +3364,39 @@ msgstr "56 a 90" msgid "Add a new ingredient" msgstr "Aggiungi un nuovo ingrediente" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "L'ingrediente è stato contrassegnato con successo come rifiutato" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Elimina?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Aggiungi un nuovo pasto" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Modifica pasto" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Modifica l'articolo del pasto" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Piano nutrizionale" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Piano nutrizionale per %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Questo è un piano vuoto, cosa ti aspettavi dal PDF?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Dati nutrizionali" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Totale" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Percentuale di energia" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g per peso in kg" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Aggiungi una nuova unità di peso" @@ -3615,6 +3405,10 @@ msgstr "Aggiungi una nuova unità di peso" msgid "Edit a weight unit to ingredient connection" msgstr "Modifica un'unità di peso collegato all'ingrediente" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Elimina?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4149,6 +3943,132 @@ msgstr "Cancellato con successo." msgid "Delete weight entry for the %s" msgstr "Cancellato il peso inserito di %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "È successo qualcosa che non è permesso." + +#~ msgid "Something happened that caused an error." +#~ msgstr "È successo qualcosa che ha causato un errore." + +#~ msgid "Add new diary entry" +#~ msgstr "Aggiungi nuovo record nel diario" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Clicca aggiungi per inserire informazioni al tuo diario di oggi. Puoi " +#~ "inserire un pasto predefinito, o inserire qualsiasi numero di " +#~ "informazioni personalizzate." + +#~ msgid "Add custom diary entry" +#~ msgstr "Aggiungi record personalizzato" + +#~ msgid "No nutrition plans." +#~ msgstr "Nessun piano nutrizionale trovato." + +#~ msgid "request info" +#~ msgstr "richiedi informazioni" + +#~ msgid "response info" +#~ msgstr "risposta informazioni" + +#~ msgid "Add nutrition plan" +#~ msgstr "Aggiungi piano nutrizionale" + +#~ msgid "Nutrition diary" +#~ msgstr "Diario nutrizionale" + +#~ msgid "Planned" +#~ msgstr "Pianificato" + +#~ msgid "Logged" +#~ msgstr "Registrato" + +#~ msgid "Difference" +#~ msgstr "Differenza" + +#~ msgid "Entries" +#~ msgstr "Dati" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "Nessun risultato" + +#~ msgid "Your nutrition plans" +#~ msgstr "Il tuo piano nutrizionale" + +#~ msgid "Contents" +#~ msgstr "Contenuti" + +#~ msgid "Log this meal" +#~ msgstr "Registra questo pasto" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Aggiungi ingredienti al pasto" + +#~ msgid "No items for this meal." +#~ msgstr "Nessun alimento per questo pasto." + +#~ msgid "No meals for this plan." +#~ msgstr "Nessun pasto per questo piano nutrizionale." + +#~ msgid "Log this Plan" +#~ msgstr "Aggiungi la pianificazione" + +#~ msgid "Add a new meal" +#~ msgstr "Aggiungi un nuovo pasto" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Basato sui dati del peso datato%(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "oz per corpo lb" + +#~ msgid "View complete nutrition log" +#~ msgstr "Mostra tutte le registrazioni nutrizionali" + +#~ msgid "Goal" +#~ msgstr "Obiettivo" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Hai selezionato che questo piano nutrizionale ha un\n" +#~ " obbiettivo sulla quantità di calorie. Usa la calcolatrice " +#~ "o inserisci il valore\n" +#~ " tu stesso." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Se trovi che la lista degli ingredienti è troppo corta, potresti voler " +#~ "attivare la preferenza per mostrare anche gli ingredienti Inglesi." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Modifica piano nutrizionale" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Fai una copia di questo piano nutrizionale" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Cancella piano nutrizionale" + +#~ msgid "Add new meal" +#~ msgstr "Aggiungi un nuovo pasto" + +#~ msgid "Edit meal" +#~ msgstr "Modifica pasto" + +#~ msgid "Edit meal item" +#~ msgstr "Modifica l'articolo del pasto" + #~ msgid "Free license" #~ msgstr "Licenza libera" diff --git a/wger/locale/ja/LC_MESSAGES/django.po b/wger/locale/ja/LC_MESSAGES/django.po index 04dfb6821..82c3d15b8 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2021-10-31 07:34+0000\n" "Last-Translator: yuki chi \n" "Language-Team: Japanese \n" @@ -36,8 +36,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -54,57 +54,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "編集" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "ログイン" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "名前" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "名字" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -146,26 +145,26 @@ msgstr "保存" msgid "Used for password resets and, optionally, email reminders." msgstr "" -#: core/forms.py:205 +#: core/forms.py:206 #, fuzzy #| msgid "This email is already used." msgid "This e-mail address is already in use." msgstr "このメールアドレスは既に登録済みです。" -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "パスワード" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "現在のパスワードを入力してください。" -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -180,41 +179,39 @@ msgstr "現在のパスワードを入力してください。" #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "削除" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "パスワードは無効です。" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "登録" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "問い合わせ" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "コメント" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "" @@ -244,7 +241,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "リンク" @@ -398,7 +395,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "体重の単位" @@ -425,16 +422,16 @@ msgid "The sum of all hours has to be 24" msgstr "" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -446,7 +443,7 @@ msgid "Forbidden!" msgstr "" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." +msgid "You are not allowed to acces this page" msgstr "" #: core/templates/404.html:4 @@ -457,12 +454,19 @@ msgstr "" msgid "The page you requested does not exist." msgstr "" -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 @@ -479,7 +483,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "共有する" @@ -488,8 +492,10 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "" #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Configuration" +msgid "Email verification" +msgstr "設定" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -547,9 +553,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -557,38 +563,7 @@ msgstr "" msgid "Close" msgstr "閉じる" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -599,94 +574,37 @@ msgstr "" msgid "Workout" msgstr "" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "" -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "今すぐ追加する" -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "エネルギー" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "タンパク質" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "炭水化物" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "脂肪質" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "" - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -695,12 +613,12 @@ msgstr "" msgid "Weight" msgstr "体重" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "言語" @@ -711,8 +629,8 @@ msgstr "" #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -735,7 +653,7 @@ msgstr "追加" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "オプション" @@ -746,8 +664,8 @@ msgstr "" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -765,8 +683,7 @@ msgstr "" msgid "Nothing found" msgstr "" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -781,8 +698,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "" @@ -811,150 +726,154 @@ msgstr "" msgid "Calendar" msgstr "カレンダー" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "運動" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercises" msgid "Exercise edit history" msgstr "運動" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "筋肉" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "BMI計算" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "ライセンス" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "翻訳" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "パスワード再設定" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "ロッグアウト" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "" @@ -1004,14 +923,6 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "" @@ -1052,17 +963,17 @@ msgstr "回" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "使用条件" @@ -1138,15 +1049,15 @@ msgstr "" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1159,24 +1070,25 @@ msgid "Add workout" msgstr "ワークアウトを追加する" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "日付" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "" @@ -1199,7 +1111,7 @@ msgstr "" msgid "General impression" msgstr "" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1209,18 +1121,37 @@ msgstr "" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "エネルギー" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "タンパク質" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "炭水化物" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "脂肪質" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1230,110 +1161,110 @@ msgstr "" msgid "Actions" msgstr "" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "ダウンロード" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "設定" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "" @@ -1361,7 +1292,7 @@ msgstr "" msgid "Change password" msgstr "" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1377,7 +1308,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1391,7 +1322,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "" @@ -1402,8 +1333,7 @@ msgstr "" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "" @@ -1417,31 +1347,31 @@ msgstr "" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " "do. Feel free to edit or delete them!" msgstr "" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "" @@ -1491,19 +1421,19 @@ msgstr "" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1521,8 +1451,8 @@ msgstr "" msgid "A comment about how to correctly do this exercise." msgstr "" -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "表示言語" @@ -1658,8 +1588,8 @@ msgstr "オプション" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "" @@ -1782,7 +1712,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "" @@ -2105,67 +2035,71 @@ msgid "Legs" msgstr "脚" #: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 #, fuzzy #| msgid "Reps" msgid "Max Reps" msgstr "回" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "プルアップ・バー" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "回数" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "EZバー" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "肩" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "バランスボール" -#: i18n.tpl:34 +#: i18n.tpl:35 #, fuzzy #| msgid "Triceps brachii" msgid "Triceps" msgstr "上腕三頭筋" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2244,7 +2178,7 @@ msgstr "" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "単位" @@ -2313,7 +2247,7 @@ msgid "The duration in weeks" msgstr "" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "" @@ -2368,7 +2302,7 @@ msgstr "セット数" msgid "Sets" msgstr "セット" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "" @@ -2571,7 +2505,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "" @@ -2784,7 +2717,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2829,61 +2762,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "材料" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "食物繊維" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "ナトリウム" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2891,15 +2813,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -2916,35 +2838,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3088,14 +3015,11 @@ msgstr "" msgid "Decline" msgstr "" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3107,8 +3031,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3126,131 +3048,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "目標" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3335,37 +3132,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3376,6 +3173,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3830,6 +3631,12 @@ msgstr "" msgid "Delete weight entry for the %s" msgstr "" +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "Goal" +#~ msgstr "目標" + #~ msgid "Ingredients" #~ msgstr "材料" diff --git a/wger/locale/ko/LC_MESSAGES/django.po b/wger/locale/ko/LC_MESSAGES/django.po index 3a3f206e7..04fd81c0a 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2022-01-21 19:55+0000\n" "Last-Translator: namong79 \n" "Language-Team: Korean \n" @@ -35,8 +35,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -53,59 +53,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "수정" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "샘플 Workout" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "예시 일" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "다른 예시 일" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "영양 섭취 계획 예시" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "로그인" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "이름" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "성" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -149,26 +148,26 @@ msgstr "저장" msgid "Used for password resets and, optionally, email reminders." msgstr "비밀번호 재설정 및 이메일 알람(option)에 사용됩니다." -#: core/forms.py:205 +#: core/forms.py:206 #, fuzzy #| msgid "This email is already used." msgid "This e-mail address is already in use." msgstr "이 이메일은 사용중입니다." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "비밀번호" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "현재 비밀번호를 입력해주세요." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -183,43 +182,41 @@ msgstr "현재 비밀번호를 입력해주세요." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "삭제" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "유효하지 않은 비밀번호" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "등록" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "연락" -#: core/forms.py:306 +#: core/forms.py:307 #, fuzzy #| msgid "Some way of answering you (email, etc.)" msgid "Some way of answering you (e-mail, etc.)" msgstr "답변방법 (이메일 등)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Comment" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "" @@ -249,7 +246,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "" @@ -403,7 +400,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "" @@ -430,16 +427,16 @@ msgid "The sum of all hours has to be 24" msgstr "" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -451,7 +448,7 @@ msgid "Forbidden!" msgstr "" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." +msgid "You are not allowed to acces this page" msgstr "" #: core/templates/404.html:4 @@ -462,12 +459,19 @@ msgstr "" msgid "The page you requested does not exist." msgstr "" -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 @@ -484,7 +488,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "" @@ -493,8 +497,10 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "" #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Configuration" +msgid "Email verification" +msgstr "설정" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -553,9 +559,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -563,38 +569,7 @@ msgstr "" msgid "Close" msgstr "" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -605,94 +580,37 @@ msgstr "" msgid "Workout" msgstr "운동" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Workout을 찾을 수 없음." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "추가하세요." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "" - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -701,12 +619,12 @@ msgstr "" msgid "Weight" msgstr "" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "체중 기록 추가" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "언어" @@ -717,8 +635,8 @@ msgstr "찾을 수 없음." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -741,7 +659,7 @@ msgstr "추가" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "옵션" @@ -752,8 +670,8 @@ msgstr "라이센스 리스트" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -771,8 +689,7 @@ msgstr "라이센스 리스트" msgid "Nothing found" msgstr "" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -787,8 +704,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "" @@ -817,154 +732,158 @@ msgstr "Workout 일정" msgid "Calendar" msgstr "달력" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 #, fuzzy #| msgid "Workout reminders" msgid "Workout templates" msgstr "Workout 리마인더" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 #, fuzzy #| msgid "Your schedules" msgid "Your templates" msgstr "일정" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "운동" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercise day" msgid "Exercise edit history" msgstr "운동한 날" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "영양" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "체중" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "체중 개요" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "내 환경설정" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "로그아웃" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "무게 단위" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "사용자 리스트" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Gyms" @@ -1014,14 +933,6 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "" @@ -1062,17 +973,17 @@ msgstr "" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "" @@ -1151,15 +1062,15 @@ msgstr "" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1172,24 +1083,25 @@ msgid "Add workout" msgstr "Workout 추가" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "날짜" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "" @@ -1212,7 +1124,7 @@ msgstr "" msgid "General impression" msgstr "" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1222,18 +1134,37 @@ msgstr "" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" msgstr "" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1243,110 +1174,110 @@ msgstr "" msgid "Actions" msgstr "Actions" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "세부정보" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "주소" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "최종 로그인" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "설정" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "" @@ -1376,7 +1307,7 @@ msgstr "" msgid "Change password" msgstr "" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "" @@ -1392,7 +1323,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "" @@ -1406,7 +1337,7 @@ msgstr "" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "" @@ -1417,8 +1348,7 @@ msgstr "" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "" @@ -1432,31 +1362,31 @@ msgstr "" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " "do. Feel free to edit or delete them!" msgstr "" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "휴식" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "" @@ -1506,19 +1436,19 @@ msgstr "Gym" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1536,8 +1466,8 @@ msgstr "" msgid "A comment about how to correctly do this exercise." msgstr "" -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "" @@ -1679,8 +1609,8 @@ msgstr "Actions" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "" @@ -1803,7 +1733,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "" @@ -2133,65 +2063,69 @@ msgid "Legs" msgstr "다리" #: i18n.tpl:22 -msgid "Max Reps" +msgid "Lower back" msgstr "" #: i18n.tpl:23 +msgid "Max Reps" +msgstr "" + +#: i18n.tpl:24 msgid "Miles" msgstr "마일" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "분" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "풀업바" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "SZ바" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "초" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "어깨" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "스위스볼" -#: i18n.tpl:34 +#: i18n.tpl:35 #, fuzzy #| msgid "Triceps brachii" msgid "Triceps" msgstr "상완 삼두근 (Triceps brachii)" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "실패 전까지" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2270,7 +2204,7 @@ msgstr "" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "" @@ -2339,7 +2273,7 @@ msgid "The duration in weeks" msgstr "" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "" @@ -2394,7 +2328,7 @@ msgstr "" msgid "Sets" msgstr "" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "생성일" @@ -2624,7 +2558,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "" @@ -2841,7 +2774,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2886,61 +2819,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2948,15 +2870,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -2973,35 +2895,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3149,14 +3076,11 @@ msgstr "" msgid "Decline" msgstr "" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3168,8 +3092,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3187,131 +3109,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3396,37 +3193,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3437,6 +3234,10 @@ msgstr "새 무게 단위 추가" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " diff --git a/wger/locale/nl/LC_MESSAGES/django.po b/wger/locale/nl/LC_MESSAGES/django.po index ba765d4dd..f71c93644 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-04-30 20:49+0000\n" "Last-Translator: Nick \n" "Language-Team: Dutch \n" @@ -42,8 +42,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -60,59 +60,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Bewerk" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Voorbeeldworkout" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Voorbeelddag" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Nog een voorbeelddag" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "Voorbeeld voedingsplan" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Tijdelijke workout nr {0} voor schema" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Mijn hip workoutschema" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Leeg tijdelijk schema" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Aanmelden" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Voornaam" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Achternaam" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -158,24 +157,24 @@ msgstr "" "Wordt gebruikt voor het resetten van een wachtwoord en optioneel voor e-mail " "herinneringen." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Dit e-mailadres wordt al gebruikt." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Wachtwoord" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Gelieve je huidige wachtwoord in te geven." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -190,41 +189,39 @@ msgstr "Gelieve je huidige wachtwoord in te geven." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Verwijder" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Ongeldig wachtwoord" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Dit formulier is beveiligd met reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Registreer" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Contact" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Een manier om je te beantwoorden (e-mail, etc.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Opmerking" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Wat wil je zeggen?" @@ -257,7 +254,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Korte naam, bvb. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Link" @@ -424,7 +421,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Totale calorie-inname, inclusief bvb. enige surplus" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Gewichteenheid" @@ -455,16 +452,16 @@ msgid "The sum of all hours has to be 24" msgstr "Het toaal van alle uren moet 24 zijn" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -476,8 +473,8 @@ msgid "Forbidden!" msgstr "Verboden!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Er is iets gebeurd dat niet mocht gebeuren." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -487,13 +484,20 @@ msgstr "Pagina niet gevonden" msgid "The page you requested does not exist." msgstr "De pagina die je verzocht bestaat niet." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Er is een fout opgetreden" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Er is iets gebeurd dat een fout veroorzaakte." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -513,7 +517,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Terug naar \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Deel" @@ -524,7 +528,9 @@ msgstr "" "gemaakt." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "Email geverifieerd" #: core/templates/email_verification/confirm_template.html:18 @@ -589,9 +595,9 @@ msgstr "" "Klik om gewichtingaven toe te voegen aan een\n" "trainingdag in je huidige workout:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -599,41 +605,7 @@ msgstr "" msgid "Close" msgstr "Sluit" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Voeg dagboekitem toe" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Klik om een item in je voedingsdagboek toe te voegen voor vandaag. Je kan " -"een maaltijd loggen zoals je deze vooraf hebt gedefinieerd, of een aantal " -"items op maat ingeven." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Voeg dagboekitem op maat toe" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -644,11 +616,11 @@ msgstr "Voeg dagboekitem op maat toe" msgid "Workout" msgstr "Workout" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Deze workout maakt deel uit van een schema." -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -656,84 +628,27 @@ msgstr "" "De huidige workout werd geselecteerd van je actieve schema of, als je er " "geen hebt, gewoonweg op basis van datum." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Nieuw log toevoegen" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Geen workouts gevonden." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Voeg er een toe." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Voedingsplan" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energie" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Proteïnen" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Koolhydraten" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Vet" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Geen voedingsplannen." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -742,12 +657,12 @@ msgstr "Geen voedingsplannen." msgid "Weight" msgstr "Gewicht" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Voeg gewichtmeting toe" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Talen" @@ -758,8 +673,8 @@ msgstr "Niets gevonden." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -782,7 +697,7 @@ msgstr "Aanmaken" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Opties" @@ -793,8 +708,8 @@ msgstr "Licentielijst" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -812,8 +727,7 @@ msgstr "Licentielijst" msgid "Nothing found" msgstr "Niets gevonden" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Afdruk" @@ -833,8 +747,6 @@ msgstr "" "staan." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Dat gebeurt hier" @@ -870,150 +782,156 @@ msgstr "Workout-schema's" msgid "Calendar" msgstr "Kalender" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Macrovoedingstoffen" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Gallerij" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Workout schemas" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Je sjablonen" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Publieke schemas" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Oefeningen" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administratie" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercise day" msgid "Exercise edit history" msgstr "Oefeningdag" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Materiaal" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Spieren" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Categorieën" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Voeding" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Voedingsplannen" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "BMI-calculator" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Dagelijkse calorieëncalculator" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Ingrediëntenoverzicht" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Gewichteenheden ingrediënt" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ingrediënten in overweging" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Lichaamsgewicht" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Gewichtsoverzicht" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Over deze software" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Over ons" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licentie" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Developer documentatie" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Download de code" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Vertaal" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Reset wachtwoord" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Mijn voorkeuren" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Afmelden" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licenties" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Herhalingen" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Gewichteenheden" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Gebruikerslijst" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Gyms" @@ -1068,14 +986,6 @@ msgstr "Bedankt om onze site te gebruiken!" msgid "The %(site_name)s team" msgstr "Het %(site_name)s team" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "vorige" @@ -1116,18 +1026,18 @@ msgstr "Herhalingen" msgid "RiR" msgstr "RiR" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Maak wat demo-ingaven aan" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Algemene voorwaarden" @@ -1211,15 +1121,15 @@ msgstr "Wachtwoord vergeten?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "laatste %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1232,24 +1142,25 @@ msgid "Add workout" msgstr "Workout toevoegen" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Datum" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Beschrijving" @@ -1272,7 +1183,7 @@ msgstr "Log" msgid "General impression" msgstr "Algemene indruk" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1282,18 +1193,37 @@ msgstr "Notities" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Tijd" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Voedingsplan toevoegen" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energie" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Proteïnen" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Koolhydraten" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Vet" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1303,110 +1233,110 @@ msgstr "Voedingsplan toevoegen" msgid "Actions" msgstr "Acties" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Gebruiker deactiveren" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Activeer gebruiker" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Reset gebruikers wachtwoord" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Rollen" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Bevestiging wachtwoord-reset" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Weet je zeker dat je het wachtwoord van deze gebruiker wilt wijzigen?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Nee" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Ja" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Details" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Nr." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefoon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adres" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Geregistreerd" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Laatste aanmelding" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Status" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Actief" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inactief" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Contracten" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Documenten" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Download" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Configuratie" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Opnemen in inactief overzicht" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "Inloggen voor beheerders is enkel beschikbaar in %(gym_name)s" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Aanmelden als deze gebruiker" @@ -1436,7 +1366,7 @@ msgstr "Je moet jouw email bevestigen om bij te dragen aan oefeningen" msgid "Change password" msgstr "Verander wachtwoord" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1452,7 +1382,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1466,7 +1396,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Met succes verwijderd" @@ -1477,8 +1407,7 @@ msgstr "Met succes verwijderd" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Verwijder {0}?" @@ -1492,12 +1421,12 @@ msgstr "Verwijder {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Bewerk {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1507,19 +1436,19 @@ msgstr "" "(lichaam)gewicht en voedingsplannen aangemaakt zodat je beter kan zien wat " "deze site allemaal kan. Voel je vrij om ze te bewerken of verwijderen!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Rustdag" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Feedback" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Insturen" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Je feedback werd met succes verzonden. Bedankt!" @@ -1569,19 +1498,19 @@ msgstr "Gym" msgid "A verification email was sent to %(email)s" msgstr "Een bevestigingsmail is verstuurd naar %(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Categorie" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Primaire spieren" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Secundaire spieren" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Variaties" @@ -1599,8 +1528,8 @@ msgstr "Oefening" msgid "A comment about how to correctly do this exercise." msgstr "Een opmerking over hoe je deze oefening correct kan uitvoeren." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Taal" @@ -1747,8 +1676,8 @@ msgstr "Acties" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Gebruiker" @@ -1880,7 +1809,7 @@ msgstr "Contracttype" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Hoeveelheid" @@ -2214,67 +2143,71 @@ msgid "Legs" msgstr "Benen" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Onder rug" + +#: i18n.tpl:23 #, fuzzy #| msgid "Reps" msgid "Max Reps" msgstr "Herhalingen" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Mijl" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minuten" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Optrekstaaf" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Quads" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Herhalingen" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "SZ-staaf" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Seconden" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Schouders" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Kogelgewicht" -#: i18n.tpl:34 +#: i18n.tpl:35 #, fuzzy #| msgid "Triceps brachii" msgid "Triceps" msgstr "Triceps brachii" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Tot je faalt" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "Geen (oefening met lichaamsgewicht)" @@ -2363,7 +2296,7 @@ msgstr "Gebruik ook engelstalige ingrediënten" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Eenheid" @@ -2440,7 +2373,7 @@ msgid "The duration in weeks" msgstr "De duurtijd in weken" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Volgorde" @@ -2497,7 +2430,7 @@ msgstr "Aantal sets" msgid "Sets" msgstr "Sets" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Creatiedatum" @@ -2755,7 +2688,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Download als PDF" @@ -2988,7 +2920,7 @@ msgstr "Nieuwe workout-impressie voor de {0}" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -3035,61 +2967,50 @@ msgstr "" "voer een negatief cijfer in)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Ingrediënt" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "In kcal per 100g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "In g per 100g product" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Suikerinhoud in koolhydraten" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Verzadigde vetinhoud in vetten" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Vezels" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Natrium" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3097,15 +3018,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Ingrediënt met succes toegevoegd aan de algemene databank" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Nieuw door gebruiker toegevoegd ingrediënt" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Gebruiker {0} diende een nieuw ingrediënt \"{1}\" in." @@ -3122,27 +3043,32 @@ msgstr "Hoeveelheid in grammen" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Eenheidshoeveelheid, bvb. \"1 kopje\" of \"1/2 lepel\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Voedingsplan" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Maaltijd" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 #, fuzzy #| msgid "Time (approx)" msgid "Date and Time (Approx.)" msgstr "Tijd (ongeveer)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Tijd (ongeveer)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3150,11 +3076,11 @@ msgstr "" "Een omschrijving van het doel van je plan, bvb \"Massa verhogen\" of " "\"Klaarstomen voor de zomer\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Gebruik dagelijkse calorieën" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3321,14 +3247,11 @@ msgstr "Aanvaard" msgid "Decline" msgstr "Weiger" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Macrovoedingstoffen" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3340,8 +3263,6 @@ msgid "n.A." msgstr "Nvt." #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Anderen" @@ -3359,141 +3280,6 @@ msgstr "Bewerk ingrediënt" msgid "Delete ingredient" msgstr "Verwijder ingrediënt" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Voedingsdagboek" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Gepland" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Gelogd" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Verschil" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Ingaven" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "Niets gevonden" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Je voedingsplannen" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Inhoud" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Log deze maaltijd" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Geen items voor deze maaltijd." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Geen maaltijden voor dit plan." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Nieuwe maaltijd toevoegen" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Voedingsgegevens" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Taal" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Percentage energie" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g per kg lichaamsgewicht" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz per lichaams lb" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Doel" - -#: nutrition/templates/plan/view.html:387 -#, fuzzy -#| msgid "" -#| "You have selected that this nutritional plan has a\n" -#| " goal amount of calories. Use the calculator or enter the value " -#| "yourself." -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Je hebt ingesteld dat dit voedingsplan een doelhoeveelheid calorieën " -"heeft. \n" -"Gebruik de calculator of vul de waarde zelf in." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Als je de ingrediëntenlijst te kort vindt, kan je deze instelling activeren " -"om ook engelstalige ingrediënten te tonen." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Bewerk voedingsplan" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Kopieer dit voedingsplan" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Verwijder voedingsplan" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Basaal metabolisme" @@ -3595,39 +3381,39 @@ msgstr "" msgid "Add a new ingredient" msgstr "Nieuw ingrediënt toevoegen" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Ingrediënt met succes gemarkeerd als afgewezen" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Verwijderen?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Maaltijd toevoegen" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Bewerk maaltijd" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Bewerk maaltijditem" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Voedingsplan" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Voedingsplan voor %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Dit is een leeg plan, wat had je verwacht op de PDF?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Voedingsgegevens" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Taal" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Percentage energie" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g per kg lichaamsgewicht" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Voeg gewichteenheid toe" @@ -3636,6 +3422,10 @@ msgstr "Voeg gewichteenheid toe" msgid "Edit a weight unit to ingredient connection" msgstr "Bewerk verbinding gewichteenheid en ingrediënt" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Verwijderen?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4143,6 +3933,117 @@ msgstr "Met succes verwijderd." msgid "Delete weight entry for the %s" msgstr "Verwijder gewichtsingave voor de %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Er is iets gebeurd dat niet mocht gebeuren." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Er is iets gebeurd dat een fout veroorzaakte." + +#~ msgid "Add new diary entry" +#~ msgstr "Voeg dagboekitem toe" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Klik om een item in je voedingsdagboek toe te voegen voor vandaag. Je kan " +#~ "een maaltijd loggen zoals je deze vooraf hebt gedefinieerd, of een aantal " +#~ "items op maat ingeven." + +#~ msgid "Add custom diary entry" +#~ msgstr "Voeg dagboekitem op maat toe" + +#~ msgid "No nutrition plans." +#~ msgstr "Geen voedingsplannen." + +#~ msgid "Add nutrition plan" +#~ msgstr "Voedingsplan toevoegen" + +#~ msgid "Nutrition diary" +#~ msgstr "Voedingsdagboek" + +#~ msgid "Planned" +#~ msgstr "Gepland" + +#~ msgid "Logged" +#~ msgstr "Gelogd" + +#~ msgid "Difference" +#~ msgstr "Verschil" + +#~ msgid "Entries" +#~ msgstr "Ingaven" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "Niets gevonden" + +#~ msgid "Your nutrition plans" +#~ msgstr "Je voedingsplannen" + +#~ msgid "Contents" +#~ msgstr "Inhoud" + +#~ msgid "Log this meal" +#~ msgstr "Log deze maaltijd" + +#~ msgid "No items for this meal." +#~ msgstr "Geen items voor deze maaltijd." + +#~ msgid "No meals for this plan." +#~ msgstr "Geen maaltijden voor dit plan." + +#~ msgid "Add a new meal" +#~ msgstr "Nieuwe maaltijd toevoegen" + +#~ msgid "oz per body lb" +#~ msgstr "oz per lichaams lb" + +#~ msgid "Goal" +#~ msgstr "Doel" + +#, fuzzy +#~| msgid "" +#~| "You have selected that this nutritional plan has a\n" +#~| " goal amount of calories. Use the calculator or enter the value " +#~| "yourself." +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Je hebt ingesteld dat dit voedingsplan een doelhoeveelheid calorieën " +#~ "heeft. \n" +#~ "Gebruik de calculator of vul de waarde zelf in." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Als je de ingrediëntenlijst te kort vindt, kan je deze instelling " +#~ "activeren om ook engelstalige ingrediënten te tonen." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Bewerk voedingsplan" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Kopieer dit voedingsplan" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Verwijder voedingsplan" + +#~ msgid "Add new meal" +#~ msgstr "Maaltijd toevoegen" + +#~ msgid "Edit meal" +#~ msgstr "Bewerk maaltijd" + +#~ msgid "Edit meal item" +#~ msgstr "Bewerk maaltijditem" + #~ msgid "Free license" #~ msgstr "Gratis licentie" @@ -4156,9 +4057,6 @@ msgstr "Verwijder gewichtsingave voor de %s" #~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\"" #~ msgstr "%(name)s lijkt teveel op %(exercise_name)s" -#~ msgid "Lower back" -#~ msgstr "Onder rug" - #~ msgid "Add training day" #~ msgstr "Trainingdag toevoegen" diff --git a/wger/locale/no/LC_MESSAGES/django.po b/wger/locale/no/LC_MESSAGES/django.po index 0d96765be..2a2e2ad9c 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2021-08-20 23:35+0000\n" "Last-Translator: Allan Nordhøy \n" "Language-Team: Norwegian Bokmål This is an empty plan, what did you expect on the PDF?" msgstr "Dette er en tom plan, hva hadde du forventet i PDF dokumentet?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Ernæringsmessige data" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Totalt" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Prosent av energien" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g per kropps kg" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Legg til en ny vektenhet" @@ -3636,6 +3423,10 @@ msgstr "Legg til en ny vektenhet" msgid "Edit a weight unit to ingredient connection" msgstr "Endre en vektenhet til ingrediens tilkobling" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Slett?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4160,6 +3951,129 @@ msgstr "Slettet." msgid "Delete weight entry for the %s" msgstr "Slett vektoppføring for %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Noe ulovlig har skjedd." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Noe skjedde som forårsaket en feil." + +#~ msgid "Add new diary entry" +#~ msgstr "Legg til ny dagbokoppføring" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Klikk for å legge til en oppføring i ernæringsdagboken din i dag. Du kan " +#~ "enten logge et måltid slik du definerte det, eller legge inn et hvilket " +#~ "som helst antall tilpassede oppføringer." + +#~ msgid "Add custom diary entry" +#~ msgstr "Legg til tilpasset dagbokoppføring" + +#~ msgid "No nutrition plans." +#~ msgstr "Ingen ernæringsplaner." + +#~ msgid "Add nutrition plan" +#~ msgstr "Legg til ernæringsplan" + +#~ msgid "Nutrition diary" +#~ msgstr "Ernæringsdagbok" + +#~ msgid "Planned" +#~ msgstr "Planlagt" + +#~ msgid "Logged" +#~ msgstr "Logget" + +#~ msgid "Difference" +#~ msgstr "Forskjell" + +#~ msgid "Entries" +#~ msgstr "Oppføringer" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "Ingenting funnet" + +#~ msgid "Your nutrition plans" +#~ msgstr "Dine ernæring planer" + +#~ msgid "Contents" +#~ msgstr "Innhold" + +#~ msgid "Log this meal" +#~ msgstr "Logg dette måltidet" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Tilsett ingrediens i måltidet" + +#~ msgid "No items for this meal." +#~ msgstr "Ingen elementer for dette måltidet." + +#~ msgid "No meals for this plan." +#~ msgstr "Ingen måltider for denne planen." + +#~ msgid "Log this Plan" +#~ msgstr "Logg denne planen" + +#~ msgid "Add a new meal" +#~ msgstr "Legg til nytt måltid" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Basert på vektoppføringen datert %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "oz per kropps lb" + +#~ msgid "View complete nutrition log" +#~ msgstr "Se full ernæringslogg" + +#~ msgid "Goal" +#~ msgstr "Mål" + +#, fuzzy +#~| msgid "" +#~| "You have selected that this nutritional plan has a\n" +#~| " goal amount of calories. Use the calculator or enter the value " +#~| "yourself." +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Du har valgt at denne ernæringsplanen har et\n" +#~ "mål med mengde kalorier. Bruk kalkulatoren eller angi verdien selv." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Hvis du finner ingredienslisten for kort, kan det være lurt å aktivere " +#~ "bruken av engelske ingredienser." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Endre ernæring plan" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Lag en kopi av denne ernærings planen" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Slett ernæringsplan" + +#~ msgid "Add new meal" +#~ msgstr "Legg til nytt måltid" + +#~ msgid "Edit meal" +#~ msgstr "Endre måltid" + +#~ msgid "Edit meal item" +#~ msgstr "Endre måltids element" + #~ msgid "Free license" #~ msgstr "Gratis lisens" diff --git a/wger/locale/os/LC_MESSAGES/django.po b/wger/locale/os/LC_MESSAGES/django.po index e46573de9..734c2f30e 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2021-04-11 18:54+0000\n" "Last-Translator: rge \n" "Language-Team: Ossetic (http://www.transifex.com/rge/wger-workout-manager/" @@ -33,8 +33,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -51,57 +51,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Ивын" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -143,24 +142,24 @@ msgstr "" msgid "Used for password resets and, optionally, email reminders." msgstr "" -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "" -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "" -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -175,41 +174,39 @@ msgstr "" #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Схафын" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Хъуыды" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "" @@ -239,7 +236,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "" @@ -393,7 +390,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "" @@ -420,16 +417,16 @@ msgid "The sum of all hours has to be 24" msgstr "" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -441,7 +438,7 @@ msgid "Forbidden!" msgstr "" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." +msgid "You are not allowed to acces this page" msgstr "" #: core/templates/404.html:4 @@ -452,12 +449,19 @@ msgstr "" msgid "The page you requested does not exist." msgstr "" -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 @@ -474,7 +478,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "" @@ -483,8 +487,10 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "" #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Administration" +msgid "Email verification" +msgstr "Администраци" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -542,9 +548,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -552,38 +558,7 @@ msgstr "" msgid "Close" msgstr "" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -594,94 +569,37 @@ msgstr "" msgid "Workout" msgstr "" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "" -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "" -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "" - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -690,12 +608,12 @@ msgstr "" msgid "Weight" msgstr "" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "" @@ -706,8 +624,8 @@ msgstr "" #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -730,7 +648,7 @@ msgstr "Бафтауын" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Фадӕттӕ" @@ -741,8 +659,8 @@ msgstr "" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -760,8 +678,7 @@ msgstr "" msgid "Nothing found" msgstr "" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -776,8 +693,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "" @@ -806,150 +721,154 @@ msgstr "" msgid "Calendar" msgstr "" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Фӕлтӕрӕнтӕ" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Администраци" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercise Categories" msgid "Exercise edit history" msgstr "Фӕлтӕрӕнты ӕмбырд" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Мускултӕ" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "" @@ -999,14 +918,6 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "" @@ -1047,17 +958,17 @@ msgstr "" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "" @@ -1133,15 +1044,15 @@ msgstr "" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1154,24 +1065,25 @@ msgid "Add workout" msgstr "" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Бон" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Ӕмбарынгӕнӕн" @@ -1194,7 +1106,7 @@ msgstr "" msgid "General impression" msgstr "" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1204,18 +1116,37 @@ msgstr "" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" msgstr "" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1225,110 +1156,110 @@ msgstr "" msgid "Actions" msgstr "" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Н." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "" @@ -1356,7 +1287,7 @@ msgstr "" msgid "Change password" msgstr "" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "" @@ -1372,7 +1303,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "" @@ -1386,7 +1317,7 @@ msgstr "" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "" @@ -1397,8 +1328,7 @@ msgstr "" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "" @@ -1412,31 +1342,31 @@ msgstr "" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " "do. Feel free to edit or delete them!" msgstr "" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "" @@ -1486,19 +1416,19 @@ msgstr "" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Ӕмбырд" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Фыццаг мускултӕ" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Дыггаг мускултӕ" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1516,8 +1446,8 @@ msgstr "Фӕлтӕрӕн" msgid "A comment about how to correctly do this exercise." msgstr "Ацы фӕлтӕрӕн раст куыд хъӕуы аразын, уый тыххӕй хъуыды." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Ӕвзаг" @@ -1657,8 +1587,8 @@ msgstr "Фадӕттӕ" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Архайӕг" @@ -1781,7 +1711,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "" @@ -2100,63 +2030,67 @@ msgid "Legs" msgstr "" #: i18n.tpl:22 -msgid "Max Reps" +msgid "Lower back" msgstr "" #: i18n.tpl:23 -msgid "Miles" +msgid "Max Reps" msgstr "" #: i18n.tpl:24 -msgid "Miles Per Hour" +msgid "Miles" msgstr "" #: i18n.tpl:25 -msgid "Minutes" +msgid "Miles Per Hour" msgstr "" #: i18n.tpl:26 -msgid "Plates" +msgid "Minutes" msgstr "" #: i18n.tpl:27 -msgid "Pull-up bar" +msgid "Plates" msgstr "" #: i18n.tpl:28 +msgid "Pull-up bar" +msgstr "" + +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "" @@ -2235,7 +2169,7 @@ msgstr "" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "" @@ -2304,7 +2238,7 @@ msgid "The duration in weeks" msgstr "" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "" @@ -2359,7 +2293,7 @@ msgstr "" msgid "Sets" msgstr "" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "" @@ -2563,7 +2497,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "" @@ -2774,7 +2707,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2813,61 +2746,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2875,15 +2797,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -2900,35 +2822,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3072,14 +2999,11 @@ msgstr "" msgid "Decline" msgstr "" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3091,8 +3015,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3110,131 +3032,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3319,37 +3116,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3360,6 +3157,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " diff --git a/wger/locale/pl/LC_MESSAGES/django.po b/wger/locale/pl/LC_MESSAGES/django.po index d49345d47..511fc4af5 100644 --- a/wger/locale/pl/LC_MESSAGES/django.po +++ b/wger/locale/pl/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: wger Workout Manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-01-09 19:50+0000\n" "Last-Translator: gnu-ewm \n" "Language-Team: Polish \n" @@ -43,8 +43,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -61,57 +61,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Edytuj" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Przykładowy trening" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Przykładowy dzień" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Jeszcze jeden przykładowy dzień" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Przykładowy plan odżywiania" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Zapychacz treningu nr {0} w harmonogramie" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Mój fajny harmonogram treningu" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Pusty zapychacz harmonogramu" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Zaloguj" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Imię" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Nazwisko" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -153,24 +152,24 @@ msgstr "Zapisz" msgid "Used for password resets and, optionally, email reminders." msgstr "Używany do resetowania hasła i przypomnień." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Ten adres e-mail jest już zajęty." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Hasło" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Wprowadź swoje aktualne hasło." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -185,41 +184,39 @@ msgstr "Wprowadź swoje aktualne hasło." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Usuń" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Hasło nieprawidłowe" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Formularz jest chroniony przez reCaptcha" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Zarejestruj" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Kontakt" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Wybrany sposób kontaktu (e-mail itp.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Komentarz" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Co chcesz powiedzieć?" @@ -251,7 +248,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Krótka nazwa np. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Link" @@ -417,7 +414,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Pełne spożycie kalorii, włączając surplus" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Jednostka wagi" @@ -447,16 +444,16 @@ msgid "The sum of all hours has to be 24" msgstr "Godziny muszą sumować się do wartości 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -468,8 +465,8 @@ msgid "Forbidden!" msgstr "Zabrionione!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Operacja niedozwolona." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -479,13 +476,20 @@ msgstr "Nie znaleziono strony" msgid "The page you requested does not exist." msgstr "Żadana strona nie została odnaleziona." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Wystąpił błąd" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Dokonał się błąd." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, fuzzy, python-format @@ -510,7 +514,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Wróć do \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Udostępnij" @@ -519,7 +523,9 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Czy na pewno chcesz to usunąć? Tej czynności nie będzie można cofnąć." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "E-mail zweryfikowany" #: core/templates/email_verification/confirm_template.html:18 @@ -582,9 +588,9 @@ msgstr "" "Kliknij, aby dodać wartości ciężarów\n" "do dnia treningowego w obecnym treningu:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -592,40 +598,7 @@ msgstr "" msgid "Close" msgstr "Zamknij" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Dodaj nowy wpis dziennika" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Kliknij, aby dodać nowy wpis diety. Możesz dodać posiłek, który zdefiniowano " -"wcześniej lub dodać tak wiele pozycji, jak chcesz." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Dodaj niestandardowy wpis" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -636,11 +609,11 @@ msgstr "Dodaj niestandardowy wpis" msgid "Workout" msgstr "Trening" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "To ćwiczenie jest częścią harmonogramu:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -648,84 +621,27 @@ msgstr "" "Obecne ćwiczenie jest wybrane z aktywnego harmonogramu, a gdy żadnego nie " "wybrano, według daty." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Dodaj nowy log" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Nie znaleziono treningu." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Dodaj jeden teraz." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Plan żywienia" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energia" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Białko" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Węglowodany" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Tłuszcz" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Brak planów żywienia." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -734,12 +650,12 @@ msgstr "Brak planów żywienia." msgid "Weight" msgstr "Ciężar" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Dodaj aktualną wagę" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Języki" @@ -750,8 +666,8 @@ msgstr "Nie znaleziono." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -774,7 +690,7 @@ msgstr "Dodaj" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Opcje" @@ -785,8 +701,8 @@ msgstr "Lista licencji" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -804,8 +720,7 @@ msgstr "Lista licencji" msgid "Nothing found" msgstr "Nic nie znaleziono" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Odcisk" @@ -825,8 +740,6 @@ msgstr "" "umożlwić zewnętrzny dostęp do Twoich danych." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Wykonane tutaj" @@ -861,148 +774,154 @@ msgstr "Harmonogramy treningów" msgid "Calendar" msgstr "Kalendarz" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Makroelementy" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galeria" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Szablony treningu" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Twoje schematy" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Publiczne szablony" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Ćwiczenia" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Zarządzanie" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Historia edycji ćwiczeń" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Sprzęt" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Mięśnie" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Kategorie" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Żywienie" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Plany żywienia" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Kalkulator BMI" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Kalkulator dziennych kalorii" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Rozpiska składników" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Jednostka wagowa składników" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Składniki oczekujące na akceptację" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Waga ciała" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Wykres masy ciała" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "O tym programie" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "O nas" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licencja" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Dokumentacja" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Pobierz kod źródłowy" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Tłumacz" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Resetuj hasło" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Moje preferencje" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Wyloguj" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licencje" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Jednostki potwórzeń" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Jednostki wagi" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Lista użytkowników" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Siłownie" @@ -1056,14 +975,6 @@ msgstr "Dziękujemy za korzystanie z naszej strony!" msgid "The %(site_name)s team" msgstr "Zespół %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "poprzednie" @@ -1104,19 +1015,19 @@ msgstr "Powtórzenia" msgid "RiR" msgstr "Rezerwa powtórzeń" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Utwórz kilka przykładowych wpisów" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Warunki świadczenia usługi" @@ -1200,15 +1111,15 @@ msgstr "Zapomniałeś hasła?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "ostatnie %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1221,24 +1132,25 @@ msgid "Add workout" msgstr "Dodaj trening" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Data" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Opis" @@ -1261,7 +1173,7 @@ msgstr "Log" msgid "General impression" msgstr "Ogólna ocena" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1271,18 +1183,37 @@ msgstr "Notatki" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Czas" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Dodaj plan żywienia" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energia" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Białko" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Węglowodany" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Tłuszcz" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1292,112 +1223,112 @@ msgstr "Dodaj plan żywienia" msgid "Actions" msgstr "Akcje" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Deaktywuj użytkownika" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Aktywuj użytkownika" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Resetuj hasło użytkownika" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Role" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Potwierdzenie resetu hasła" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Czy naprawdę chcesz zmienić hasło tego użytkownika?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Nie" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Tak" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Szczegóły" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Nr." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adres" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Zarejestrowano" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Zalogowany ostatnio" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Status" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Aktywny" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Nieaktywny" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Kontrakty" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Dokumenty" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Pobierz" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Konfiguracja" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Uwzględnij w podglądzie nieaktywnych" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Zaloguj się jako ten użytkownik" @@ -1425,7 +1356,7 @@ msgstr "Aby przesyłać ćwiczenia, musisz zweryfikować swój adres e-mail" msgid "Change password" msgstr "Zmień hasło" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1441,7 +1372,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1455,7 +1386,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Pomyślnie usunięto" @@ -1466,8 +1397,7 @@ msgstr "Pomyślnie usunięto" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Usunąć {0}?" @@ -1481,12 +1411,12 @@ msgstr "Usunąć {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Edytuj {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1496,19 +1426,19 @@ 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/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Dzień odpoczynku" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Opinia" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Zapisz" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Twoja opinia została poprawnie wysłana. Dziękujemy!" @@ -1558,19 +1488,19 @@ msgstr "Siłownia" msgid "A verification email was sent to %(email)s" msgstr "E-mail weryfikacyjny został wysłany na adres %(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Kategoria" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Mięśnie główne" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Mięśnie pomocnicze" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Możliwości" @@ -1588,8 +1518,8 @@ msgstr "Ćwiczenie" msgid "A comment about how to correctly do this exercise." msgstr "Komentarz jak poprawnie wykonywać to ćwiczenie." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Język" @@ -1724,8 +1654,8 @@ msgstr "Akcja" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Użytkownik" @@ -1846,7 +1776,7 @@ msgstr "Typ kontraktu" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Kwota" @@ -2177,65 +2107,69 @@ msgid "Legs" msgstr "Nogi" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Mięsień pleców" + +#: i18n.tpl:23 #, fuzzy #| msgid "Reps" msgid "Max Reps" msgstr "Powtórzenia" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Mile" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minuty" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Drążek" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Mięsień czworogłowy" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Powtórzenia" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "Sztanga łamana" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Sekundy" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Barki" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Piłka do ćwiczeń" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "Triceps" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Do porażki" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "żaden (własny ciężar ciała)" @@ -2320,7 +2254,7 @@ msgstr "Używaj także nazw składników po angielsku" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Jednostka" @@ -2395,7 +2329,7 @@ msgid "The duration in weeks" msgstr "Czas trwania w tygodniach" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Kolejność" @@ -2453,7 +2387,7 @@ msgstr "Liczba serii" msgid "Sets" msgstr "Serie" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Data utworzenia" @@ -2728,7 +2662,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Pobierz jako PDF" @@ -2965,7 +2898,7 @@ msgid "This will delete all weight logs for this day as well." msgstr "" "Ta akcja usunie także wszelkie wartości ciężarów wpisane dla tego dnia." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Wartość" @@ -3012,61 +2945,50 @@ msgstr "" "wartość)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Składnik" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "W kcal na 100g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "W g na 100g produktu" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Cukry proste" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Tłuszcze nasycone" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Błonnik" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Sód" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Podlinkuj produkt" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Nazwa marki produktu" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3077,15 +2999,15 @@ msgstr "" "dostarczonej przez białka, węglowodany i tłuszcze ({energy_calculated}kcal " "+/-{energy_approx}%)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Składnik został pomyślnie dodany do bazy danych" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Nowy składnik dodany przez użytkownika" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Użytkownik {0} dodał nowy składnik \"{1}\"." @@ -3102,35 +3024,40 @@ msgstr "Ilość w gramach" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Jednostka ilości, np. \"1 kubek\" lub \"1/2 łyżki\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Plan żywienia" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Posiłek" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "Data oraz czas (przybliżony)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Czas (przybliżony)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "Nadaj posiłkom opis tekstowy/nazwę, np. „Śniadanie” lub „Po treningu”" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "Opis bądź cel planu, np. \"Zrób masę\" lub \"Przygotuj się na lato\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Wykorzystaj dzienne kalorie" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3295,14 +3222,11 @@ msgstr "Akceptuj" msgid "Decline" msgstr "Odrzuć" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Makroelementy" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "kJ" @@ -3314,8 +3238,6 @@ msgid "n.A." msgstr "N/A" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Inne" @@ -3333,136 +3255,6 @@ msgstr "Edytuj składnik" msgid "Delete ingredient" msgstr "Usuń składnik" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Dziennik diety" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Zaplanowane" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Zapisane" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Różnice" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Wpisy" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "nic nie znaleziono" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Twoje plany żywieniowe" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Zawartość" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Dodaj posiłek" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Dodaj składnik posiłku" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Brak składników dla tego posiłku." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Brak posiłków dla tego planu." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Dodaj ten plan" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Dodaj nowy posiłek" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Wartości odżywcze" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "Oparte na wpisie masy z %(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Sumarycznie" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Procent energii" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g na kg masy ciała" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "Uncja na funt ciała" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Zobacz pełen dziennik żywieniowy" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Cel" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Ustaliłeś, że ten plan żywieniowy ma\n" -" określony cel kaloryczny. Użyj kalkulatora lub wpisz wartość\n" -" samodzielnie." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Jeżeli uważasz listę składników za niewystarczającą, możesz aktywować opcję " -"wyświetlania składników po angielsku." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Edytuj plan żywieniowy" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Skopiuj ten plan żywieniowy" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Usuń plan żywieniowy" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Podstawowy współczynnik metaboliczny" @@ -3566,39 +3358,39 @@ msgstr "" msgid "Add a new ingredient" msgstr "Dodaj nowy składnik" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Składnik został poprawnie oznaczony jako odrzucony" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Usunąć?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Dodaj nowy posiłek" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Edytuj posiłek" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Edytuj składnik posiłku" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Plan diety" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Plan dietetyczny dla %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Pusty plan, czego się spodziewałeś w PDFie?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Wartości odżywcze" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Sumarycznie" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Procent energii" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g na kg masy ciała" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Dodaj nową jednostkę wagi" @@ -3607,6 +3399,10 @@ msgstr "Dodaj nową jednostkę wagi" msgid "Edit a weight unit to ingredient connection" msgstr "Edytuj powiązanie jednostki wagi i skladnika" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Usunąć?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4133,6 +3929,124 @@ msgstr "Usunięto." msgid "Delete weight entry for the %s" msgstr "Usuń wpis wagi dla %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Operacja niedozwolona." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Dokonał się błąd." + +#~ msgid "Add new diary entry" +#~ msgstr "Dodaj nowy wpis dziennika" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Kliknij, aby dodać nowy wpis diety. Możesz dodać posiłek, który " +#~ "zdefiniowano wcześniej lub dodać tak wiele pozycji, jak chcesz." + +#~ msgid "Add custom diary entry" +#~ msgstr "Dodaj niestandardowy wpis" + +#~ msgid "No nutrition plans." +#~ msgstr "Brak planów żywienia." + +#~ msgid "Add nutrition plan" +#~ msgstr "Dodaj plan żywienia" + +#~ msgid "Nutrition diary" +#~ msgstr "Dziennik diety" + +#~ msgid "Planned" +#~ msgstr "Zaplanowane" + +#~ msgid "Logged" +#~ msgstr "Zapisane" + +#~ msgid "Difference" +#~ msgstr "Różnice" + +#~ msgid "Entries" +#~ msgstr "Wpisy" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "nic nie znaleziono" + +#~ msgid "Your nutrition plans" +#~ msgstr "Twoje plany żywieniowe" + +#~ msgid "Contents" +#~ msgstr "Zawartość" + +#~ msgid "Log this meal" +#~ msgstr "Dodaj posiłek" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Dodaj składnik posiłku" + +#~ msgid "No items for this meal." +#~ msgstr "Brak składników dla tego posiłku." + +#~ msgid "No meals for this plan." +#~ msgstr "Brak posiłków dla tego planu." + +#~ msgid "Log this Plan" +#~ msgstr "Dodaj ten plan" + +#~ msgid "Add a new meal" +#~ msgstr "Dodaj nowy posiłek" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Oparte na wpisie masy z %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "Uncja na funt ciała" + +#~ msgid "View complete nutrition log" +#~ msgstr "Zobacz pełen dziennik żywieniowy" + +#~ msgid "Goal" +#~ msgstr "Cel" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Ustaliłeś, że ten plan żywieniowy ma\n" +#~ " określony cel kaloryczny. Użyj kalkulatora lub wpisz wartość\n" +#~ " samodzielnie." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Jeżeli uważasz listę składników za niewystarczającą, możesz aktywować " +#~ "opcję wyświetlania składników po angielsku." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Edytuj plan żywieniowy" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Skopiuj ten plan żywieniowy" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Usuń plan żywieniowy" + +#~ msgid "Add new meal" +#~ msgstr "Dodaj nowy posiłek" + +#~ msgid "Edit meal" +#~ msgstr "Edytuj posiłek" + +#~ msgid "Edit meal item" +#~ msgstr "Edytuj składnik posiłku" + #~ msgid "Free license" #~ msgstr "Darmowa licencja" @@ -4148,9 +4062,6 @@ msgstr "Usuń wpis wagi dla %s" #~ "nazwa %(name)s jest podobna do już istniejącego ćwiczenia o nazwie " #~ "\"%(exercise_name)s\"" -#~ msgid "Lower back" -#~ msgstr "Mięsień pleców" - #~ msgid "Add training day" #~ msgstr "Dodaj dzień treningowy" diff --git a/wger/locale/pt/LC_MESSAGES/django.po b/wger/locale/pt/LC_MESSAGES/django.po index ec234a723..d20aa97f5 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-07-13 23:50+0000\n" "Last-Translator: Guilherme Salomão \n" -"Language-Team: Portuguese " -"\n" +"Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,8 +43,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -61,57 +61,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Editar" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Treino de exemplo" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Dia de exemplo" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Outro dia de exemplo" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Amostra de plano nutricional" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Espaço reservado para treino nº {0} para agendamento" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Minha agenda de treino" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Agenda de espaço reservado vazia" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Login" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Primeiro nome" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Último nome" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -155,24 +154,24 @@ 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:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Este endereço de e-mail já está sendo usado." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Senha" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Por favor informe a sua senha atual." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -187,41 +186,39 @@ msgstr "Por favor informe a sua senha atual." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Remover" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Senha inválida" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "O formulário está seguro com o reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Cadastro" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Contato" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Meios de contato (e-mail, etc.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Comentário" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "O que você quer dizer?" @@ -253,7 +250,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Abreviação, por exemplo CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Link" @@ -421,7 +418,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Total de ingestão calórica, incluindo qualquer excedente" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Unidade de peso" @@ -450,16 +447,16 @@ msgid "The sum of all hours has to be 24" msgstr "A soma de todas as horas deve ser 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -471,8 +468,8 @@ msgid "Forbidden!" msgstr "Proibido!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Algo que não é permitido aconteceu." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -482,13 +479,20 @@ msgstr "Página não encontrada" msgid "The page you requested does not exist." msgstr "A página que você solicitou não existe." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Um erro ocorreu" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Aconteceu algo que causou um erro." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -508,7 +512,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Voltar a \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Compartilha" @@ -518,7 +522,9 @@ msgstr "" "Você tem certeza que quer remover isto? Esta ação não pode ser desfeita." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "E-mail verificado" #: core/templates/email_verification/confirm_template.html:18 @@ -577,9 +583,9 @@ msgstr "" "Clique para adicionar registros de peso a um\n" " dia de treinamento no seu treino atual:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -587,41 +593,7 @@ msgstr "" msgid "Close" msgstr "Fechar" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Adicione uma nova entrada diária" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Clique aqui para adicionar uma anotação ao seu diário alimentar. Você pode " -"registrar uma refeição como você a definiu ou inserir um número de entradas " -"personalizadas." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Adicionar entrada de diário personalizada" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -632,11 +604,11 @@ msgstr "Adicionar entrada de diário personalizada" msgid "Workout" msgstr "Treino" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Este treino é parte de um plano:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -644,84 +616,27 @@ msgstr "" "O treino atual é selecionado a partir de sua programação ativa ou, se você " "não tiver, simplesmente por data." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Adicionar um novo registro" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Nenhum treino encontrado." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Adicionar um agora." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Plano de nutrição" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energia" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Proteína" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Carboidratos" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Gordura" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Nenhum plano de nutrição." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -730,12 +645,12 @@ msgstr "Nenhum plano de nutrição." msgid "Weight" msgstr "Peso" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Adicionar uma entrada para peso" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Idiomas" @@ -746,8 +661,8 @@ msgstr "Não encontrado." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -770,7 +685,7 @@ msgstr "Adicionar" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Opções" @@ -781,8 +696,8 @@ msgstr "Lista de licença" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -800,8 +715,7 @@ msgstr "Lista de licença" msgid "Nothing found" msgstr "Nada encontrado" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Imprimir" @@ -818,8 +732,6 @@ msgstr "" " externo." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Isso é feito aqui" @@ -851,148 +763,154 @@ msgstr "Horários de treinos" msgid "Calendar" msgstr "Calendário" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Macronutrientes" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galeria" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Modelos de treino" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Seus modelos" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Modelos públicos" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Exercícios" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administração" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Histórico de edição do exercício" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Equipamento" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Músculos" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Categorias" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Nutrição" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Planos de nutrição" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Calculadora IMC" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Calculador de calorias diárias" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Visão geral do ingrediente" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Unidade de peso dos ingredientes" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ingredientes pendendo revisão" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Peso Corporal" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Visão geral do peso" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Sobre este software" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Sobre nós" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "API REST" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licença" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Documentação do desenvolvedor" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Obtenha o código fonte" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Traduzir" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Redefinr a senha" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Minhas preferências" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Sair" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licenças" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Unidades de repetição" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Unidade de peso" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Lista de utilizadores" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Academias" @@ -1046,14 +964,6 @@ msgstr "Obrigado por usar o nosso site!" msgid "The %(site_name)s team" msgstr "O time do %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "info da solicitação" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "info da resposta" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "Anterior" @@ -1094,19 +1004,19 @@ msgstr "Repetições" msgid "RiR" msgstr "ReR" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Crie alguns registros de demonstração" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Termos de uso" @@ -1192,15 +1102,15 @@ msgstr "Esqueceu a senha?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "último %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1213,24 +1123,25 @@ msgid "Add workout" msgstr "Adicionar treino" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Data" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "descrição" @@ -1253,7 +1164,7 @@ msgstr "Log" msgid "General impression" msgstr "Impressão geral" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1263,18 +1174,37 @@ msgstr "Notas" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Tempo" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "adicionar plano de nutrição" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energia" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Proteína" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Carboidratos" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Gordura" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1284,111 +1214,111 @@ msgstr "adicionar plano de nutrição" msgid "Actions" msgstr "Ações" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Utilizador desativado" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Utilizador ativo" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Redefinir a senha de utilizador" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Papéis" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Confirmação de redefinição da palavra-passe" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Você realmente deseja alterar a senha deste utilizador' ?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Não" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Sim" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Detalhes" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Nr." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefone" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Endereço" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Registrado" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Último Login" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Estado" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Ativo" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inativo" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Contratos" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Documentos" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Descarregar" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Configuração" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Incluir na visão geral inativa" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" "O login de administrador está disponível apenas para usuários no %(gym_name)s" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Logado como este utilizador" @@ -1416,7 +1346,7 @@ msgstr "É preciso verificar seu e-mail para contribuir com exercícios" msgid "Change password" msgstr "Mudar senha" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1432,7 +1362,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1446,7 +1376,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Apagado com sucesso" @@ -1457,8 +1387,7 @@ msgstr "Apagado com sucesso" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Remover {0}?" @@ -1472,12 +1401,12 @@ msgstr "Remover {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Editar {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1487,19 +1416,19 @@ 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/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Dia de descanso" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Opiniões" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Submeter" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "O seu feedback foi enviado com sucesso. Obrigado!" @@ -1549,19 +1478,19 @@ msgstr "Academia" msgid "A verification email was sent to %(email)s" msgstr "Um e-mail de verificação foi enviado para %(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Categoria" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Músculos primários" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Músculos secundários" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Variações" @@ -1579,8 +1508,8 @@ msgstr "Exercício" msgid "A comment about how to correctly do this exercise." msgstr "Um comentário sobre como executar corretamente este exercício." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Idioma" @@ -1715,8 +1644,8 @@ msgstr "Ação" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Utilizador" @@ -1838,7 +1767,7 @@ msgstr "Tipo de contrato" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Quantidade" @@ -2167,63 +2096,67 @@ msgid "Legs" msgstr "Pernas" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Lombar" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Max. de Repetições" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Milhas" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "Milhas por Hora" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minutos" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "Pratos" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Barra de puxar" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Quadríceps" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Repeticões" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "Barra SZ" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Segundos" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Ombros" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Bola Suíça" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "Tríceps" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Até falhar" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "nenhum (exercício corporal)" @@ -2308,7 +2241,7 @@ msgstr "Também buscar nomes em inglês" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Unidade" @@ -2384,7 +2317,7 @@ msgid "The duration in weeks" msgstr "A duração em semanas" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Ordem" @@ -2442,7 +2375,7 @@ msgstr "Número de conjuntos" msgid "Sets" msgstr "Conjuntos" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Data criação" @@ -2682,7 +2615,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Baixe como PDF" @@ -2916,7 +2848,7 @@ msgstr "Nova impressão do treino para {0}" msgid "This will delete all weight logs for this day as well." msgstr "Isto apagará todos os logs de pesos para este dia também." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Valor" @@ -2957,61 +2889,50 @@ msgstr "" "um número negativo)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Ingrediente" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "Em kcal por 100g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "Em g por 100g do produto" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Açúcar contido nos carboidratos" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Gordura saturada contida nas gorduras" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Fibras" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Sódio" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Link para o produto" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Nome da marca do produto" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3022,15 +2943,15 @@ msgstr "" "por proteínas, carboidratos e gordura ({energy_calculated}kcal +/-" "{energy_approx}%)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Ingrediente foi adicionado ao banco de dados geral com sucesso" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Novo ingrediente submetido por utilizador" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "O utilizador {0} submeteu um novo ingrediente \"{1}\"." @@ -3047,19 +2968,24 @@ msgstr "total em gramas" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Unidade para quantidade, ex. \"1 xícara\" ou \"1/2 colher\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Plano de nutrição" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Refeição" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "Data e Hora (aprox.)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Tempo (aproximado)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" @@ -3067,7 +2993,7 @@ msgstr "" "Dar às refeições uma descrição textual / nome como \"Café da manhã\" ou " "\"pós-treino\"" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3075,11 +3001,11 @@ msgstr "" "Uma descrição do objetivo do plano, e.x. \"Ganhar mass\" ou \"Preparação " "para o verão\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Utilizar as calorias diária" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3246,14 +3172,11 @@ msgstr "Aceito" msgid "Decline" msgstr "Recusar" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Macronutrientes" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "Kj" @@ -3265,8 +3188,6 @@ msgid "n.A." msgstr "n.d." #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Outros" @@ -3284,135 +3205,6 @@ msgstr "Edite ingrediente" msgid "Delete ingredient" msgstr "Apagar ingrediente" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Diário de nutrição" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Planejado" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Registrado" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Diferença" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Entradas" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "nada encontrado" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Seus planos de nutrição" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Conteúdo" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Registrar esta refeição" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Adicionar ingrediente à refeição" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Nenhum item para esta refeição." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Nenhuma refeição para este plano." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Registrar este plano" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Adicionar uma nova refeição" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Dados nutricionais" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "Com base na entrada de peso datada de %(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Total" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Percentagem de energia" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g por kg de corpo" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz por libra-peso corporal" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Ver o registro nutricional completo" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Objetivo" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Você selecionou que este plano de nutrição possui\n" -"uma meta de calorias. Use a calculadora ou entre com o valor você mesmo." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Se você achar a lista de ingredientes muito curta, você talvez queira ativar " -"a preferência para visualizar os ingrediente em inglês." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Edite plano de nutrição" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Faça uma cópia deste plano de nutrição" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Apagar plano de nutrição" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Taxa metabólica basal" @@ -3513,39 +3305,39 @@ msgstr "56 a 90" msgid "Add a new ingredient" msgstr "Adicione um novo ingrediente" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Ingrediente foi marcado como rejeitado com sucesso" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Apagar?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Adicionar nova refeição" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Edite refeição" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Edite item da refeição" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Plano nutricional" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "Plano nutricional para %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Este é um plano vazio, o quê você esperava no PDF?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Dados nutricionais" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Total" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Percentagem de energia" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g por kg de corpo" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Adicionar uma nova unidade de peso" @@ -3554,6 +3346,10 @@ msgstr "Adicionar uma nova unidade de peso" msgid "Edit a weight unit to ingredient connection" msgstr "Edite uma unidade de peso para a conecção do ingrediente" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Apagar?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4067,6 +3863,130 @@ msgstr "Excluído com sucesso." msgid "Delete weight entry for the %s" msgstr "Excluir entrada de peso para %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Algo que não é permitido aconteceu." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Aconteceu algo que causou um erro." + +#~ msgid "Add new diary entry" +#~ msgstr "Adicione uma nova entrada diária" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Clique aqui para adicionar uma anotação ao seu diário alimentar. Você " +#~ "pode registrar uma refeição como você a definiu ou inserir um número de " +#~ "entradas personalizadas." + +#~ msgid "Add custom diary entry" +#~ msgstr "Adicionar entrada de diário personalizada" + +#~ msgid "No nutrition plans." +#~ msgstr "Nenhum plano de nutrição." + +#~ msgid "request info" +#~ msgstr "info da solicitação" + +#~ msgid "response info" +#~ msgstr "info da resposta" + +#~ msgid "Add nutrition plan" +#~ msgstr "adicionar plano de nutrição" + +#~ msgid "Nutrition diary" +#~ msgstr "Diário de nutrição" + +#~ msgid "Planned" +#~ msgstr "Planejado" + +#~ msgid "Logged" +#~ msgstr "Registrado" + +#~ msgid "Difference" +#~ msgstr "Diferença" + +#~ msgid "Entries" +#~ msgstr "Entradas" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "nada encontrado" + +#~ msgid "Your nutrition plans" +#~ msgstr "Seus planos de nutrição" + +#~ msgid "Contents" +#~ msgstr "Conteúdo" + +#~ msgid "Log this meal" +#~ msgstr "Registrar esta refeição" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Adicionar ingrediente à refeição" + +#~ msgid "No items for this meal." +#~ msgstr "Nenhum item para esta refeição." + +#~ msgid "No meals for this plan." +#~ msgstr "Nenhuma refeição para este plano." + +#~ msgid "Log this Plan" +#~ msgstr "Registrar este plano" + +#~ msgid "Add a new meal" +#~ msgstr "Adicionar uma nova refeição" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "Com base na entrada de peso datada de %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "oz por libra-peso corporal" + +#~ msgid "View complete nutrition log" +#~ msgstr "Ver o registro nutricional completo" + +#~ msgid "Goal" +#~ msgstr "Objetivo" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Você selecionou que este plano de nutrição possui\n" +#~ "uma meta de calorias. Use a calculadora ou entre com o valor você mesmo." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Se você achar a lista de ingredientes muito curta, você talvez queira " +#~ "ativar a preferência para visualizar os ingrediente em inglês." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Edite plano de nutrição" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Faça uma cópia deste plano de nutrição" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Apagar plano de nutrição" + +#~ msgid "Add new meal" +#~ msgstr "Adicionar nova refeição" + +#~ msgid "Edit meal" +#~ msgstr "Edite refeição" + +#~ msgid "Edit meal item" +#~ msgstr "Edite item da refeição" + #~ msgid "Free license" #~ msgstr "Licença livre" @@ -4085,9 +4005,6 @@ msgstr "Excluir entrada de peso para %s" #~ "%(name_original)s é muito semelhante ao exercício existente " #~ "\"%(exercise_name)s\"" -#~ msgid "Lower back" -#~ msgstr "Lombar" - #~ msgid "Add training day" #~ msgstr "Adicione um dia de treino" diff --git a/wger/locale/ro/LC_MESSAGES/django.po b/wger/locale/ro/LC_MESSAGES/django.po index 024feccf3..5dd1f8e66 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-11-24 01:08+0000\n" "Last-Translator: dimii27 \n" "Language-Team: Romanian \n" @@ -40,8 +40,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -58,58 +58,57 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Editare" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Workout de probă" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Zi de probă" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Altă zi de probă" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Plan nutrițional de probă" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Substituent workout nr {0} pentru program" -#: core/demo.py:352 +#: core/demo.py:353 #, fuzzy msgid "My cool workout schedule" msgstr "Programul meu cool de antrenament" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Program substituent gol" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Login" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Prenume" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Nume" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -122,8 +121,8 @@ msgstr "Adresa de email" #: core/forms.py:112 msgid "Used for password resets and, optionally, e-mail reminders." msgstr "" -"Folosit pentru resetarea parolei și, opțional, pentru memento-uri prin " -"e-mail." +"Folosit pentru resetarea parolei și, opțional, pentru memento-uri prin e-" +"mail." #: core/forms.py:116 core/models/profile.py:224 #: gym/templates/gym/new_user.html:38 @@ -155,24 +154,24 @@ msgstr "" "Folosit pentru resetarea parolei și, opțional, pentru memento-uri prin e-" "mail." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Acest email este deja în uz." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Parola" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Te rog introdu parola curentă" -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -187,41 +186,39 @@ msgstr "Te rog introdu parola curentă" #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Ștergere" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Parola incorectă" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Acest formular este securizat cu reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Inregistreaza-te" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Contact" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Metodă de contactare (e-mail, etc.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Comentariu" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Ce vrei să spui?" @@ -253,7 +250,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Nume scurt, de ex. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Link" @@ -422,7 +419,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "" @@ -449,16 +446,16 @@ msgid "The sum of all hours has to be 24" msgstr "" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -470,7 +467,7 @@ msgid "Forbidden!" msgstr "" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." +msgid "You are not allowed to acces this page" msgstr "" #: core/templates/404.html:4 @@ -481,12 +478,19 @@ msgstr "" msgid "The page you requested does not exist." msgstr "" -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 @@ -503,7 +507,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "" @@ -512,8 +516,10 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "" #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Administration" +msgid "Email verification" +msgstr "Administrație" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -571,9 +577,9 @@ msgid "" " day in your current workout:" msgstr "" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -581,38 +587,7 @@ msgstr "" msgid "Close" msgstr "" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -623,94 +598,37 @@ msgstr "" msgid "Workout" msgstr "" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "" -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "" -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "" - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -719,12 +637,12 @@ msgstr "" msgid "Weight" msgstr "" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Limbi" @@ -735,8 +653,8 @@ msgstr "" #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -759,7 +677,7 @@ msgstr "Adăugare" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Opțiuni" @@ -770,8 +688,8 @@ msgstr "" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -789,8 +707,7 @@ msgstr "" msgid "Nothing found" msgstr "" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -805,8 +722,6 @@ msgid "" msgstr "" #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "" @@ -835,152 +750,156 @@ msgstr "" msgid "Calendar" msgstr "" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +msgid "Measurements" +msgstr "" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 #, fuzzy #| msgid "Workout reminders" msgid "Workout templates" msgstr "Mementouri de antrenament" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Exerciții" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administrație" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercise Categories" msgid "Exercise edit history" msgstr "Categorii de Exerciții" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Mușchii" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "" @@ -1032,14 +951,6 @@ msgstr "Mulțumiri pentru utilizarea sitului nostru!" msgid "The %(site_name)s team" msgstr "Echipa %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "" @@ -1080,17 +991,17 @@ msgstr "" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "" @@ -1166,15 +1077,15 @@ msgstr "" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1187,24 +1098,25 @@ msgid "Add workout" msgstr "" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Data" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Descriere" @@ -1227,7 +1139,7 @@ msgstr "" msgid "General impression" msgstr "" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1237,18 +1149,37 @@ msgstr "" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" msgstr "" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1258,110 +1189,110 @@ msgstr "" msgid "Actions" msgstr "" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Confirmare resetare parolă" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Nr." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "" @@ -1389,7 +1320,7 @@ msgstr "" msgid "Change password" msgstr "" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "" @@ -1405,7 +1336,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "" @@ -1419,7 +1350,7 @@ msgstr "" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "" @@ -1430,8 +1361,7 @@ msgstr "" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Ștergere {0}?" @@ -1445,31 +1375,31 @@ msgstr "Ștergere {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Editare {0}?" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " "do. Feel free to edit or delete them!" msgstr "" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "" @@ -1519,19 +1449,19 @@ msgstr "" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Categoria" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Mușchii primari" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Mușchii secundari" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1549,8 +1479,8 @@ msgstr "Exercițiu" msgid "A comment about how to correctly do this exercise." msgstr "Comentariu despre modul de a face acest exercițiu corect." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Limba" @@ -1694,8 +1624,8 @@ msgstr "Opțiuni" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Utilizator" @@ -1821,7 +1751,7 @@ msgstr "" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "" @@ -2148,65 +2078,69 @@ msgid "Legs" msgstr "Picioare" #: i18n.tpl:22 -msgid "Max Reps" +msgid "Lower back" msgstr "" #: i18n.tpl:23 +msgid "Max Reps" +msgstr "" + +#: i18n.tpl:24 msgid "Miles" msgstr "Mile" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minute" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Bara de tragere" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "SZ-Bar" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Secunde" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Umeri" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Minge Elvețiană" -#: i18n.tpl:34 +#: i18n.tpl:35 #, fuzzy #| msgid "Triceps brachii" msgid "Triceps" msgstr "Triceps brachii" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Până la eșec" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "nici unul (exercițiu cu greutate corporală)" @@ -2287,7 +2221,7 @@ msgstr "Folosește și ingrediente din limba Engleză" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "" @@ -2356,7 +2290,7 @@ msgid "The duration in weeks" msgstr "" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "" @@ -2411,7 +2345,7 @@ msgstr "" msgid "Sets" msgstr "" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "" @@ -2618,7 +2552,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "" @@ -2829,7 +2762,7 @@ msgstr "" msgid "This will delete all weight logs for this day as well." msgstr "" -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -2874,61 +2807,50 @@ msgid "" msgstr "" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -2936,15 +2858,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "" @@ -2961,35 +2883,40 @@ msgstr "" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3138,14 +3065,11 @@ msgstr "Acceptare" msgid "Decline" msgstr "Declinare" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3157,8 +3081,6 @@ msgid "n.A." msgstr "" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "" @@ -3176,131 +3098,6 @@ msgstr "" msgid "Delete ingredient" msgstr "" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "" - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "" - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "" @@ -3385,37 +3182,37 @@ msgstr "" msgid "Add a new ingredient" msgstr "" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" +#: nutrition/views/plan.py:119 +msgid "Nutritional plan" msgstr "" -#: nutrition/views/meal.py:55 -msgid "Add new meal" +#: nutrition/views/plan.py:121 +#, python-format +msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/meal.py:80 -msgid "Edit meal" +#: nutrition/views/plan.py:195 +msgid "This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" +#: nutrition/views/plan.py:230 +msgid "Total" msgstr "" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3426,6 +3223,10 @@ msgstr "" msgid "Edit a weight unit to ingredient connection" msgstr "" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " diff --git a/wger/locale/ru/LC_MESSAGES/django.po b/wger/locale/ru/LC_MESSAGES/django.po index 976143f9b..14a09d177 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2022-05-24 21:14+0000\n" "Last-Translator: Konstantin \n" "Language-Team: Russian \n" @@ -44,8 +44,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -62,59 +62,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Редактировать" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Пример тренировки" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Пример дня" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Другой пример дня" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "Пример плана питания" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "«Заполнитель» тренировки № {0} для программы" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Моя прикольная программа тренировки" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Пустая программа-«заполнитель»" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Войти" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Имя" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Фамилия" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -158,24 +157,24 @@ msgstr "" "Необходимо для возобновлений пароля, и выборочно, напоминаний по электронной " "почте." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Этот электронный адрес уже используется." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Пароль" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Пожалуйста, введите ваш пароль." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -190,41 +189,39 @@ msgstr "Пожалуйста, введите ваш пароль." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Удалить" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Неверный пароль" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Данная форма защищена reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Зарегистрироваться" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Контакт" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Обратная связь с вами (электронная почта, и т.д.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Комментарий" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Что Вы имеете в виду?" @@ -256,7 +253,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Краткое название, например, CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Ссылка" @@ -425,7 +422,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Общее потребление калорий, в том числе, любой излишек" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Единица веса" @@ -455,16 +452,16 @@ msgid "The sum of all hours has to be 24" msgstr "Сумма всех часов должна быть 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -476,8 +473,8 @@ msgid "Forbidden!" msgstr "Запрещено!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Произошли недопустимые действия." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -487,13 +484,20 @@ msgstr "Страницу не найдено" msgid "The page you requested does not exist." msgstr "Страница, на которую Вы подали запрос, не существует." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Произошла ошибка" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Произошли действия, которые вызвали ошибку." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, fuzzy, python-format @@ -518,7 +522,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Вернуться к \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Поделиться" @@ -527,8 +531,10 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Вы уверены что хотите это удалить? Это действие необратимо." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Configuration" +msgid "Email verification" +msgstr "Конфигурация" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -593,9 +599,9 @@ msgstr "" "Нажмите для добавления весов в тренировочный\n" "день для текущей тренировки:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -603,41 +609,7 @@ msgstr "" msgid "Close" msgstr "Закрыть" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Добавить новую запись в дневник" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Нажмите, чтобы добавить запись в дневник питания на сегодня. Вы можете либо " -"записать прием пищи в том виде, в котором вы его определили, либо ввести " -"любое количество пользовательских записей." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "ккал" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Добавить пользовательскую запись в дневник" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -648,11 +620,11 @@ msgstr "Добавить пользовательскую запись в дне msgid "Workout" msgstr "Тренировка" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Эта тренировка - часть программы:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -660,84 +632,27 @@ msgstr "" "Текущая тренировка выбирается из вашего активного расписания или, если у вас " "его нет, просто по дате." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Добавить новый журнал" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Тренировок не найдено." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Добавить одну сейчас." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Программа питания" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Энергия" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Белки" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Углеводы" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Жиры" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Программ питания нет." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -746,12 +661,12 @@ msgstr "Программ питания нет." msgid "Weight" msgstr "Вес" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Добавить запись веса" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Языки" @@ -762,8 +677,8 @@ msgstr "Ничего не найдено." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -786,7 +701,7 @@ msgstr "Добавить" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Опции" @@ -797,8 +712,8 @@ msgstr "Список лицензий" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -816,8 +731,7 @@ msgstr "Список лицензий" msgid "Nothing found" msgstr "Ничего не найдено" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Отпечаток" @@ -836,8 +750,6 @@ msgstr "" "Для публикации ссылок в социальных сетях необходимо разрешить внешний доступ." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Это можно сделать тут" @@ -872,150 +784,156 @@ msgstr "Программы тренировок" msgid "Calendar" msgstr "Календарь" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Макронутриенты" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Галерея" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Шаблоны тренировок" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Ваши шаблоны" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Общедоступные шаблоны" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Упражнения" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Администрация" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercise day" msgid "Exercise edit history" msgstr "День упражнений" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Спортивное оборудование" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Мышцы" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Категории" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Питание" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Программы питания" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Калькулятор индекса массы тела" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Калькулятор ежедневных калорий" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Обзор ингредиентов" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Единицы веса ингредиентов" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ингредиенты ожидающие рассмотрения" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Вес тела" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Обзор веса" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Об этой программе" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "О нас" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Лицензия" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Документация для разработчиков" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Получить код" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Перевести" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Восстановить пароль" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Мои настройки" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Выйти" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Лицензии" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Единицы повторения" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Единицы веса" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Список пользователей" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Тренажерные залы" @@ -1069,14 +987,6 @@ msgstr "Спасибо за пользование нашим сайтом!" msgid "The %(site_name)s team" msgstr "Команда %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "предыдущий" @@ -1118,19 +1028,19 @@ msgstr "Повтор" msgid "RiR" msgstr "ПвЗ" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" "Вы используете аккаунт для гостей, введенные данные будут удалены через " "неделю." -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Создайте демо-записи" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Условия обслуживания" @@ -1217,15 +1127,15 @@ msgstr "Забыли пароль?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "Последние %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1238,24 +1148,25 @@ msgid "Add workout" msgstr "Добавить тренировку" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Дата" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Описание" @@ -1278,7 +1189,7 @@ msgstr "Журнал" msgid "General impression" msgstr "Общее впечатление" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1288,18 +1199,37 @@ msgstr "Заметки" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Время" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Добавить программу питания" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Энергия" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Белки" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Углеводы" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Жиры" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "ккал" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1309,110 +1239,110 @@ msgstr "Добавить программу питания" msgid "Actions" msgstr "Действия" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Деактивировать пользователя" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Активировать пользователя" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Сброс пароля пользователя" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Роли" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Подтверждение восстановления пароля" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Вы действительно хотите изменить пароль этого пользователя?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Нет" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Да" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Детали" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "№" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Телефон" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Адрес" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Зарегистрировано" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Последний вход" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Статус" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Активные" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Неактивные" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Контакты" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Документы" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Загрузка" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Конфигурация" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Включить в обзор неактивных" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "Вход администратора доступен только для пользователей в %(gym_name)s" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Войти в систему как этот пользователь" @@ -1442,7 +1372,7 @@ msgstr "" msgid "Change password" msgstr "Изменить" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "кг" @@ -1458,7 +1388,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "г" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1472,7 +1402,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Успешно удалено" @@ -1483,8 +1413,7 @@ msgstr "Успешно удалено" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Удалить {0}?" @@ -1498,12 +1427,12 @@ msgstr "Удалить {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Редактировать {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1513,19 +1442,19 @@ msgstr "" "масс тела и плана питания для наглядного примера возможностей этого сайта. " "Вы можете их изменить или удалить!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Выходной день" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Отзывы" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Отправить" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Ваш отзыв был успешно отправлен. Спасибо!" @@ -1575,19 +1504,19 @@ msgstr "Тренажерный зал" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Категория" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Основные мышцы" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Второстепенные мышцы" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Вариации" @@ -1605,8 +1534,8 @@ msgstr "Упражнение" msgid "A comment about how to correctly do this exercise." msgstr "Коментарий о том, как правильно выполнять это упражнение." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Язык" @@ -1752,8 +1681,8 @@ msgstr "Действия" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Пользователь" @@ -1884,7 +1813,7 @@ msgstr "Форма контракта" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Количество" @@ -2221,65 +2150,69 @@ msgid "Legs" msgstr "Ноги" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Поясница" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Макс. Повтор" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Миль" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Минут" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Брус для подтягивания" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Повторений" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "SZ-Штанга" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Секунд" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Плечи" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Фитбол" -#: i18n.tpl:34 +#: i18n.tpl:35 #, fuzzy #| msgid "Triceps brachii" msgid "Triceps" msgstr "Трицепс" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "До отказа" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "Никакое (упражнение с весом тела)" @@ -2366,7 +2299,7 @@ msgstr "Компоненты также на английском языке" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Секция" @@ -2442,7 +2375,7 @@ msgid "The duration in weeks" msgstr "Длительность в неделях" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Порядок" @@ -2497,7 +2430,7 @@ msgstr "Количество подходов" msgid "Sets" msgstr "Подходы" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Дата создания" @@ -2769,7 +2702,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Скачать в формате PDF" @@ -3004,7 +2936,7 @@ msgstr "Новое впечатление от тренировки для {0}" msgid "This will delete all weight logs for this day as well." msgstr "Это приведет также к удалению всех записей весов за этот день." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 #, fuzzy msgid "Value" msgstr "Значение" @@ -3052,61 +2984,50 @@ msgstr "" "введите отрицательное число)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Ингредиент" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "В ккал на 100г" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "В г на 100г продукта" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Содержание сахара в углеводах" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Содержание насыщенных жиров в жирах" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Клетчатка (пищевые волокна)" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Натрий" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Ссылка на продукт" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Название бренда продукта" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3117,15 +3038,15 @@ msgstr "" "обеспечиваемой белками, углеводами и жирами ({energy_calculated} ккал +/- " "{energy_approx} %)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Ингредиент успешно добавлен в общую базу данных" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Новый ингредиент представленный пользователем" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Пользователь {0} представил новый ингредиент \"{1}\"." @@ -3142,21 +3063,26 @@ msgstr "Количество в граммах" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Единица измерения количества, например \"1 чашка\" или \"1/2 ложки\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Программа питания" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Прием пищи" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 #, fuzzy #| msgid "Time (approx)" msgid "Date and Time (Approx.)" msgstr "Время (приблизительно)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Время (приблизительно)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" @@ -3164,18 +3090,18 @@ msgstr "" "Дайте блюдам текстовое описание / название, например, \"Завтрак\" или " "\"После тренировки\"" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "" "Описание цели плана, например \"Набрать вес\" или \"Подготовка к лету\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Используйте ежедневныу калории" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3336,14 +3262,11 @@ msgstr "Принять" msgid "Decline" msgstr "Отклонить" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Макронутриенты" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "кДж" @@ -3355,8 +3278,6 @@ msgid "n.A." msgstr "не имеется в наличии" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Другие" @@ -3374,137 +3295,6 @@ msgstr "Изменить ингредиент" msgid "Delete ingredient" msgstr "Удалить ингредиент" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Дневник питания" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Запланировано" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Записано" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Разница" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Записи" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "г" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "ничего не найдено" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Ваши планы питания" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Содержимое" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Записать это блюдо" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Добавить ингредиент к блюду" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Нет элементов для этого блюда." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Нет блюд для этого плана." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Записать этот план" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Добавить новое блюдо" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Пищевые данные" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "На основании записи веса от %(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Итого" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Процент энергии" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "г на кг тела" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz на lb тела" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Просмотреть полный журнал питания" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Цель" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Вы указали, что этот план питания имеет\n" -" цель количества калорий. Используйте калькулятор или введите " -"значение\n" -" самостоятельно." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Если вы находите список ингредиентов слишком коротким, вы можете включить " -"предпочтение для просмотра ингредиентов также на английском языке." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Изменить план питания" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Сделать копию этого плана питания" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Удалить план питания" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Уровень базального метаболизма" @@ -3605,39 +3395,39 @@ msgstr "" msgid "Add a new ingredient" msgstr "Добавить новый ингредиент" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Ингредиент был успешно помечен как отклонённые" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Удалить?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Добавить новое блюдо" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Редактировать блюдо" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Редактировать элемент блюда" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "План питания" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "План питания для %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Это пустой план, что Вы ожидали в PDF?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Пищевые данные" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Итого" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Процент энергии" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "г на кг тела" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Добавить новую единицу веса" @@ -3646,6 +3436,10 @@ msgstr "Добавить новую единицу веса" msgid "Edit a weight unit to ingredient connection" msgstr "Изменить единицу веса соединения ингредиентов" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Удалить?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4174,6 +3968,126 @@ msgstr "Успешно удалено." msgid "Delete weight entry for the %s" msgstr "Удалить запись о весе для %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Произошли недопустимые действия." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Произошли действия, которые вызвали ошибку." + +#~ msgid "Add new diary entry" +#~ msgstr "Добавить новую запись в дневник" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Нажмите, чтобы добавить запись в дневник питания на сегодня. Вы можете " +#~ "либо записать прием пищи в том виде, в котором вы его определили, либо " +#~ "ввести любое количество пользовательских записей." + +#~ msgid "Add custom diary entry" +#~ msgstr "Добавить пользовательскую запись в дневник" + +#~ msgid "No nutrition plans." +#~ msgstr "Программ питания нет." + +#~ msgid "Add nutrition plan" +#~ msgstr "Добавить программу питания" + +#~ msgid "Nutrition diary" +#~ msgstr "Дневник питания" + +#~ msgid "Planned" +#~ msgstr "Запланировано" + +#~ msgid "Logged" +#~ msgstr "Записано" + +#~ msgid "Difference" +#~ msgstr "Разница" + +#~ msgid "Entries" +#~ msgstr "Записи" + +#~ msgid "g" +#~ msgstr "г" + +#~ msgid "nothing found" +#~ msgstr "ничего не найдено" + +#~ msgid "Your nutrition plans" +#~ msgstr "Ваши планы питания" + +#~ msgid "Contents" +#~ msgstr "Содержимое" + +#~ msgid "Log this meal" +#~ msgstr "Записать это блюдо" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Добавить ингредиент к блюду" + +#~ msgid "No items for this meal." +#~ msgstr "Нет элементов для этого блюда." + +#~ msgid "No meals for this plan." +#~ msgstr "Нет блюд для этого плана." + +#~ msgid "Log this Plan" +#~ msgstr "Записать этот план" + +#~ msgid "Add a new meal" +#~ msgstr "Добавить новое блюдо" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "На основании записи веса от %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "oz на lb тела" + +#~ msgid "View complete nutrition log" +#~ msgstr "Просмотреть полный журнал питания" + +#~ msgid "Goal" +#~ msgstr "Цель" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Вы указали, что этот план питания имеет\n" +#~ " цель количества калорий. Используйте калькулятор или введите " +#~ "значение\n" +#~ " самостоятельно." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Если вы находите список ингредиентов слишком коротким, вы можете включить " +#~ "предпочтение для просмотра ингредиентов также на английском языке." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Изменить план питания" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Сделать копию этого плана питания" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Удалить план питания" + +#~ msgid "Add new meal" +#~ msgstr "Добавить новое блюдо" + +#~ msgid "Edit meal" +#~ msgstr "Редактировать блюдо" + +#~ msgid "Edit meal item" +#~ msgstr "Редактировать элемент блюда" + #~ msgid "Free license" #~ msgstr "Свободная лицензия" @@ -4192,9 +4106,6 @@ msgstr "Удалить запись о весе для %s" #~ "%(name_original)s слишком похоже на существующее упражнение " #~ "\"%(exercise_name)s\"" -#~ msgid "Lower back" -#~ msgstr "Поясница" - #~ msgid "Add training day" #~ msgstr "Добавить тренировочный день" diff --git a/wger/locale/sv/LC_MESSAGES/django.po b/wger/locale/sv/LC_MESSAGES/django.po index 1801b09ab..167733699 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-01-18 17:47+0000\n" "Last-Translator: tygyh \n" "Language-Team: Swedish \n" @@ -39,8 +39,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -57,59 +57,58 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Redigera" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Exempelpass" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Exempeldag" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Annan exempeldag" -#: core/demo.py:211 +#: core/demo.py:212 #, fuzzy #| msgid "Sample nutrional plan" msgid "Sample nutritional plan" msgstr "Exempel kostplan" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Platshållarpass nr {0} till schema" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Mitt coola träningsschema" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Tom platshållarschema" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Logga in" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Förnamn" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Efternamn" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -153,24 +152,24 @@ 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:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Denna mail används redan." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Lösenord" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Vänligen ange ditt nuvarande lösenord." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -185,41 +184,39 @@ msgstr "Vänligen ange ditt nuvarande lösenord." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Ta bort" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Ogiltigt lösenord" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Formuläret är säkrat med reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Registrera dig" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Kontakt" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Något sätt att svara dig (e-post osv.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Kommentar" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Vad vill du säga?" @@ -251,7 +248,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Kort namn, t.ex. OM-AR-OU 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Länk" @@ -414,7 +411,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Totala kaloriintaget, inklusive t.ex. eventuellt överskott" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Viktenhet" @@ -444,16 +441,16 @@ msgid "The sum of all hours has to be 24" msgstr "Summan av alla timmar måste vara 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -465,8 +462,8 @@ msgid "Forbidden!" msgstr "Förbjudet!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Hände något som inte är tillåtet." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -476,13 +473,20 @@ msgstr "Sidan kunde inte hittas" msgid "The page you requested does not exist." msgstr "Den sida du begärt finns inte." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Ett fel har uppstått" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Hände något som orsakat ett fel." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -498,7 +502,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Tillbaka till \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Dela" @@ -508,8 +512,10 @@ msgstr "" "Är du säkes på att du vill ta bort detta? Denna handilng kan ej ångras." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" -msgstr "" +#, fuzzy +#| msgid "Configuration" +msgid "Email verification" +msgstr "Konfiguration" #: core/templates/email_verification/confirm_template.html:18 #, python-format @@ -573,9 +579,9 @@ msgid "" msgstr "" "Klicka för att lägga viktloggar till en träningsdag i din nuvarande träning:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -583,38 +589,7 @@ msgstr "" msgid "Close" msgstr "Stäng" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "kcal" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -625,94 +600,37 @@ msgstr "" msgid "Workout" msgstr "Träning" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Detta träningspass är del av ett schema:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." msgstr "" -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Lägg till ny logg" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Inga träningspass hittade." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Lägg till ett nu." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Kostplan" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Energi" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Protein" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Kolhydrater" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Fett" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Inga kostplaner." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -721,12 +639,12 @@ msgstr "Inga kostplaner." msgid "Weight" msgstr "Vikt" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Lägg till vikt" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Språk" @@ -737,8 +655,8 @@ msgstr "Ingenting hittades" #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -761,7 +679,7 @@ msgstr "Lägg till" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Alternativ" @@ -772,8 +690,8 @@ msgstr "Licens lista" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -791,8 +709,7 @@ msgstr "Licens lista" msgid "Nothing found" msgstr "Ingenting hittades" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "" @@ -811,8 +728,6 @@ msgstr "" "Innan du delar länkar till sociala medier måste du tillåta extern åtkoms." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Det är gjort här" @@ -847,152 +762,158 @@ msgstr "Träningscheman" msgid "Calendar" msgstr "Kalender" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Makronäringsämnen" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galleri" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 #, fuzzy #| msgid "Workout complete!" msgid "Workout templates" msgstr "Träningsmallar" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Dina mallar" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Publika mallar" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Övningar" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Administration" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 #, fuzzy #| msgid "Exercise day" msgid "Exercise edit history" msgstr "Träningsdag" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Utrustning" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Muskler" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Kategorier" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Kost" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Kostplaner" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "BMI-kalkylator" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Dagliga-kalorier-kalkylator" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Ingrediensöversikt" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Ingrediens viktenheter" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Ingredienser i avvaktan på översyn" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Viktöversikt" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Om programvaran" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Om oss" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Licens" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Dokument för utvecklare" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Hämta koden" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Översätt" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Återställ lösenord" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Mina preferenser" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Logga ut" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Licenser" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Repetitioner" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Viktenheter" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Användarlista" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Gym" @@ -1046,14 +967,6 @@ msgstr "Tack för att du använder vår sida!" msgid "The %(site_name)s team" msgstr "%(site_name)s lag" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "tidigare" @@ -1094,17 +1007,17 @@ msgstr "Reps" msgid "RiR" msgstr "" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Skapa några demoposter" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Villkor för tjänsten" @@ -1188,15 +1101,15 @@ msgstr "Glömt ditt lösenord?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "sista %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1209,24 +1122,25 @@ msgid "Add workout" msgstr "Lägg till träningspass" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Datum" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Beskrivning" @@ -1249,7 +1163,7 @@ msgstr "Log" msgid "General impression" msgstr "Generellt intryck" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1259,18 +1173,37 @@ msgstr "Anteckningar" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Tid" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Lägg till kostplan" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Energi" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Protein" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Kolhydrater" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Fett" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "kcal" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1280,110 +1213,110 @@ msgstr "Lägg till kostplan" msgid "Actions" msgstr "Åtgärder" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Inaktivera användare" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Aktivera användare" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Återställ användarlösenord" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Roller" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Lösenordsåterställningsbekräftelse" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Vill du verkligen ändra denna användares lösenord?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Nej" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Ja" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Detaljer" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Nr." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adress" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Registrerad" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Senaste inloggning" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Status" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Aktiv" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Inaktiv" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Kontrakt" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Dokument" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Hämta" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Konfiguration" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Inkludera i inaktiv överblick" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Logga in som denna användare" @@ -1411,7 +1344,7 @@ msgstr "" msgid "Change password" msgstr "Ändra lösenord" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kg" @@ -1427,7 +1360,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "lb" @@ -1441,7 +1374,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Borttagning genomförd" @@ -1452,8 +1385,7 @@ msgstr "Borttagning genomförd" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Ta bort {0}?" @@ -1467,12 +1399,12 @@ msgstr "Ta bort {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Redigera {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1482,19 +1414,19 @@ msgstr "" "så du kan lära dig hur sidan fungerar. Känn dig fri att ändra eller ta bort " "dom!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Vilodag" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Feedback" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Ladda upp" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Din feedback skickades. Tack!" @@ -1544,19 +1476,19 @@ msgstr "Gym" msgid "A verification email was sent to %(email)s" msgstr "" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Kategori" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Primära muskler" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Sekundära muskler" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "" @@ -1574,8 +1506,8 @@ msgstr "Träning" msgid "A comment about how to correctly do this exercise." msgstr "En kommentar om hur man utför denna övning korrekt." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Språk" @@ -1726,8 +1658,8 @@ msgstr "Åtgärder" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Användare" @@ -1859,7 +1791,7 @@ msgstr "Kontrakttyp" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Mängd" @@ -2193,65 +2125,69 @@ msgid "Legs" msgstr "Ben" #: i18n.tpl:22 +msgid "Lower back" +msgstr "" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Max antal Reps" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Mil" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Minuter" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Pull-up bar" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Repetitioner" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "SZ-Bar" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Sekunder" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Axlar" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Schweizisk boll" -#: i18n.tpl:34 +#: i18n.tpl:35 #, fuzzy #| msgid "Triceps brachii" msgid "Triceps" msgstr "Tricepsbrachii" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Tills Misslyckande" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "ingen (kroppsvikt träning)" @@ -2338,7 +2274,7 @@ msgstr "Också använda ingredienser i Svenska" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Enhet" @@ -2414,7 +2350,7 @@ msgid "The duration in weeks" msgstr "Varaktighet i veckor" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Ordning" @@ -2469,7 +2405,7 @@ msgstr "Antal set" msgid "Sets" msgstr "Set" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Datum för skapande" @@ -2721,7 +2657,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Ladda ner som PDF" @@ -2959,7 +2894,7 @@ msgstr "Nytt träningspassintryck för {0}" msgid "This will delete all weight logs for this day as well." msgstr "Detta kommer ta bort alla viktloggar för denna dag med." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "" @@ -3006,61 +2941,50 @@ msgstr "" "tal)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Ingrediens" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "I kcal per 100g" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "I g per 100g av produkt" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Sockerinehåll i kolhydraterna" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Mättat-fett innehåll i fettet" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Fibrer" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Natrium" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3068,15 +2992,15 @@ msgid "" "{energy_approx}%)" msgstr "" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Ingrediensen lades till den allmänna databasen" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Ny användareinlämnad ingrediens" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Användare {0} har skickat in en ny ingrediens \"{1}\"." @@ -3093,27 +3017,32 @@ msgstr "Mängd i gram" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Enhetsmängd (e.g. \"1 DL\" eller \"1/2 tesked\")" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Kostplan" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Måltid" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 #, fuzzy #| msgid "Time (approx)" msgid "Date and Time (Approx.)" msgstr "Tid (ca)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Tid (ca)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" msgstr "" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3121,11 +3050,11 @@ msgstr "" "En beskrivning av målet för planen, t.ex. \"Gå upp i vikt\" eller " "\"Förbereda mig för sommaren\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Använda dagliga kalorier" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3285,14 +3214,11 @@ msgstr "Acceptera" msgid "Decline" msgstr "Neka" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Makronäringsämnen" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "" @@ -3304,8 +3230,6 @@ msgid "n.A." msgstr "n.A." #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Andra" @@ -3323,140 +3247,6 @@ msgstr "Redigera ingrediens" msgid "Delete ingredient" msgstr "Ta bort ingrediens" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Din kostplan" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Innehåll" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Inga objekt i denna måltid." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Inga måltider i denna plan." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Lägg till en ny måltid" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Näringsdata" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Totalt" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Procent av energi" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g / kroppsvikt (kg)" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "oz / kroppsvikt (lb)" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Mål" - -#: nutrition/templates/plan/view.html:387 -#, fuzzy -#| msgid "" -#| "You have selected that this nutritional plan has a\n" -#| " goal amount of calories. Use the calculator or enter the value " -#| "yourself." -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Du har valt att denna näringsplan ska ha ett kalorimål. Använd kalkylatorn " -"eller ange värdet själv." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Om du finner ingredienslistan för kort kanske du vill aktivera inställningen " -"att också visa ingredienser på engelska." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Redigera kost plan" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Skapa en kopia av denna kostplan" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Ta bort kostplan" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Basal ämnesomsättning" @@ -3556,39 +3346,39 @@ msgstr "" msgid "Add a new ingredient" msgstr "Lägg till en ny ingrediens" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Ingrediensen har markerats som nekad" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Ta bort?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Lägg till ny måltid" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Redigera måltid" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Redigera måltidsobjekt" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Detta är en tom plan, vad förväntade du dig på PDFen?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Näringsdata" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Totalt" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Procent av energi" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g / kroppsvikt (kg)" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Lägg till en ny viktenhet" @@ -3597,6 +3387,10 @@ msgstr "Lägg till en ny viktenhet" msgid "Edit a weight unit to ingredient connection" msgstr "Redigera en viktenhet- till ingrediens anslutning" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Ta bort?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4109,6 +3903,81 @@ msgstr "" msgid "Delete weight entry for the %s" msgstr "" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Hände något som inte är tillåtet." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Hände något som orsakat ett fel." + +#~ msgid "No nutrition plans." +#~ msgstr "Inga kostplaner." + +#~ msgid "Add nutrition plan" +#~ msgstr "Lägg till kostplan" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "Your nutrition plans" +#~ msgstr "Din kostplan" + +#~ msgid "Contents" +#~ msgstr "Innehåll" + +#~ msgid "No items for this meal." +#~ msgstr "Inga objekt i denna måltid." + +#~ msgid "No meals for this plan." +#~ msgstr "Inga måltider i denna plan." + +#~ msgid "Add a new meal" +#~ msgstr "Lägg till en ny måltid" + +#~ msgid "oz per body lb" +#~ msgstr "oz / kroppsvikt (lb)" + +#~ msgid "Goal" +#~ msgstr "Mål" + +#, fuzzy +#~| msgid "" +#~| "You have selected that this nutritional plan has a\n" +#~| " goal amount of calories. Use the calculator or enter the value " +#~| "yourself." +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Du har valt att denna näringsplan ska ha ett kalorimål. Använd " +#~ "kalkylatorn eller ange värdet själv." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Om du finner ingredienslistan för kort kanske du vill aktivera " +#~ "inställningen att också visa ingredienser på engelska." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Redigera kost plan" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Skapa en kopia av denna kostplan" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Ta bort kostplan" + +#~ msgid "Add new meal" +#~ msgstr "Lägg till ny måltid" + +#~ msgid "Edit meal" +#~ msgstr "Redigera måltid" + +#~ msgid "Edit meal item" +#~ msgstr "Redigera måltidsobjekt" + #~ msgid "Free license" #~ msgstr "Fri licens" diff --git a/wger/locale/tr/LC_MESSAGES/django.po b/wger/locale/tr/LC_MESSAGES/django.po index 8ee203fd8..3dda13f63 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-02-02 15:38+0000\n" "Last-Translator: Oğuz Ersen \n" "Language-Team: Turkish \n" @@ -38,8 +38,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -56,57 +56,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Düzenle" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Örnek antrenman" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Örnek gün" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Başka bir örnek gün" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Örnek beslenme planı" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "Program için yer tutucu antrenman no {0}" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Harika antrenman programım" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Yer tutucu planı boş" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Oturum aç" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "İsim" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Soyisim" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -152,24 +151,24 @@ 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:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Bu e-posta adresi zaten kullanılıyor." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Parola" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Lütfen geçerli parolanızı girin." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -184,41 +183,39 @@ msgstr "Lütfen geçerli parolanızı girin." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Sil" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Geçersiz parola" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Form reCAPTCHA ile güvence altına alındı" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Kayıt ol" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "İletişim" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Size cevap vermenin bir yolu (e-posta vb.)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Yorum" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Ne söylemek istiyorsun?" @@ -250,7 +247,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Kısa ad, ör. CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Bağlantı" @@ -415,7 +412,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Toplam kalori alımı, örn. herhangi bir fazlalık" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Ağırlık birimi" @@ -446,16 +443,16 @@ msgid "The sum of all hours has to be 24" msgstr "Tüm saatlerin toplamı 24 olmalıdır" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -467,8 +464,8 @@ msgid "Forbidden!" msgstr "Yasak!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "İzin verilmeyen bir şey oldu." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -478,13 +475,20 @@ msgstr "Sayfa bulunamadı" msgid "The page you requested does not exist." msgstr "İstediğiniz sayfa mevcut değil." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Bir hata oluştu" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Hataya neden olan bir şey oldu." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, fuzzy, python-format @@ -509,7 +513,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "\"%(target)s\" sayfasına geri dön" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Paylaş" @@ -518,7 +522,9 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Bunu silmek istediğinizden emin misiniz? Bu eylem geri alınamaz." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "E-posta adresi doğrulandı" #: core/templates/email_verification/confirm_template.html:18 @@ -583,9 +589,9 @@ msgstr "" "Bir egzersize ağırlık günlükleri eklemek için tıklayın\n" "mevcut antrenmanınızdaki gün:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -593,41 +599,7 @@ msgstr "" msgid "Close" msgstr "Kapat" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Yeni günlük girişi ekle" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Beslenme günlüğünüze bugün için bir giriş eklemek için tıklayın. Bir yemeği " -"tanımladığınız şekilde günlüğe kaydedebilir veya herhangi bir sayıda özel " -"giriş girebilirsiniz." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "Kilokalori" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Özel günlük girişi ekle" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -638,11 +610,11 @@ msgstr "Özel günlük girişi ekle" msgid "Workout" msgstr "Antrenman" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Bu antrenman bir programın parçasıdır:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -650,84 +622,27 @@ msgstr "" "Mevcut antrenman, aktif programınızdan veya eğer yoksa sadece tarihe göre " "seçilir." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Yeni günlük ekle" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Antrenman bulunamadı." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Yeni ekle." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "Beslenme planı" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Enerji" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Protein" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Karbonhidratlar" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Yağ" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Beslenme planı yok." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -736,12 +651,12 @@ msgstr "Beslenme planı yok." msgid "Weight" msgstr "Kilo" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Kilo girişi ekleyin" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Diller" @@ -752,8 +667,8 @@ msgstr "Bulunamadı." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -776,7 +691,7 @@ msgstr "Ekle" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Seçenekler" @@ -787,8 +702,8 @@ msgstr "Lisans listesi" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -806,8 +721,7 @@ msgstr "Lisans listesi" msgid "Nothing found" msgstr "Hiçbir şey Bulunamadı" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Künye" @@ -827,8 +741,6 @@ msgstr "" "gerekir." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Bu burada yapılır" @@ -863,148 +775,154 @@ msgstr "Egzersiz programları" msgid "Calendar" msgstr "Takvim" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Makrobesinler" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Galeri" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Antrenman şablonları" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Şablonlarınız" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Herkese açık şablonlar" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Egzersizler" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Yönetim" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Egzersiz düzenleme geçmişi" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Ekipman" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "Kaslar" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Kategoriler" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Beslenme" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Beslenme planları" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "BMI hesaplayıcı" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Günlük kalori hesaplayıcı" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "İçeriğe genel bakış" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "İçerik ağırlık birimleri" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "İncelenmeyi bekleyen malzemeler" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Vücut ağırlığı" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Ağırlığa genel bakış" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Bu yazılım hakkında" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Hakkımızda" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Lisans" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Geliştirici belgeleri" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Kodu alın" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Çevir" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Parolayı sıfırla" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Benim tercihlerim" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Çıkış" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Lisanslar" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Tekrarlama birimleri" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Ağırlık birimleri" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Kullanıcı listesi" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Spor salonları" @@ -1058,14 +976,6 @@ msgstr "Sitemizi kullandığınız için teşekkürler!" msgid "The %(site_name)s team" msgstr "%(site_name)s ekibi" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "önceki" @@ -1106,18 +1016,18 @@ msgstr "Temsilciler" msgid "RiR" msgstr "RiR" -#: core/templates/template.html:140 +#: core/templates/template.html:141 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:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Bazı demo girişleri oluşturun" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Kullanım Şartları" @@ -1203,15 +1113,15 @@ msgstr "Parolanızı mı unuttunuz?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "son %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1224,24 +1134,25 @@ msgid "Add workout" msgstr "Antrenman ekle" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Tarih" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Açıklama" @@ -1264,7 +1175,7 @@ msgstr "Kayıt" msgid "General impression" msgstr "Genel izlenim" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1274,18 +1185,37 @@ msgstr "Notlar" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Zaman" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Beslenme planı ekle" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Enerji" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Protein" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Karbonhidratlar" + +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Yağ" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "Kilokalori" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1295,112 +1225,112 @@ msgstr "Beslenme planı ekle" msgid "Actions" msgstr "Hareketler" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Kullanıcıyı devre dışı bırak" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Kullanıcıyı etkinleştir" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Kullanıcı parolasını sıfırla" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Roller" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Parola sıfırlama onayı" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Bu kullanıcının parolasını gerçekten değiştirmek istiyor musunuz?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Hayır" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Evet" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Detaylar" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "Nr." -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Telefon" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Adres" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Kayıtlı" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Son giriş" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Durum" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Aktif" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Etkin değil" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Sözleşmeler" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Belgeler" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "İndir" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Yapılandırma" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Etkin olmayan genel bakışa ekle" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, 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:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Bu kullanıcı olarak oturum açın" @@ -1429,7 +1359,7 @@ msgstr "" msgid "Change password" msgstr "Parola değiştir" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "kilogram" @@ -1445,7 +1375,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "g" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "1 pound = 0.45 kg" @@ -1459,7 +1389,7 @@ msgstr "oz" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Başarıyla silindi" @@ -1470,8 +1400,7 @@ msgstr "Başarıyla silindi" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "{0} silinsin mi?" @@ -1485,12 +1414,12 @@ msgstr "{0} silinsin mi?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "{0} düzenleyin" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1500,19 +1429,19 @@ 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/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "Dinlenme günü" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "geri bildirim" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Sunmak" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Geri bildiriminiz başarıyla gönderildi. Teşekkür ederim!" @@ -1562,19 +1491,19 @@ msgstr "Jimnastik" msgid "A verification email was sent to %(email)s" msgstr "%(email)s adresine bir doğrulama e-postası gönderildi" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Kategori" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Birincil kaslar" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "İkincil kaslar" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Varyasyonlar" @@ -1592,8 +1521,8 @@ msgstr "Egzersiz" msgid "A comment about how to correctly do this exercise." msgstr "Bu alıştırmanın nasıl doğru bir şekilde yapılacağına dair bir yorum." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Dil" @@ -1728,8 +1657,8 @@ msgstr "Eylem" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Kullanıcı" @@ -1853,7 +1782,7 @@ msgstr "Sözleşme tipi" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Miktar" @@ -2186,63 +2115,67 @@ msgid "Legs" msgstr "Bacaklar" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Alt sırt" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Azami Tekrar Sayısı" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Mil" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Dakika" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Barfiks çubuğu" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Quads kasları" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Tekrarlar" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "SZ-Bar" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Saniye" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Omuzlar" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Egzersiz Topu" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "Triceps kasları" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "Başarısızlığa Kadar" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "yok (vücut ağırlığı egzersizi)" @@ -2329,7 +2262,7 @@ msgstr "İngilizce malzemeleri de kullanın" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Birim" @@ -2405,7 +2338,7 @@ msgid "The duration in weeks" msgstr "Hafta cinsinden süre" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Sipariş" @@ -2464,7 +2397,7 @@ msgstr "Set sayısı" msgid "Sets" msgstr "Setleri" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Oluşturulma tarihi" @@ -2734,7 +2667,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "PDF olarak indir" @@ -2972,7 +2904,7 @@ msgstr "{0} için yeni antrenman izlenimi" msgid "This will delete all weight logs for this day as well." msgstr "Bu, o gün için tüm ağırlık günlüklerini de siler." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Değer" @@ -3018,61 +2950,50 @@ msgstr "" "Baz orana eklenecek ek kaloriler (çıkarmak için negatif bir sayı girin)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Bileşen" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "100 g başına kcal olarak" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "100 g ürün başına g cinsinden" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Karbonhidratlardaki şeker içeriği" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Yağlarda doymuş yağ içeriği" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Lifler" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Sodyum" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Ürün bağlantısı" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Ürünün marka adı" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3083,15 +3004,15 @@ msgstr "" "sağlanan enerjinin yaklaşık toplamı değildir ({energy_calculated}kcal +/-" "{energy_approx}%)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "İçerik genel veri tabanına başarıyla eklendi" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Yeni kullanıcı tarafından gönderilen içerik" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "{0} kullanıcısı yeni bir içerik \"{1}\" gönderdi." @@ -3108,19 +3029,24 @@ msgstr "Gram cinsinden miktar" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Birim miktar, ör. \"1 Fincan\" veya \"1/2 kaşık\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "Beslenme planı" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Yemek" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "Tarih ve Saat (Yaklaşık)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Zaman (yaklaşık)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" @@ -3128,7 +3054,7 @@ msgstr "" "Yemeklere \"Kahvaltı\" veya \"antrenmandan sonra\" gibi metinsel bir " "açıklama / ad verin" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" @@ -3136,11 +3062,11 @@ msgstr "" "Planın amacının bir açıklaması, ör. \"Kitle kazanın\" veya \"Yaza " "hazırlanın\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Günlük kalori kullanın" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3308,14 +3234,11 @@ msgstr "Kabul etmek" msgid "Decline" msgstr "Reddet" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Makrobesinler" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "kJ" @@ -3327,8 +3250,6 @@ msgid "n.A." msgstr "n.A." #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Diğerleri" @@ -3346,136 +3267,6 @@ msgstr "Malzemeyi düzenleyin" msgid "Delete ingredient" msgstr "Malzemeyi sil" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Beslenme günlüğü" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Planlı" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Kayıtlı" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Fark" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Girdileri" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "g" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "Hiçbirşey Bulunamadı" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Beslenme planlarınız" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "İçindekiler" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Bu yemeği günlüğe kaydet" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Yemeğe malzeme ekleyin" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Bu yemek için hiçbir öğe yok." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Bu plan için yemek yok." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Bu Planı günlüğe kaydet" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Yeni bir yemek ekle" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Beslenme verileri" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "%(date)s (%(weight)s) tarihli ağırlık girişine göre" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Toplamda" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Enerji yüzdesi" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "g vücut kg" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "vücut lb başına oz" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Tam beslenme günlüğünü görüntüleyin" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Hedef" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Bu beslenme planının hedeflenen bir kalori miktarına\n" -" sahip olduğunu seçtiniz. Hesap makinesini kullanın veya değeri\n" -" kendiniz girin." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"İçindekiler listesini çok kısa bulursan, İngilizce malzemeleri de gösterme " -"tercihini etkinleştirmek isteyebilirsin." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Beslenme planını düzenleyin" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Bu beslenme planının bir kopyasını alın" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Beslenme planını sil" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Bazal metabolik oran" @@ -3576,39 +3367,39 @@ msgstr "" msgid "Add a new ingredient" msgstr "Yeni bir malzeme ekle" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "İçerik başarıyla reddedildi olarak işaretlendi" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Sil?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Yeni yemek ekle" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Yemeği düzenle" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Yemek öğesini düzenle" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "Beslenme planı" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "%s için beslenme planı" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Bu boş bir plan, PDF'den ne bekliyordunuz?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Beslenme verileri" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Toplamda" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Enerji yüzdesi" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "g vücut kg" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Yeni bir ağırlık birimi ekleyin" @@ -3617,6 +3408,10 @@ msgstr "Yeni bir ağırlık birimi ekleyin" msgid "Edit a weight unit to ingredient connection" msgstr "Ağırlık birimini bileşen bağlantısına göre düzenleyin" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Sil?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4148,6 +3943,126 @@ msgstr "Başarıyla silindi." msgid "Delete weight entry for the %s" msgstr "%s için ağırlık girişini silin" +#~ msgid "Something happened that is not allowed." +#~ msgstr "İzin verilmeyen bir şey oldu." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Hataya neden olan bir şey oldu." + +#~ msgid "Add new diary entry" +#~ msgstr "Yeni günlük girişi ekle" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Beslenme günlüğünüze bugün için bir giriş eklemek için tıklayın. Bir " +#~ "yemeği tanımladığınız şekilde günlüğe kaydedebilir veya herhangi bir " +#~ "sayıda özel giriş girebilirsiniz." + +#~ msgid "Add custom diary entry" +#~ msgstr "Özel günlük girişi ekle" + +#~ msgid "No nutrition plans." +#~ msgstr "Beslenme planı yok." + +#~ msgid "Add nutrition plan" +#~ msgstr "Beslenme planı ekle" + +#~ msgid "Nutrition diary" +#~ msgstr "Beslenme günlüğü" + +#~ msgid "Planned" +#~ msgstr "Planlı" + +#~ msgid "Logged" +#~ msgstr "Kayıtlı" + +#~ msgid "Difference" +#~ msgstr "Fark" + +#~ msgid "Entries" +#~ msgstr "Girdileri" + +#~ msgid "g" +#~ msgstr "g" + +#~ msgid "nothing found" +#~ msgstr "Hiçbirşey Bulunamadı" + +#~ msgid "Your nutrition plans" +#~ msgstr "Beslenme planlarınız" + +#~ msgid "Contents" +#~ msgstr "İçindekiler" + +#~ msgid "Log this meal" +#~ msgstr "Bu yemeği günlüğe kaydet" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Yemeğe malzeme ekleyin" + +#~ msgid "No items for this meal." +#~ msgstr "Bu yemek için hiçbir öğe yok." + +#~ msgid "No meals for this plan." +#~ msgstr "Bu plan için yemek yok." + +#~ msgid "Log this Plan" +#~ msgstr "Bu Planı günlüğe kaydet" + +#~ msgid "Add a new meal" +#~ msgstr "Yeni bir yemek ekle" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "%(date)s (%(weight)s) tarihli ağırlık girişine göre" + +#~ msgid "oz per body lb" +#~ msgstr "vücut lb başına oz" + +#~ msgid "View complete nutrition log" +#~ msgstr "Tam beslenme günlüğünü görüntüleyin" + +#~ msgid "Goal" +#~ msgstr "Hedef" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Bu beslenme planının hedeflenen bir kalori miktarına\n" +#~ " sahip olduğunu seçtiniz. Hesap makinesini kullanın veya " +#~ "değeri\n" +#~ " kendiniz girin." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "İçindekiler listesini çok kısa bulursan, İngilizce malzemeleri de " +#~ "gösterme tercihini etkinleştirmek isteyebilirsin." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Beslenme planını düzenleyin" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Bu beslenme planının bir kopyasını alın" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Beslenme planını sil" + +#~ msgid "Add new meal" +#~ msgstr "Yeni yemek ekle" + +#~ msgid "Edit meal" +#~ msgstr "Yemeği düzenle" + +#~ msgid "Edit meal item" +#~ msgstr "Yemek öğesini düzenle" + #~ msgid "Free license" #~ msgstr "Ücretsiz lisans" @@ -4161,9 +4076,6 @@ msgstr "%s için ağırlık girişini silin" #~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\"" #~ msgstr "%(name)s, mevcut \"%(exercise_name)s\" egzersizine çok benziyor" -#~ msgid "Lower back" -#~ msgstr "Alt sırt" - #~ msgid "Add training day" #~ msgstr "Eğitim günü ekleyin" diff --git a/wger/locale/uk/LC_MESSAGES/django.po b/wger/locale/uk/LC_MESSAGES/django.po index 3208c2658..5918d9823 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: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-06-07 12:57+0000\n" "Last-Translator: Dan \n" "Language-Team: Ukrainian \n" @@ -20,10 +20,10 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 " -"? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > " -"14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % " -"100 >=11 && n % 100 <=14 )) ? 2: 3);\n" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != " +"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % " +"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || " +"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" "X-Generator: Weblate 4.18-dev\n" #: config/models/gym_config.py:46 gym/templates/gym/list.html:53 @@ -43,8 +43,8 @@ msgstr "" #: core/templates/license/list.html:17 core/templates/misc/license/list.html:18 #: core/templates/repetition_unit/list.html:18 #: core/templates/tags/render_day.html:39 -#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:205 -#: core/templates/user/overview.html:446 +#: core/templates/tags/render_day.html:75 core/templates/user/overview.html:204 +#: core/templates/user/overview.html:445 #: core/templates/weight_unit/list.html:18 #: exercises/templates/categories/admin-overview.html:17 #: exercises/templates/equipment/admin-overview.html:17 @@ -61,57 +61,56 @@ msgstr "" #: manager/templates/calendar/partial_overview_table.html:18 #: manager/templates/schedule/view.html:119 #: nutrition/templates/ingredient/view.html:191 -#: nutrition/templates/plan/view.html:89 nutrition/templates/plan/view.html:129 #: nutrition/templates/units/list.html:19 msgid "Edit" msgstr "Змінити" -#: core/demo.py:95 +#: core/demo.py:96 msgid "Sample workout" msgstr "Пробне тренування" -#: core/demo.py:99 +#: core/demo.py:100 msgid "Sample day" msgstr "Пробний день" -#: core/demo.py:103 +#: core/demo.py:104 msgid "Another sample day" msgstr "Інший пробний день" -#: core/demo.py:211 +#: core/demo.py:212 msgid "Sample nutritional plan" msgstr "Зразок плану харчування" -#: core/demo.py:343 core/demo.py:345 core/demo.py:347 +#: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format msgid "Placeholder workout nr {0} for schedule" msgstr "\"Заповнювач\" тренування № {0} для програми" -#: core/demo.py:352 +#: core/demo.py:353 msgid "My cool workout schedule" msgstr "Моя класна програграма тренувань" -#: core/demo.py:391 core/demo.py:406 +#: core/demo.py:392 core/demo.py:407 msgid "Empty placeholder schedule" msgstr "Порожня програма-заповнювач" -#: core/forms.py:69 core/templates/navigation.html:258 -#: core/templates/navigation.html:264 core/templates/user/login.html:4 +#: core/forms.py:69 core/templates/navigation.html:275 +#: core/templates/navigation.html:281 core/templates/user/login.html:4 #: software/templates/features.html:75 software/templates/features.html:420 msgid "Login" msgstr "Вхід" -#: core/forms.py:108 core/forms.py:209 gym/views/export.py:63 +#: core/forms.py:108 core/forms.py:210 gym/views/export.py:63 #: gym/views/gym.py:218 msgid "First name" msgstr "Ім'я" -#: core/forms.py:109 core/forms.py:210 core/templates/user/overview.html:267 +#: core/forms.py:109 core/forms.py:211 core/templates/user/overview.html:266 #: gym/views/export.py:64 gym/views/gym.py:218 msgid "Last name" msgstr "Прізвище" -#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:271 +#: core/forms.py:111 core/forms.py:176 core/templates/user/overview.html:270 #: gym/models/contract.py:253 gym/models/gym.py:58 #: gym/templates/contract/view.html:77 gym/templates/gym/member_list.html:104 #: gym/templates/gym/new_user.html:30 gym/views/export.py:62 @@ -157,24 +156,24 @@ msgstr "" "Використовується для скидання пароля і, при необхідності, нагадування " "електронною поштою." -#: core/forms.py:205 +#: core/forms.py:206 msgid "This e-mail address is already in use." msgstr "Ця адреса електронної пошти вже використовується." -#: core/forms.py:225 gym/templates/gym/new_user.html:26 +#: core/forms.py:226 gym/templates/gym/new_user.html:26 #: gym/templates/gym/reset_user_password.html:24 gym/views/gym.py:218 msgid "Password" msgstr "Пароль" -#: core/forms.py:227 +#: core/forms.py:228 msgid "Please enter your current password." msgstr "Введіть свій поточний пароль." -#: core/forms.py:236 core/templates/language/view.html:68 +#: core/forms.py:237 core/templates/language/view.html:68 #: core/templates/license/list.html:19 core/templates/misc/license/list.html:22 #: core/templates/repetition_unit/list.html:20 #: core/templates/tags/render_day.html:45 -#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:218 +#: core/templates/tags/render_day.html:81 core/templates/user/overview.html:217 #: core/templates/weight_unit/list.html:20 #: exercises/templates/categories/admin-overview.html:19 #: exercises/templates/equipment/admin-overview.html:19 @@ -189,41 +188,39 @@ msgstr "Введіть свій поточний пароль." #: manager/templates/workout/view.html:190 #: nutrition/templates/ingredient/view.html:192 #: nutrition/templates/ingredient/view.html:241 -#: nutrition/templates/log/detail.html:197 -#: nutrition/templates/plan/view.html:95 nutrition/templates/plan/view.html:135 #: nutrition/templates/units/list.html:22 msgid "Delete" msgstr "Вилучити" -#: core/forms.py:245 +#: core/forms.py:246 msgid "Invalid password" msgstr "Неправильний пароль" -#: core/forms.py:257 core/forms.py:327 +#: core/forms.py:258 core/forms.py:328 msgid "The form is secured with reCAPTCHA" msgstr "Форма захищена reCAPTCHA" -#: core/forms.py:271 core/forms.py:292 core/templates/navigation.html:258 -#: core/templates/navigation.html:269 core/templates/template.html:150 +#: core/forms.py:272 core/forms.py:293 core/templates/navigation.html:275 +#: core/templates/navigation.html:287 core/templates/template.html:152 #: core/templates/user/login.html:20 core/views/user.py:300 #: software/templates/features.html:80 software/templates/features.html:415 msgid "Register" msgstr "Зареєструватись" -#: core/forms.py:305 +#: core/forms.py:306 msgid "Contact" msgstr "Контакт" -#: core/forms.py:306 +#: core/forms.py:307 msgid "Some way of answering you (e-mail, etc.)" msgstr "Яким чином відповідати вам (електронна пошта, тощо)" -#: core/forms.py:314 exercises/models/comment.py:42 manager/models/set.py:60 -#: manager/models/setting.py:111 nutrition/models/log.py:71 +#: core/forms.py:315 exercises/models/comment.py:42 manager/models/set.py:60 +#: manager/models/setting.py:111 nutrition/models/log.py:74 msgid "Comment" msgstr "Коментар" -#: core/forms.py:315 +#: core/forms.py:316 msgid "What do you want to say?" msgstr "Що ви хочете сказати?" @@ -255,7 +252,7 @@ msgstr "" msgid "Short name, e.g. CC-BY-SA 3" msgstr "Коротке ім'я, н-д CC-BY-SA 3" -#: core/models/license.py:45 nutrition/models/ingredient.py:202 +#: core/models/license.py:45 nutrition/models/ingredient.py:212 msgid "Link" msgstr "Посилання" @@ -419,7 +416,7 @@ msgid "Total caloric intake, including e.g. any surplus" msgstr "Загальне споживання калорій, в тому числі, будь-який надлишок" #: core/models/profile.py:335 nutrition/models/ingredient_weight_unit.py:45 -#: nutrition/models/log.py:90 nutrition/models/meal_item.py:58 +#: nutrition/models/log.py:93 nutrition/models/meal_item.py:58 msgid "Weight unit" msgstr "Одиниця ваги" @@ -450,16 +447,16 @@ msgid "The sum of all hours has to be 24" msgstr "Сума всіх годин повинна дорівнювати 24" #: core/models/rep_unit.py:35 core/models/weight_unit.py:35 -#: core/templates/user/overview.html:263 core/views/user.py:591 +#: core/templates/user/overview.html:262 core/views/user.py:591 #: exercises/models/category.py:28 exercises/models/equipment.py:29 #: exercises/models/exercise.py:54 exercises/models/muscle.py:36 #: gym/models/contract.py:51 gym/models/contract.py:101 gym/models/gym.py:46 #: gym/models/user_document.py:87 gym/templates/contract/view.html:50 #: gym/templates/gym/member_list.html:28 gym/templates/gym/member_list.html:96 #: gym/views/gym.py:156 manager/models/schedule.py:55 -#: manager/models/workout.py:56 measurements/models/category.py:53 -#: nutrition/models/ingredient.py:113 -#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:66 +#: manager/models/workout.py:56 measurements/models/category.py:37 +#: nutrition/models/ingredient.py:123 +#: nutrition/models/ingredient_category.py:26 nutrition/models/meal.py:67 #: nutrition/models/weight_unit.py:38 #: nutrition/templates/ingredient/pending.html:15 #: nutrition/templates/ingredient/view.html:178 @@ -471,8 +468,8 @@ msgid "Forbidden!" msgstr "Заборонено!" #: core/templates/403.html:7 -msgid "Something happened that is not allowed." -msgstr "Сталося щось, що не дозволено." +msgid "You are not allowed to acces this page" +msgstr "" #: core/templates/404.html:4 msgid "Page not found" @@ -482,13 +479,20 @@ msgstr "Сторінку не знайдено" msgid "The page you requested does not exist." msgstr "Запитана вами сторінка не існує." -#: core/templates/500.html:4 core/templates/template_no_context.html:35 +#: core/templates/500.html:4 core/templates/template_no_context.html:37 msgid "An error occurred" msgstr "Сталася помилка" -#: core/templates/500.html:7 -msgid "Something happened that caused an error." -msgstr "Сталося щось, що призвело до помилки." +#: core/templates/500.html:8 +msgid "" +"\n" +" There was an error on the server while processing your request. " +"Try refreshing your\n" +" browser and if that doesn't help, please try again at a later " +"time. If the problem\n" +" persists, you can seek help in ways listed below:\n" +" " +msgstr "" #: core/templates/base.html:12 core/templates/base_wide.html:10 #, python-format @@ -508,7 +512,7 @@ msgstr "" msgid "Back to \"%(target)s\"" msgstr "Назад до \"%(target)s\"" -#: core/templates/base.html:42 core/templates/base_wide.html:40 +#: core/templates/base.html:42 core/templates/base_wide.html:39 msgid "Share" msgstr "Поділитися" @@ -517,7 +521,9 @@ msgid "Are you sure you want to delete this? This action cannot be undone." msgstr "Ви дійсно хочете вилучити це? Цю дію неможливо скасувати." #: core/templates/email_verification/confirm_template.html:4 -msgid "Email verified" +#, fuzzy +#| msgid "Email verified" +msgid "Email verification" msgstr "Електронну адресу підтверджено" #: core/templates/email_verification/confirm_template.html:18 @@ -580,9 +586,9 @@ msgstr "" "Натисніть, щоб додати записи про вагу до тренування\n" " дня поточного тренування:" -#: core/templates/index.html:37 core/templates/index.html:81 +#: core/templates/index.html:37 #: core/templates/misc/fragments/shariff_modal.html:33 -#: core/templates/template.html:124 manager/templates/calendar/month.html:138 +#: core/templates/template.html:125 manager/templates/calendar/month.html:138 #: manager/templates/schedule/view.html:249 #: manager/templates/schedule/view.html:270 #: manager/templates/workout/view.html:86 @@ -590,41 +596,7 @@ msgstr "" msgid "Close" msgstr "Закрити" -#: core/templates/index.html:49 core/templates/index.html:213 -msgid "Add new diary entry" -msgstr "Додати новий запис щоденника" - -#: core/templates/index.html:54 -msgid "" -"Click to add an entry to your nutrition diary for today. You can either log " -"a meal as you defined it, or entry any number of custom entries." -msgstr "" -"Натисніть, щоб додати запис до свого щоденника харчування на сьогодні. Ви " -"можете або записати їжу, як ви її визначили, або ввести будь-яку кількість " -"власних записів." - -#: core/templates/index.html:62 core/templates/index.html:177 -#: core/templates/user/overview.html:171 -#: nutrition/templates/ingredient/view.html:79 -#: nutrition/templates/log/detail.html:40 -#: nutrition/templates/log/detail.html:41 -#: nutrition/templates/log/detail.html:187 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/log/overview.html:44 -#: nutrition/templates/plan/overview.html:17 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:247 -#: nutrition/templates/plan/view.html:306 -#: nutrition/templates/plan/view.html:326 -#: nutrition/templates/plan/view.html:368 -#: nutrition/templates/plan/view.html:378 -msgid "kcal" -msgstr "ккал" - -#: core/templates/index.html:74 nutrition/templates/plan/view.html:353 -msgid "Add custom diary entry" -msgstr "Додати власний запис щоденника" - -#: core/templates/index.html:95 core/templates/index.html:103 +#: core/templates/index.html:52 core/templates/index.html:60 #: manager/models/day.py:34 manager/models/log.py:58 #: manager/models/session.py:60 manager/models/workout.py:109 #: manager/templates/schedule/view.html:103 @@ -635,11 +607,11 @@ msgstr "Додати власний запис щоденника" msgid "Workout" msgstr "Тренування" -#: core/templates/index.html:129 +#: core/templates/index.html:86 msgid "This workout is part of a schedule:" msgstr "Це тренування є частиною програми:" -#: core/templates/index.html:134 +#: core/templates/index.html:91 msgid "" "The current workout is selected from your active schedule or, if you don't " "have one, simply by date." @@ -647,84 +619,27 @@ msgstr "" "Поточне тренування вибирається з вашого активного розкладу або, якщо у вас " "його немає, просто за датою." -#: core/templates/index.html:147 manager/templates/calendar/month.html:188 +#: core/templates/index.html:104 manager/templates/calendar/month.html:188 msgid "Add new log" msgstr "Додати новий журнал" -#: core/templates/index.html:152 core/templates/user/overview.html:58 +#: core/templates/index.html:109 core/templates/user/overview.html:58 #: manager/templates/calendar/month.html:128 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 msgid "No workouts found." msgstr "Не знайдено жодних тренувань." -#: core/templates/index.html:152 core/templates/index.html:205 -#: core/templates/language/overview.html:20 +#: core/templates/index.html:109 core/templates/language/overview.html:20 #: manager/templates/calendar/month.html:132 #: manager/templates/schedule/overview.html:28 #: manager/templates/schedule/view.html:145 #: manager/templates/workout/overview.html:28 #: nutrition/templates/ingredient/overview.html:51 -#: nutrition/templates/plan/overview.html:23 -#: nutrition/templates/plan/view.html:153 -#: nutrition/templates/plan/view.html:156 -#: nutrition/templates/plan/view.html:194 msgid "Add one now." msgstr "Додати зараз." -#: core/templates/index.html:163 nutrition/models/log.py:49 -#: nutrition/models/meal.py:49 nutrition/models/meal_item.py:47 -#: nutrition/models/plan.py:94 nutrition/templates/plan/view.html:11 -#: nutrition/templates/plan/view.html:19 -msgid "Nutrition plan" -msgstr "План харчування" - -#: core/templates/index.html:175 core/templates/user/overview.html:155 -#: nutrition/models/ingredient.py:118 -#: nutrition/templates/ingredient/view.html:77 -#: nutrition/templates/log/detail.html:39 -#: nutrition/templates/log/detail.html:156 -#: nutrition/templates/plan/view.html:53 nutrition/templates/plan/view.html:246 -#: nutrition/templates/plan/view.html:363 -#: nutrition/templates/plan/view.html:367 nutrition/views/plan.py:383 -msgid "Energy" -msgstr "Енергія" - -#: core/templates/index.html:181 core/templates/user/overview.html:156 -#: nutrition/models/ingredient.py:125 -#: nutrition/templates/ingredient/view.html:84 -#: nutrition/templates/log/detail.html:52 -#: nutrition/templates/log/detail.html:174 -#: nutrition/templates/plan/view.html:54 nutrition/templates/plan/view.html:254 -#: nutrition/views/plan.py:389 -msgid "Protein" -msgstr "Білок" - -#: core/templates/index.html:187 core/templates/user/overview.html:157 -#: nutrition/models/ingredient.py:133 -#: nutrition/templates/ingredient/view.html:90 -#: nutrition/templates/log/detail.html:65 -#: nutrition/templates/log/detail.html:175 -#: nutrition/templates/plan/view.html:55 nutrition/templates/plan/view.html:260 -#: nutrition/views/plan.py:397 -msgid "Carbohydrates" -msgstr "Вуглеводи" - -#: core/templates/index.html:193 core/templates/user/overview.html:158 -#: nutrition/models/ingredient.py:151 -#: nutrition/templates/ingredient/view.html:106 -#: nutrition/templates/log/detail.html:91 -#: nutrition/templates/log/detail.html:176 -#: nutrition/templates/plan/view.html:56 nutrition/templates/plan/view.html:273 -#: nutrition/views/plan.py:411 -msgid "Fat" -msgstr "Жири" - -#: core/templates/index.html:205 nutrition/templates/plan/overview.html:22 -msgid "No nutrition plans." -msgstr "Немає планів харчування." - -#: core/templates/index.html:224 core/templates/user/overview.html:112 +#: core/templates/index.html:125 core/templates/user/overview.html:112 #: core/templates/user/overview.html:121 manager/forms.py:189 #: manager/helpers.py:87 manager/models/log.py:86 manager/models/setting.py:79 #: manager/templates/log/add.html:54 manager/templates/set/formset.html:11 @@ -733,12 +648,12 @@ msgstr "Немає планів харчування." msgid "Weight" msgstr "Вага" -#: core/templates/index.html:231 core/templates/navigation.html:195 +#: core/templates/index.html:132 core/templates/navigation.html:207 #: weight/views.py:64 msgid "Add weight entry" msgstr "Додати запис ваги" -#: core/templates/language/overview.html:4 core/templates/navigation.html:312 +#: core/templates/language/overview.html:4 core/templates/navigation.html:335 msgid "Languages" msgstr "Мови" @@ -749,8 +664,8 @@ msgstr "Нічого не знайдено." #: core/templates/language/overview.html:33 core/templates/license/list.html:40 #: core/templates/misc/license/list.html:43 #: core/templates/repetition_unit/list.html:43 -#: core/templates/user/overview.html:327 core/templates/user/overview.html:366 -#: core/templates/user/overview.html:402 +#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 +#: core/templates/user/overview.html:401 #: core/templates/weight_unit/list.html:43 core/views/languages.py:73 #: core/views/license.py:65 core/views/repetition_units.py:65 #: core/views/weight_units.py:65 @@ -773,7 +688,7 @@ msgstr "Додати" #: manager/templates/schedule/view.html:286 #: manager/templates/workout/view.html:165 #: nutrition/templates/ingredient/view.html:228 -#: nutrition/templates/plan/view.html:414 weight/templates/overview.html:46 +#: weight/templates/overview.html:46 msgid "Options" msgstr "Параметри" @@ -784,8 +699,8 @@ msgstr "Список ліцензій" #: core/templates/license/list.html:26 core/templates/misc/license/list.html:30 #: core/templates/repetition_unit/list.html:28 #: core/templates/user/overview.html:104 core/templates/user/overview.html:136 -#: core/templates/user/overview.html:186 core/templates/user/overview.html:348 -#: core/templates/user/overview.html:384 core/templates/user/overview.html:428 +#: core/templates/user/overview.html:185 core/templates/user/overview.html:347 +#: core/templates/user/overview.html:383 core/templates/user/overview.html:427 #: core/templates/weight_unit/list.html:28 #: exercises/templates/categories/admin-overview.html:26 #: exercises/templates/equipment/admin-overview.html:26 @@ -803,8 +718,7 @@ msgstr "Список ліцензій" msgid "Nothing found" msgstr "Нічого не знайдено" -#: core/templates/misc/about.html:4 core/templates/template.html:176 -#: core/templates/template_no_context.html:87 +#: core/templates/misc/about.html:4 core/templates/template.html:178 msgid "Imprint" msgstr "Відбиток" @@ -821,8 +735,6 @@ msgstr "" "зовнішній доступ." #: core/templates/misc/fragments/shariff_modal.html:26 -#: nutrition/templates/plan/view.html:390 -#: nutrition/templates/plan/view.html:399 msgid "That's done here" msgstr "Це зроблено тут" @@ -853,148 +765,154 @@ msgstr "Програми тренувань" msgid "Calendar" msgstr "Календар" -#: core/templates/navigation.html:60 gallery/templates/images/overview.html:6 +#: core/templates/navigation.html:60 +#, fuzzy +#| msgid "Macronutrients" +msgid "Measurements" +msgstr "Макроелементи" + +#: core/templates/navigation.html:70 gallery/templates/images/overview.html:6 msgid "Gallery" msgstr "Галерея" -#: core/templates/navigation.html:65 +#: core/templates/navigation.html:76 msgid "Workout templates" msgstr "Шаблони тренувань" -#: core/templates/navigation.html:71 manager/views/workout.py:84 +#: core/templates/navigation.html:82 manager/views/workout.py:84 msgid "Your templates" msgstr "Ваші шаблони" -#: core/templates/navigation.html:79 manager/views/workout.py:98 +#: core/templates/navigation.html:90 manager/views/workout.py:98 msgid "Public templates" msgstr "Загальнодоступні шаблони" -#: core/templates/navigation.html:86 manager/forms.py:132 +#: core/templates/navigation.html:97 manager/forms.py:132 #: manager/models/setting.py:54 software/templates/features.html:452 msgid "Exercises" msgstr "Вправи" -#: core/templates/navigation.html:92 core/templates/navigation.html:159 -#: core/templates/navigation.html:308 +#: core/templates/navigation.html:103 core/templates/navigation.html:170 +#: core/templates/navigation.html:330 msgid "Administration" msgstr "Адміністрація" -#: core/templates/navigation.html:95 +#: core/templates/navigation.html:106 msgid "Exercise edit history" msgstr "Історія редагування вправи" -#: core/templates/navigation.html:100 exercises/models/base.py:88 +#: core/templates/navigation.html:111 exercises/models/base.py:101 msgid "Equipment" msgstr "Обладнання" -#: core/templates/navigation.html:105 +#: core/templates/navigation.html:116 msgid "Muscles" msgstr "М'язи" -#: core/templates/navigation.html:110 +#: core/templates/navigation.html:121 #: exercises/templates/categories/admin-overview.html:4 msgid "Categories" msgstr "Категорії" -#: core/templates/navigation.html:125 software/templates/features.html:440 +#: core/templates/navigation.html:136 software/templates/features.html:440 msgid "Nutrition" msgstr "Харчування" -#: core/templates/navigation.html:132 core/templates/user/overview.html:144 +#: core/templates/navigation.html:143 core/templates/user/overview.html:144 msgid "Nutrition plans" msgstr "Плани харчування" -#: core/templates/navigation.html:140 nutrition/templates/bmi/form.html:50 +#: core/templates/navigation.html:151 nutrition/templates/bmi/form.html:50 msgid "BMI calculator" msgstr "Калькулятор індексу маси тіла" -#: core/templates/navigation.html:148 nutrition/templates/rate/form.html:17 +#: core/templates/navigation.html:159 nutrition/templates/rate/form.html:17 msgid "Daily calories calculator" msgstr "Калькулятор щоденних калорій" -#: core/templates/navigation.html:154 +#: core/templates/navigation.html:165 #: nutrition/templates/ingredient/overview.html:35 msgid "Ingredient overview" msgstr "Огляд інгредієнтів" -#: core/templates/navigation.html:161 nutrition/templates/units/list.html:6 +#: core/templates/navigation.html:172 nutrition/templates/units/list.html:6 msgid "Ingredient weight units" msgstr "Одиниці ваги інгредієнтів" -#: core/templates/navigation.html:166 +#: core/templates/navigation.html:177 #: nutrition/templates/ingredient/pending.html:6 msgid "Ingredients pending review" msgstr "Інгредієнти, що очікують розгляду" -#: core/templates/navigation.html:182 software/templates/features.html:435 +#: core/templates/navigation.html:193 software/templates/features.html:435 msgid "Body weight" msgstr "Вага тіла" -#: core/templates/navigation.html:188 core/templates/user/overview.html:114 +#: core/templates/navigation.html:200 core/templates/user/overview.html:114 #: weight/templates/overview.html:7 msgid "Weight overview" msgstr "Огляд ваги" -#: core/templates/navigation.html:209 +#: core/templates/navigation.html:221 msgid "About this software" msgstr "Про це програмне забезпечення" -#: core/templates/navigation.html:214 software/templates/about_us.html:5 +#: core/templates/navigation.html:227 software/templates/about_us.html:5 msgid "About us" msgstr "Про нас" -#: core/templates/navigation.html:219 software/templates/features.html:500 +#: core/templates/navigation.html:233 software/templates/features.html:500 msgid "REST API" msgstr "REST API" -#: core/templates/navigation.html:225 utils/models.py:45 +#: core/templates/navigation.html:239 utils/models.py:45 msgid "License" msgstr "Ліцензія" -#: core/templates/navigation.html:231 +#: core/templates/navigation.html:245 msgid "Developer documentation" msgstr "Документація для розробників" -#: core/templates/navigation.html:237 +#: core/templates/navigation.html:252 msgid "Get the code" msgstr "Отримати код" -#: core/templates/navigation.html:243 core/templates/template.html:215 -#: software/templates/features.html:566 +#: core/templates/navigation.html:259 core/templates/template.html:217 +#: software/templates/features.html:575 msgid "Translate" msgstr "Перекласти" -#: core/templates/navigation.html:274 core/templates/user/login.html:28 +#: core/templates/navigation.html:293 core/templates/user/login.html:28 msgid "Reset password" msgstr "Скинути пароль" -#: core/templates/navigation.html:290 +#: core/templates/navigation.html:311 msgid "My preferences" msgstr "Мої налаштування" -#: core/templates/navigation.html:298 +#: core/templates/navigation.html:320 msgid "Logout" msgstr "Вийти" -#: core/templates/navigation.html:319 +#: core/templates/navigation.html:343 msgid "Licenses" msgstr "Ліцензії" -#: core/templates/navigation.html:326 +#: core/templates/navigation.html:351 #: core/templates/repetition_unit/list.html:4 msgid "Repetition units" msgstr "Одиниці повторень" -#: core/templates/navigation.html:333 core/templates/weight_unit/list.html:4 +#: core/templates/navigation.html:359 core/templates/weight_unit/list.html:4 #: nutrition/templates/ingredient/view.html:167 msgid "Weight units" msgstr "Одиниця ваги" -#: core/templates/navigation.html:340 core/templates/user/list.html:4 +#: core/templates/navigation.html:367 core/templates/user/list.html:4 msgid "User list" msgstr "Список користувачів" -#: core/templates/navigation.html:345 +#: core/templates/navigation.html:373 msgid "Gyms" msgstr "Тренажерні зали" @@ -1048,14 +966,6 @@ msgstr "Дякуємо за користування нашим сайтом!" msgid "The %(site_name)s team" msgstr "Команда сайту %(site_name)s" -#: core/templates/rest_framework/api.html:37 -msgid "request info" -msgstr "інформація про запит" - -#: core/templates/rest_framework/api.html:41 -msgid "response info" -msgstr "інформація про відповідь" - #: core/templates/tags/pagination.html:7 core/templates/tags/pagination.html:11 msgid "previous" msgstr "назад" @@ -1096,19 +1006,19 @@ msgstr "Повтори" msgid "RiR" msgstr "Повторів можете зробити" -#: core/templates/template.html:140 +#: core/templates/template.html:141 msgid "" "You are using a guest account, data entered will be deleted after a week." msgstr "" "Ви використовуєте обліковий запис гостя, введені дані будуть видалені через " "тиждень." -#: core/templates/template.html:144 +#: core/templates/template.html:146 msgid "Create some demo entries" msgstr "Створіть деякі демонстраційні записи" -#: core/templates/template.html:181 core/templates/template_no_context.html:88 -#: software/templates/features.html:531 software/templates/tos.html:7 +#: core/templates/template.html:183 software/templates/features.html:540 +#: software/templates/tos.html:7 msgid "Terms of service" msgstr "Умови надання послуг" @@ -1195,15 +1105,15 @@ msgstr "Забули пароль?" #: core/templates/user/overview.html:25 core/templates/user/overview.html:68 #: core/templates/user/overview.html:112 core/templates/user/overview.html:144 -#: core/templates/user/overview.html:331 core/templates/user/overview.html:370 -#: core/templates/user/overview.html:406 +#: core/templates/user/overview.html:330 core/templates/user/overview.html:369 +#: core/templates/user/overview.html:405 #, python-format msgid "last %(number)s" msgstr "останні %(number)s" #: core/templates/user/overview.html:27 core/templates/user/overview.html:146 -#: core/templates/user/overview.html:326 core/templates/user/overview.html:365 -#: core/templates/user/overview.html:401 gym/templates/gym/member_list.html:210 +#: core/templates/user/overview.html:325 core/templates/user/overview.html:364 +#: core/templates/user/overview.html:400 gym/templates/gym/member_list.html:210 #: gym/templates/gym/member_list.html:243 #: gym/templates/gym/member_list.html:280 msgid "Overview" @@ -1216,24 +1126,25 @@ msgid "Add workout" msgstr "Додати тренування" #: core/templates/user/overview.html:34 core/templates/user/overview.html:76 -#: core/templates/user/overview.html:120 core/templates/user/overview.html:153 -#: exercises/models/base.py:103 exercises/models/base.py:108 -#: exercises/models/exercise.py:59 exercises/models/exercise.py:67 +#: core/templates/user/overview.html:120 core/templates/user/overview.html:152 +#: exercises/models/base.py:116 exercises/models/base.py:122 +#: exercises/models/exercise.py:59 exercises/models/exercise.py:65 +#: exercises/models/image.py:106 exercises/models/image.py:112 +#: exercises/models/video.py:160 exercises/models/video.py:166 #: gallery/models/image.py:47 manager/helpers.py:86 manager/models/log.py:100 -#: manager/models/session.py:67 measurements/models/measurement.py:64 -#: nutrition/models/ingredient.py:89 nutrition/models/ingredient.py:95 -#: nutrition/models/ingredient.py:210 nutrition/templates/log/overview.html:30 -#: nutrition/templates/plan/view.html:312 weight/models.py:32 +#: manager/models/session.py:67 measurements/models/measurement.py:48 +#: nutrition/models/ingredient.py:99 nutrition/models/ingredient.py:105 +#: nutrition/models/ingredient.py:220 weight/models.py:32 #: weight/templates/import_csv_preview.html:13 #: weight/templates/import_csv_preview.html:42 weight/views.py:142 msgid "Date" msgstr "Дата" -#: core/templates/user/overview.html:35 core/templates/user/overview.html:154 +#: core/templates/user/overview.html:35 core/templates/user/overview.html:153 #: exercises/models/exercise.py:47 gallery/models/image.py:70 #: gym/models/contract.py:57 gym/models/contract.py:107 #: manager/models/day.py:37 manager/models/workout.py:62 -#: measurements/models/measurement.py:79 nutrition/models/plan.py:69 +#: measurements/models/measurement.py:63 nutrition/models/plan.py:68 msgid "Description" msgstr "Опис" @@ -1256,7 +1167,7 @@ msgstr "Журнал" msgid "General impression" msgstr "Загальне враження" -#: core/templates/user/overview.html:78 core/templates/user/overview.html:370 +#: core/templates/user/overview.html:78 core/templates/user/overview.html:369 #: manager/models/session.py:73 #: manager/templates/calendar/partial_overview_table.html:56 #: manager/templates/workout/log.html:89 @@ -1266,18 +1177,37 @@ msgstr "Примітки" #: core/templates/user/overview.html:79 #: exercises/templates/history/overview.html:30 #: manager/templates/calendar/partial_overview_table.html:42 -#: nutrition/templates/log/detail.html:154 msgid "Time" msgstr "Час" -#: core/templates/user/overview.html:147 -#: nutrition/templates/plan/overview.html:36 -msgid "Add nutrition plan" -msgstr "Додати план харчування" +#: core/templates/user/overview.html:154 nutrition/models/ingredient.py:128 +#: nutrition/templates/ingredient/view.html:77 nutrition/views/plan.py:237 +msgid "Energy" +msgstr "Енергія" + +#: core/templates/user/overview.html:155 nutrition/models/ingredient.py:135 +#: nutrition/templates/ingredient/view.html:84 nutrition/views/plan.py:243 +msgid "Protein" +msgstr "Білок" + +#: core/templates/user/overview.html:156 nutrition/models/ingredient.py:143 +#: nutrition/templates/ingredient/view.html:90 nutrition/views/plan.py:251 +msgid "Carbohydrates" +msgstr "Вуглеводи" -#: core/templates/user/overview.html:202 core/templates/user/overview.html:323 -#: core/templates/user/overview.html:362 core/templates/user/overview.html:398 -#: core/templates/user/overview.html:443 gym/templates/gym/list.html:42 +#: core/templates/user/overview.html:157 nutrition/models/ingredient.py:161 +#: nutrition/templates/ingredient/view.html:106 nutrition/views/plan.py:265 +msgid "Fat" +msgstr "Жири" + +#: core/templates/user/overview.html:170 +#: nutrition/templates/ingredient/view.html:79 +msgid "kcal" +msgstr "ккал" + +#: core/templates/user/overview.html:201 core/templates/user/overview.html:322 +#: core/templates/user/overview.html:361 core/templates/user/overview.html:397 +#: core/templates/user/overview.html:442 gym/templates/gym/list.html:42 #: gym/templates/gym/member_list.html:84 gym/templates/gym/member_list.html:137 #: gym/templates/gym/member_list.html:173 #: gym/templates/gym/member_list.html:207 @@ -1287,110 +1217,110 @@ msgstr "Додати план харчування" msgid "Actions" msgstr "Дії" -#: core/templates/user/overview.html:208 +#: core/templates/user/overview.html:207 msgid "Deactivate user" msgstr "Деактивувати користувача" -#: core/templates/user/overview.html:210 +#: core/templates/user/overview.html:209 msgid "Activate user" msgstr "Активувати користувача" -#: core/templates/user/overview.html:212 +#: core/templates/user/overview.html:211 msgid "Reset user password" msgstr "Скинути пароль користувача" -#: core/templates/user/overview.html:215 gym/templates/gym/member_list.html:30 +#: core/templates/user/overview.html:214 gym/templates/gym/member_list.html:30 msgid "Roles" msgstr "Ролі" -#: core/templates/user/overview.html:226 +#: core/templates/user/overview.html:225 msgid "Password reset confirmation" msgstr "Підтвердження відновлення пароля" -#: core/templates/user/overview.html:230 +#: core/templates/user/overview.html:229 msgid "Do you really want to change this user's password?" msgstr "Ви дійсно бажаєте змінити пароль цього користувача?" -#: core/templates/user/overview.html:233 +#: core/templates/user/overview.html:232 #: exercises/templates/history/overview.html:106 msgid "No" msgstr "Ні" -#: core/templates/user/overview.html:234 +#: core/templates/user/overview.html:233 #: exercises/templates/history/overview.html:99 msgid "Yes" msgstr "Так" -#: core/templates/user/overview.html:255 gym/templates/gym/member_list.html:93 +#: core/templates/user/overview.html:254 gym/templates/gym/member_list.html:93 msgid "Details" msgstr "Деталі" -#: core/templates/user/overview.html:259 gym/views/export.py:59 +#: core/templates/user/overview.html:258 gym/views/export.py:59 #: manager/helpers.py:87 manager/templates/schedule/view.html:99 -#: nutrition/views/plan.py:288 nutrition/views/plan.py:296 +#: nutrition/views/plan.py:143 nutrition/views/plan.py:151 msgid "Nr." msgstr "№" -#: core/templates/user/overview.html:281 gym/models/contract.py:284 +#: core/templates/user/overview.html:280 gym/models/contract.py:284 #: gym/models/gym.py:50 gym/templates/contract/view.html:75 #: gym/templates/gym/member_list.html:100 gym/views/export.py:70 msgid "Phone" msgstr "Телефон" -#: core/templates/user/overview.html:285 gym/templates/contract/view.html:87 +#: core/templates/user/overview.html:284 gym/templates/contract/view.html:87 #: gym/templates/gym/member_list.html:118 msgid "Address" msgstr "Адреса" -#: core/templates/user/overview.html:296 +#: core/templates/user/overview.html:295 msgid "Registered" msgstr "Зареєстрований" -#: core/templates/user/overview.html:300 +#: core/templates/user/overview.html:299 msgid "Last login" msgstr "Останній вхід" -#: core/templates/user/overview.html:305 +#: core/templates/user/overview.html:304 msgid "Status" msgstr "Статус" -#: core/templates/user/overview.html:308 +#: core/templates/user/overview.html:307 msgid "Active" msgstr "Активний" -#: core/templates/user/overview.html:310 +#: core/templates/user/overview.html:309 msgid "Inactive" msgstr "Неактивний" -#: core/templates/user/overview.html:331 gym/templates/contract/list.html:4 +#: core/templates/user/overview.html:330 gym/templates/contract/list.html:4 #: gym/templates/gym/member_list.html:202 msgid "Contracts" msgstr "Контракти" -#: core/templates/user/overview.html:406 gym/templates/document/list.html:4 +#: core/templates/user/overview.html:405 gym/templates/document/list.html:4 msgid "Documents" msgstr "Документи" -#: core/templates/user/overview.html:413 gym/templates/document/list.html:32 +#: core/templates/user/overview.html:412 gym/templates/document/list.html:32 #: manager/forms.py:295 manager/templates/workout/view.html:134 msgid "Download" msgstr "Завантажити" -#: core/templates/user/overview.html:451 gym/views/admin_config.py:44 +#: core/templates/user/overview.html:450 gym/views/admin_config.py:44 #: gym/views/admin_config.py:58 gym/views/user_config.py:46 msgid "Configuration" msgstr "Конфігурація" -#: core/templates/user/overview.html:454 gym/models/user_config.py:92 +#: core/templates/user/overview.html:453 gym/models/user_config.py:92 msgid "Include in inactive overview" msgstr "Включити в огляд неактивних" -#: core/templates/user/overview.html:487 +#: core/templates/user/overview.html:486 #, python-format msgid "Admin login is only available for users in %(gym_name)s" msgstr "Вхід адміністратора доступний лише для користувачів у %(gym_name)s" -#: core/templates/user/overview.html:491 +#: core/templates/user/overview.html:490 msgid "Log in as this user" msgstr "Увійти як цей користувач" @@ -1418,7 +1348,7 @@ msgstr "Вам необхідно підтвердити свою електро msgid "Change password" msgstr "Змінити пароль" -#: core/templatetags/wger_extras.py:204 i18n.tpl:36 +#: core/templatetags/wger_extras.py:204 i18n.tpl:37 msgid "kg" msgstr "кг" @@ -1434,7 +1364,7 @@ msgctxt "weight unit, i.e. grams" msgid "g" msgstr "г" -#: core/templatetags/wger_extras.py:209 i18n.tpl:37 +#: core/templatetags/wger_extras.py:209 i18n.tpl:38 msgid "lb" msgstr "фунт" @@ -1448,7 +1378,7 @@ msgstr "унцій" #: exercises/views/muscles.py:98 manager/views/schedule.py:310 #: manager/views/schedule_step.py:128 manager/views/workout.py:251 #: manager/views/workout_session.py:140 nutrition/views/ingredient.py:128 -#: nutrition/views/plan.py:119 nutrition/views/unit.py:110 +#: nutrition/views/unit.py:110 msgid "Successfully deleted" msgstr "Успішно вилучено" @@ -1459,8 +1389,7 @@ msgstr "Успішно вилучено" #: gym/views/admin_notes.py:195 gym/views/document.py:205 gym/views/gym.py:477 #: manager/views/schedule.py:317 manager/views/schedule_step.py:138 #: manager/views/workout.py:255 manager/views/workout_session.py:155 -#: nutrition/views/ingredient.py:135 nutrition/views/plan.py:126 -#: nutrition/views/unit.py:117 +#: nutrition/views/ingredient.py:135 nutrition/views/unit.py:117 #, python-brace-format msgid "Delete {0}?" msgstr "Вилучити {0}?" @@ -1474,12 +1403,12 @@ msgstr "Вилучити {0}?" #: gym/views/contract_type.py:123 gym/views/document.py:170 #: gym/views/gym.py:459 manager/views/day.py:100 manager/views/schedule.py:334 #: manager/views/workout.py:269 nutrition/views/ingredient.py:154 -#: nutrition/views/plan.py:143 nutrition/views/unit.py:143 +#: nutrition/views/unit.py:143 #, python-brace-format msgid "Edit {0}" msgstr "Змінити {0}" -#: core/views/misc.py:100 +#: core/views/misc.py:95 msgid "" "We have created sample workout, workout schedules, weight logs, (body) " "weight and nutrition plan entries so you can better see what this site can " @@ -1489,19 +1418,19 @@ msgstr "" "тіла та плани харчування, щоб ви могли краще побачити, що може зробити цей " "сайт. Ви можете редагувати або видаляти їх!" -#: core/views/misc.py:155 +#: core/views/misc.py:135 msgid "Rest day" msgstr "День відпочинку" -#: core/views/misc.py:184 +#: core/views/misc.py:159 msgid "Feedback" msgstr "Відгук" -#: core/views/misc.py:203 weight/templates/import_csv_form.html:9 +#: core/views/misc.py:178 weight/templates/import_csv_form.html:9 msgid "Submit" msgstr "Надіслати" -#: core/views/misc.py:211 +#: core/views/misc.py:186 msgid "Your feedback was successfully sent. Thank you!" msgstr "Ваш відгук успішно надіслано. Дякуємо!" @@ -1551,19 +1480,19 @@ msgstr "Тренажерний зал" msgid "A verification email was sent to %(email)s" msgstr "Підтверджувальний лист було надіслано на електронну адресу %(email)s" -#: exercises/models/base.py:67 nutrition/models/ingredient.py:224 +#: exercises/models/base.py:80 nutrition/models/ingredient.py:234 msgid "Category" msgstr "Категорія" -#: exercises/models/base.py:74 +#: exercises/models/base.py:87 msgid "Primary muscles" msgstr "Основні м'язи" -#: exercises/models/base.py:80 +#: exercises/models/base.py:93 msgid "Secondary muscles" msgstr "Другорядні м'язи" -#: exercises/models/base.py:95 +#: exercises/models/base.py:108 msgid "Variations" msgstr "Варіації" @@ -1581,8 +1510,8 @@ msgstr "Вправа" msgid "A comment about how to correctly do this exercise." msgstr "Коментар про те, як правильно виконувати цю вправу." -#: exercises/models/exercise.py:74 nutrition/models/ingredient.py:83 -#: nutrition/models/plan.py:61 nutrition/models/weight_unit.py:32 +#: exercises/models/exercise.py:72 nutrition/models/ingredient.py:93 +#: nutrition/models/weight_unit.py:32 msgid "Language" msgstr "Мова" @@ -1717,8 +1646,8 @@ msgstr "Дія" #: gym/templates/gym/new_user.html:22 #: gym/templates/gym/reset_user_password.html:20 manager/models/log.py:45 #: manager/models/schedule.py:44 manager/models/session.py:49 -#: manager/models/workout.py:89 measurements/models/category.py:48 -#: measurements/models/measurement.py:59 nutrition/models/plan.py:55 +#: manager/models/workout.py:89 measurements/models/category.py:32 +#: measurements/models/measurement.py:43 nutrition/models/plan.py:55 #: nutrition/templates/ingredient/pending.html:16 weight/models.py:41 msgid "User" msgstr "Користувач" @@ -1839,7 +1768,7 @@ msgstr "Тип контракту" #: gym/models/contract.py:208 gym/templates/contract/view.html:59 #: manager/templates/log/add.html:52 nutrition/forms.py:61 -#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:102 +#: nutrition/models/ingredient_weight_unit.py:54 nutrition/models/log.py:105 #: nutrition/models/meal_item.py:72 msgid "Amount" msgstr "Сума" @@ -2167,63 +2096,67 @@ msgid "Legs" msgstr "Ноги" #: i18n.tpl:22 +msgid "Lower back" +msgstr "Нижня частина спини" + +#: i18n.tpl:23 msgid "Max Reps" msgstr "Максимальна кількість повторень" -#: i18n.tpl:23 +#: i18n.tpl:24 msgid "Miles" msgstr "Милі" -#: i18n.tpl:24 +#: i18n.tpl:25 msgid "Miles Per Hour" msgstr "Миль на годину" -#: i18n.tpl:25 +#: i18n.tpl:26 msgid "Minutes" msgstr "Хвилини" -#: i18n.tpl:26 +#: i18n.tpl:27 msgid "Plates" msgstr "Пластини" -#: i18n.tpl:27 +#: i18n.tpl:28 msgid "Pull-up bar" msgstr "Перекладина" -#: i18n.tpl:28 +#: i18n.tpl:29 msgid "Quads" msgstr "Квадрицепс" -#: i18n.tpl:29 manager/forms.py:185 manager/models/log.py:73 +#: i18n.tpl:30 manager/forms.py:185 manager/models/log.py:73 #: manager/templates/set/add.html:54 msgid "Repetitions" msgstr "Повтори" -#: i18n.tpl:30 +#: i18n.tpl:31 msgid "SZ-Bar" msgstr "SZ-Штанга" -#: i18n.tpl:31 +#: i18n.tpl:32 msgid "Seconds" msgstr "Секунди" -#: i18n.tpl:32 +#: i18n.tpl:33 msgid "Shoulders" msgstr "Плечі" -#: i18n.tpl:33 +#: i18n.tpl:34 msgid "Swiss Ball" msgstr "Фітбол" -#: i18n.tpl:34 +#: i18n.tpl:35 msgid "Triceps" msgstr "Трицепси" -#: i18n.tpl:35 +#: i18n.tpl:36 msgid "Until Failure" msgstr "До відмови" -#: i18n.tpl:38 +#: i18n.tpl:39 msgid "none (bodyweight exercise)" msgstr "немає (вправа з вагою тіла)" @@ -2307,7 +2240,7 @@ msgstr "Також шукайте імена англійською мовою" #: manager/models/log.py:92 manager/models/setting.py:59 #: manager/models/setting.py:90 manager/templates/log/add.html:53 #: manager/templates/log/add.html:55 manager/templates/set/formset.html:10 -#: manager/templates/set/formset.html:12 measurements/models/category.py:58 +#: manager/templates/set/formset.html:12 measurements/models/category.py:42 #: nutrition/forms.py:65 msgid "Unit" msgstr "Одиниця" @@ -2383,7 +2316,7 @@ msgid "The duration in weeks" msgstr "Тривалість в тижнях" #: manager/models/schedule_step.py:63 manager/models/set.py:52 -#: manager/models/setting.py:110 nutrition/models/meal.py:54 +#: manager/models/setting.py:110 nutrition/models/meal.py:55 #: nutrition/models/meal_item.py:65 msgid "Order" msgstr "Порядок" @@ -2438,7 +2371,7 @@ msgstr "Кількість підходів" msgid "Sets" msgstr "Підходи" -#: manager/models/workout.py:54 nutrition/models/plan.py:65 +#: manager/models/workout.py:54 nutrition/models/plan.py:61 msgid "Creation date" msgstr "Дата створення" @@ -2682,7 +2615,6 @@ msgstr "" #: manager/templates/schedule/view.html:295 #: manager/templates/workout/view.html:96 #: manager/templates/workout/view.html:176 -#: nutrition/templates/plan/view.html:420 msgid "Download as PDF" msgstr "Завантажити як PDF" @@ -2918,7 +2850,7 @@ msgstr "Нове враження від тренування для {0}" msgid "This will delete all weight logs for this day as well." msgstr "Також буде видалено всі записи ваги для цього дня." -#: measurements/models/measurement.py:69 +#: measurements/models/measurement.py:53 msgid "Value" msgstr "Значення" @@ -2959,61 +2891,50 @@ msgstr "" "від'ємне число)" #: nutrition/forms.py:244 nutrition/models/ingredient_weight_unit.py:39 -#: nutrition/models/log.py:81 nutrition/models/meal_item.py:53 -#: nutrition/templates/log/detail.html:155 +#: nutrition/models/log.py:84 nutrition/models/meal_item.py:53 msgid "Ingredient" msgstr "Інгредієнт" -#: nutrition/models/ingredient.py:119 +#: nutrition/models/ingredient.py:129 msgid "In kcal per 100g" msgstr "В ккал на 100 г" -#: nutrition/models/ingredient.py:126 nutrition/models/ingredient.py:134 -#: nutrition/models/ingredient.py:144 nutrition/models/ingredient.py:152 -#: nutrition/models/ingredient.py:162 nutrition/models/ingredient.py:172 -#: nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:136 nutrition/models/ingredient.py:144 +#: nutrition/models/ingredient.py:154 nutrition/models/ingredient.py:162 +#: nutrition/models/ingredient.py:172 nutrition/models/ingredient.py:182 +#: nutrition/models/ingredient.py:192 msgid "In g per 100g of product" msgstr "В г на 100г продукту" -#: nutrition/models/ingredient.py:143 -#: nutrition/templates/ingredient/view.html:96 -#: nutrition/templates/log/detail.html:78 -#: nutrition/templates/plan/view.html:267 nutrition/views/plan.py:405 +#: nutrition/models/ingredient.py:153 +#: nutrition/templates/ingredient/view.html:96 nutrition/views/plan.py:259 msgid "Sugar content in carbohydrates" msgstr "Вміст цукру в вуглеводах" -#: nutrition/models/ingredient.py:161 -#: nutrition/templates/ingredient/view.html:112 -#: nutrition/templates/log/detail.html:104 -#: nutrition/templates/plan/view.html:279 nutrition/views/plan.py:419 +#: nutrition/models/ingredient.py:171 +#: nutrition/templates/ingredient/view.html:112 nutrition/views/plan.py:273 msgid "Saturated fat content in fats" msgstr "Вміст жиру у жирах" -#: nutrition/models/ingredient.py:171 -#: nutrition/templates/ingredient/view.html:134 -#: nutrition/templates/log/detail.html:122 -#: nutrition/templates/log/detail.html:178 -#: nutrition/templates/plan/view.html:290 nutrition/views/plan.py:425 +#: nutrition/models/ingredient.py:181 +#: nutrition/templates/ingredient/view.html:134 nutrition/views/plan.py:279 msgid "Fibres" msgstr "Волокна" -#: nutrition/models/ingredient.py:181 -#: nutrition/templates/ingredient/view.html:144 -#: nutrition/templates/log/detail.html:135 -#: nutrition/templates/log/detail.html:181 -#: nutrition/templates/plan/view.html:296 nutrition/views/plan.py:431 +#: nutrition/models/ingredient.py:191 +#: nutrition/templates/ingredient/view.html:144 nutrition/views/plan.py:285 msgid "Sodium" msgstr "Натрій" -#: nutrition/models/ingredient.py:203 +#: nutrition/models/ingredient.py:213 msgid "Link to product" msgstr "Посилання на виріб" -#: nutrition/models/ingredient.py:232 +#: nutrition/models/ingredient.py:242 msgid "Brand name of product" msgstr "Торгова марка виробу" -#: nutrition/models/ingredient.py:292 +#: nutrition/models/ingredient.py:302 #, python-brace-format msgid "" "The total energy ({energy}kcal) is not the approximate sum of the energy " @@ -3024,15 +2945,15 @@ msgstr "" "забезпечують білки, вуглеводи та жири ({energy_calculated} ккал +/- " "{energy_approx}%)" -#: nutrition/models/ingredient.py:374 nutrition/views/ingredient.py:208 +#: nutrition/models/ingredient.py:384 nutrition/views/ingredient.py:207 msgid "Ingredient was successfully added to the general database" msgstr "Інгредієнт успішно додано до загальної бази даних" -#: nutrition/models/ingredient.py:398 +#: nutrition/models/ingredient.py:408 msgid "New user submitted ingredient" msgstr "Новий інгредієнт поданий користувачем" -#: nutrition/models/ingredient.py:400 +#: nutrition/models/ingredient.py:410 #, python-brace-format msgid "The user {0} submitted a new ingredient \"{1}\"." msgstr "Користувач {0} подав новий інгредієнт \"{1}\"." @@ -3049,19 +2970,24 @@ msgstr "Кількість в грамах" msgid "Unit amount, e.g. \"1 Cup\" or \"1/2 spoon\"" msgstr "Одиниця кількісті, напр. \"1 чашка\" або \"1/2 ложки\"" -#: nutrition/models/log.py:55 +#: nutrition/models/log.py:49 nutrition/models/meal.py:50 +#: nutrition/models/meal_item.py:47 nutrition/models/plan.py:108 +msgid "Nutrition plan" +msgstr "План харчування" + +#: nutrition/models/log.py:58 msgid "Meal" msgstr "Приймання їжі" -#: nutrition/models/log.py:65 +#: nutrition/models/log.py:68 msgid "Date and Time (Approx.)" msgstr "Дата і час (приблизно)" -#: nutrition/models/meal.py:61 +#: nutrition/models/meal.py:62 msgid "Time (approx)" msgstr "Час (приблизно)" -#: nutrition/models/meal.py:68 +#: nutrition/models/meal.py:69 msgid "" "Give meals a textual description / name such as \"Breakfast\" or \"after " "workout\"" @@ -3069,17 +2995,17 @@ msgstr "" "Дайте стравам текстовий опис / назву, таку як \"Сніданок\" або \"після " "тренування\"" -#: nutrition/models/plan.py:71 +#: nutrition/models/plan.py:70 msgid "" "A description of the goal of the plan, e.g. \"Gain mass\" or \"Prepare for " "summer\"" msgstr "Опис мети плану, напр. \"Набір маси\" або \"Підготування до літа\"" -#: nutrition/models/plan.py:76 +#: nutrition/models/plan.py:90 msgid "Use daily calories" msgstr "Використовуйте щоденні калорії" -#: nutrition/models/plan.py:79 +#: nutrition/models/plan.py:93 msgid "" "Tick the box if you want to mark this plan as having a goal amount of " "calories. You can use the calculator or enter the value yourself." @@ -3245,14 +3171,11 @@ msgstr "Прийняти" msgid "Decline" msgstr "Відхилити" -#: nutrition/templates/ingredient/view.html:71 -#: nutrition/templates/log/detail.html:31 -#: nutrition/templates/plan/view.html:232 nutrition/views/plan.py:375 +#: nutrition/templates/ingredient/view.html:71 nutrition/views/plan.py:229 msgid "Macronutrients" msgstr "Макроелементи" #: nutrition/templates/ingredient/view.html:80 -#: nutrition/templates/plan/view.html:62 nutrition/templates/plan/view.html:249 msgid "kJ" msgstr "кДж" @@ -3264,8 +3187,6 @@ msgid "n.A." msgstr "немає в наявності" #: nutrition/templates/ingredient/view.html:128 -#: nutrition/templates/log/detail.html:119 -#: nutrition/templates/plan/view.html:287 msgid "Others" msgstr "Інші" @@ -3283,137 +3204,6 @@ msgstr "Редагувати інгредієнт" msgid "Delete ingredient" msgstr "Видалити інгредієнт" -#: nutrition/templates/log/detail.html:7 -#: nutrition/templates/log/overview.html:7 -#: nutrition/templates/plan/view.html:305 -msgid "Nutrition diary" -msgstr "Щоденник харчування" - -#: nutrition/templates/log/detail.html:32 -msgid "Planned" -msgstr "Заплановано" - -#: nutrition/templates/log/detail.html:33 -#: nutrition/templates/log/overview.html:31 -#: nutrition/templates/plan/view.html:313 -msgid "Logged" -msgstr "Записано" - -#: nutrition/templates/log/detail.html:34 -#: nutrition/templates/log/overview.html:32 -#: nutrition/templates/plan/view.html:314 -msgid "Difference" -msgstr "Різниця" - -#: nutrition/templates/log/detail.html:150 -msgid "Entries" -msgstr "Записи" - -#: nutrition/templates/log/detail.html:170 -msgid "g" -msgstr "г" - -#: nutrition/templates/log/overview.html:53 -#: nutrition/templates/plan/view.html:335 -msgid "nothing found" -msgstr "нічого не знайдено" - -#: nutrition/templates/plan/overview.html:5 -msgid "Your nutrition plans" -msgstr "Ваші плани харчування" - -#: nutrition/templates/plan/view.html:52 -msgid "Contents" -msgstr "Зміст" - -#: nutrition/templates/plan/view.html:79 -msgid "Log this meal" -msgstr "Записати цю їжу" - -#: nutrition/templates/plan/view.html:84 -msgid "Add ingredient to meal" -msgstr "Додати інгредієнт до їжі" - -#: nutrition/templates/plan/view.html:155 -msgid "No items for this meal." -msgstr "Немає елементів для цього прийому їжі." - -#: nutrition/templates/plan/view.html:193 -msgid "No meals for this plan." -msgstr "Немає харчування для цього плану." - -#: nutrition/templates/plan/view.html:205 -msgid "Log this Plan" -msgstr "Записати цей План" - -#: nutrition/templates/plan/view.html:211 -msgid "Add a new meal" -msgstr "Додати новий прийом їжі" - -#: nutrition/templates/plan/view.html:221 nutrition/views/plan.py:368 -msgid "Nutritional data" -msgstr "Харчові дані" - -#: nutrition/templates/plan/view.html:224 -#, python-format -msgid "Based on the weight entry dated %(date)s (%(weight)s)" -msgstr "На основі запису про вагу від %(date)s (%(weight)s)" - -#: nutrition/templates/plan/view.html:233 nutrition/views/plan.py:376 -msgid "Total" -msgstr "Разом" - -#: nutrition/templates/plan/view.html:234 nutrition/views/plan.py:377 -msgid "Percent of energy" -msgstr "Відсоток енергії" - -#: nutrition/templates/plan/view.html:237 nutrition/views/plan.py:378 -msgid "g per body kg" -msgstr "г на кг маси тіли" - -#: nutrition/templates/plan/view.html:239 -msgid "oz per body lb" -msgstr "унції на фунт маси тіли" - -#: nutrition/templates/plan/view.html:343 -msgid "View complete nutrition log" -msgstr "Переглянути повний журнал харчування" - -#: nutrition/templates/plan/view.html:376 -msgid "Goal" -msgstr "Ціль" - -#: nutrition/templates/plan/view.html:387 -msgid "" -"You have selected that this nutritional plan has a\n" -" goal amount of calories. Use the calculator or enter the value\n" -" yourself." -msgstr "" -"Ви вибрали, що цей план харчування має\n" -" цільову кількість калорій. Скористайтеся калькулятором або " -"введіть значення\n" -" себе." - -#: nutrition/templates/plan/view.html:397 -msgid "" -"If you find the ingredient list too short, you might want to activate the " -"preference to also show English ingredients." -msgstr "" -"Якщо список компонентів виявився занадто коротким, можна активувати " -"налаштування, щоб також показати англійські інгредієнти." - -#: nutrition/templates/plan/view.html:426 -msgid "Edit nutrition plan" -msgstr "Редагувати план харчування" - -#: nutrition/templates/plan/view.html:430 -msgid "Make a copy of this nutrition plan" -msgstr "Зробити копію цього плану харчування" - -#: nutrition/templates/plan/view.html:436 -msgid "Delete nutrition plan" -msgstr "Видалити план харчування" - #: nutrition/templates/rate/form.html:25 msgid "Basal metabolic rate" msgstr "Базальний рівень метаболізму" @@ -3519,39 +3309,39 @@ msgstr "від 56 до 90" msgid "Add a new ingredient" msgstr "Додати новий інгредієнт" -#: nutrition/views/ingredient.py:221 +#: nutrition/views/ingredient.py:220 msgid "Ingredient was successfully marked as rejected" msgstr "Інгредієнт успішно позначений як відхилений" -#: nutrition/views/log.py:230 nutrition/views/unit_ingredient.py:138 -msgid "Delete?" -msgstr "Видалити?" - -#: nutrition/views/meal.py:55 -msgid "Add new meal" -msgstr "Додати новий прийом їжі" - -#: nutrition/views/meal.py:80 -msgid "Edit meal" -msgstr "Редагувати прийом їжі" - -#: nutrition/views/meal_item.py:112 -msgid "Edit meal item" -msgstr "Редагувати елемент прийому їжі" - -#: nutrition/views/plan.py:264 +#: nutrition/views/plan.py:119 msgid "Nutritional plan" msgstr "План харчування" -#: nutrition/views/plan.py:266 +#: nutrition/views/plan.py:121 #, python-format msgid "Nutritional plan for %s" msgstr "План харчування для %s" -#: nutrition/views/plan.py:340 +#: nutrition/views/plan.py:195 msgid "This is an empty plan, what did you expect on the PDF?" msgstr "Це порожній план, що ви очікували на PDF?" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "Харчові дані" + +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "Разом" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" +msgstr "Відсоток енергії" + +#: nutrition/views/plan.py:232 +msgid "g per body kg" +msgstr "г на кг маси тіли" + #: nutrition/views/unit_ingredient.py:69 msgid "Add a new weight unit" msgstr "Додати нову одиницю ваги" @@ -3560,6 +3350,10 @@ msgstr "Додати нову одиницю ваги" msgid "Edit a weight unit to ingredient connection" msgstr "Змінити одиницю ваги з'єднання інгредієнтів" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "Видалити?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -4071,6 +3865,132 @@ msgstr "Успішно видалено." msgid "Delete weight entry for the %s" msgstr "Видалити запис ваги для %s" +#~ msgid "Something happened that is not allowed." +#~ msgstr "Сталося щось, що не дозволено." + +#~ msgid "Something happened that caused an error." +#~ msgstr "Сталося щось, що призвело до помилки." + +#~ msgid "Add new diary entry" +#~ msgstr "Додати новий запис щоденника" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "Натисніть, щоб додати запис до свого щоденника харчування на сьогодні. Ви " +#~ "можете або записати їжу, як ви її визначили, або ввести будь-яку " +#~ "кількість власних записів." + +#~ msgid "Add custom diary entry" +#~ msgstr "Додати власний запис щоденника" + +#~ msgid "No nutrition plans." +#~ msgstr "Немає планів харчування." + +#~ msgid "request info" +#~ msgstr "інформація про запит" + +#~ msgid "response info" +#~ msgstr "інформація про відповідь" + +#~ msgid "Add nutrition plan" +#~ msgstr "Додати план харчування" + +#~ msgid "Nutrition diary" +#~ msgstr "Щоденник харчування" + +#~ msgid "Planned" +#~ msgstr "Заплановано" + +#~ msgid "Logged" +#~ msgstr "Записано" + +#~ msgid "Difference" +#~ msgstr "Різниця" + +#~ msgid "Entries" +#~ msgstr "Записи" + +#~ msgid "g" +#~ msgstr "г" + +#~ msgid "nothing found" +#~ msgstr "нічого не знайдено" + +#~ msgid "Your nutrition plans" +#~ msgstr "Ваші плани харчування" + +#~ msgid "Contents" +#~ msgstr "Зміст" + +#~ msgid "Log this meal" +#~ msgstr "Записати цю їжу" + +#~ msgid "Add ingredient to meal" +#~ msgstr "Додати інгредієнт до їжі" + +#~ msgid "No items for this meal." +#~ msgstr "Немає елементів для цього прийому їжі." + +#~ msgid "No meals for this plan." +#~ msgstr "Немає харчування для цього плану." + +#~ msgid "Log this Plan" +#~ msgstr "Записати цей План" + +#~ msgid "Add a new meal" +#~ msgstr "Додати новий прийом їжі" + +#, python-format +#~ msgid "Based on the weight entry dated %(date)s (%(weight)s)" +#~ msgstr "На основі запису про вагу від %(date)s (%(weight)s)" + +#~ msgid "oz per body lb" +#~ msgstr "унції на фунт маси тіли" + +#~ msgid "View complete nutrition log" +#~ msgstr "Переглянути повний журнал харчування" + +#~ msgid "Goal" +#~ msgstr "Ціль" + +#~ msgid "" +#~ "You have selected that this nutritional plan has a\n" +#~ " goal amount of calories. Use the calculator or enter the " +#~ "value\n" +#~ " yourself." +#~ msgstr "" +#~ "Ви вибрали, що цей план харчування має\n" +#~ " цільову кількість калорій. Скористайтеся калькулятором або " +#~ "введіть значення\n" +#~ " себе." + +#~ msgid "" +#~ "If you find the ingredient list too short, you might want to activate the " +#~ "preference to also show English ingredients." +#~ msgstr "" +#~ "Якщо список компонентів виявився занадто коротким, можна активувати " +#~ "налаштування, щоб також показати англійські інгредієнти." + +#~ msgid "Edit nutrition plan" +#~ msgstr "Редагувати план харчування" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "Зробити копію цього плану харчування" + +#~ msgid "Delete nutrition plan" +#~ msgstr "Видалити план харчування" + +#~ msgid "Add new meal" +#~ msgstr "Додати новий прийом їжі" + +#~ msgid "Edit meal" +#~ msgstr "Редагувати прийом їжі" + +#~ msgid "Edit meal item" +#~ msgstr "Редагувати елемент прийому їжі" + #~ msgid "Free license" #~ msgstr "Безкоштовна ліцензія" @@ -4084,9 +4004,6 @@ msgstr "Видалити запис ваги для %s" #~ msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\"" #~ msgstr "%(name)s занадто схоже на наявну вправу \"%(exercise_name)s\"" -#~ msgid "Lower back" -#~ msgstr "Нижня частина спини" - #~ msgid "Add training day" #~ msgstr "Додати тренувальний день" diff --git a/wger/locale/zh_CN/LC_MESSAGES/django.po b/wger/locale/zh_CN/LC_MESSAGES/django.po index c4dbf4aa5..e53adc943 100644 --- a/wger/locale/zh_CN/LC_MESSAGES/django.po +++ b/wger/locale/zh_CN/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: wger Workout Manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-06 11:42+0200\n" +"POT-Creation-Date: 2023-12-04 18:26+0100\n" "PO-Revision-Date: 2023-09-05 05:55+0000\n" "Last-Translator: Scotee007 \n" "Language-Team: Chinese (Simplified) This is an empty plan, what did you expect on the PDF?" msgstr "" -#: nutrition/views/plan.py:264 -msgid "Nutritional plan" -msgstr "" +#: nutrition/views/plan.py:222 +msgid "Nutritional data" +msgstr "营养数据" -#: nutrition/views/plan.py:266 -#, python-format -msgid "Nutritional plan for %s" +#: nutrition/views/plan.py:230 +msgid "Total" +msgstr "总量" + +#: nutrition/views/plan.py:231 +msgid "Percent of energy" msgstr "" -#: nutrition/views/plan.py:340 -msgid "This is an empty plan, what did you expect on the PDF?" +#: nutrition/views/plan.py:232 +msgid "g per body kg" msgstr "" #: nutrition/views/unit_ingredient.py:69 @@ -3450,6 +3247,10 @@ msgstr "新增计量单位" msgid "Edit a weight unit to ingredient connection" msgstr "关联计量单位与食谱" +#: nutrition/views/unit_ingredient.py:138 +msgid "Delete?" +msgstr "删除?" + #: software/templates/about_us.html:9 msgid "" "Thank you for using wger! wger is a collaborative open source project, made " @@ -3944,6 +3745,55 @@ msgstr "" msgid "Delete weight entry for the %s" msgstr "" +#~ msgid "Something happened that is not allowed." +#~ msgstr "不允许的事情发生了。" + +#~ msgid "Something happened that caused an error." +#~ msgstr "某个问题导致了错误." + +#~ msgid "Add new diary entry" +#~ msgstr "添加新的日记条目" + +#~ msgid "" +#~ "Click to add an entry to your nutrition diary for today. You can either " +#~ "log a meal as you defined it, or entry any number of custom entries." +#~ msgstr "" +#~ "点击添加一个条目到你今天的营养日记。您可以按照自己的定义记录一餐，也可以输" +#~ "入任意数量的自定义条目。" + +#~ msgid "Add custom diary entry" +#~ msgstr "添加自定义日记条目" + +#~ msgid "No nutrition plans." +#~ msgstr "没有健身计划." + +#~ msgid "request info" +#~ msgstr "请求信息" + +#~ msgid "response info" +#~ msgstr "响应信息" + +#~ msgid "Add nutrition plan" +#~ msgstr "新增营养计划" + +#~ msgid "g" +#~ msgstr "克" + +#~ msgid "Your nutrition plans" +#~ msgstr "你的营养计划" + +#~ msgid "Goal" +#~ msgstr "目标" + +#~ msgid "Edit nutrition plan" +#~ msgstr "编辑营养计划" + +#~ msgid "Make a copy of this nutrition plan" +#~ msgstr "复制该营养计划" + +#~ msgid "Delete nutrition plan" +#~ msgstr "删除营养计划" + #~ msgid "Free license" #~ msgstr "免费许可协议"