Skip to content

Commit a3734a4

Browse files
authored
Merge pull request #584 from wger-project/goal-fiber
Fiber goals
2 parents f00dc88 + cbd3d43 commit a3734a4

File tree

109 files changed

+1779
-663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1779
-663
lines changed

lib/database/exercises/exercise_database.g.dart

Lines changed: 641 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/database/ingredients/ingredients_database.g.dart

Lines changed: 147 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/l10n/app_ar.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
"@register": {
397397
"description": "Text for registration button"
398398
},
399-
"fibres": "الألياف",
399+
"fiber": "الألياف",
400400
"@fibres": {},
401401
"aboutDescription": "شكرًا لاستخدامك وقر! وقر مشروع تعاوني مفتوح المصدر، تم إنشاؤه بواسطة عشّاق اللياقة البدنية من جميع أنحاء العالم.",
402402
"@aboutDescription": {

lib/l10n/app_ca.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
"@noWeightEntries": {
473473
"description": "Message shown when the user has no logged weight entries"
474474
},
475-
"fibres": "Fibra",
475+
"fiber": "Fibra",
476476
"@fibres": {},
477477
"sodium": "Sodi",
478478
"@sodium": {},

lib/l10n/app_cs.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
},
204204
"saturatedFat": "Nasycené tuky",
205205
"@saturatedFat": {},
206-
"fibres": "Vláknina",
206+
"fiber": "Vláknina",
207207
"@fibres": {},
208208
"sodium": "Sodík",
209209
"@sodium": {},

lib/l10n/app_de.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
},
6161
"sodium": "Natrium",
6262
"@sodium": {},
63-
"fibres": "Ballaststoff",
63+
"fiber": "Ballaststoff",
6464
"@fibres": {},
6565
"saturatedFat": "Gesättigte Fettsäuren",
6666
"@saturatedFat": {},

lib/l10n/app_en.arb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,15 @@
278278
},
279279
"onlyLogging": "Only track calories",
280280
"onlyLoggingHelpText": "Check the box if you only want to log your calories and don't want to setup a detailed nutritional plan with specific meals",
281-
"addGoalsToPlan": "Add goals to this plan",
282-
"addGoalsToPlanHelpText": "This allows you to set general goals for energy, protein, carbohydrates or fat for the plan. Note that if you set-up a detailed meal plan, these values will take precedence.",
281+
"goalMacro": "Macro goals",
282+
"@goalMacro": {
283+
"description": "The goal for macronutrients"
284+
},
283285
"goalEnergy": "Energy goal",
284286
"goalProtein": "Protein goal",
285287
"goalCarbohydrates": "Carbohydrates goal",
286288
"goalFat": "Fat goal",
289+
"goalFiber": "Fiber goal",
287290
"anErrorOccurred": "An Error Occurred!",
288291
"@anErrorOccurred": {},
289292
"weight": "Weight",
@@ -430,7 +433,7 @@
430433
},
431434
"saturatedFat": "Saturated fat",
432435
"@saturatedFat": {},
433-
"fibres": "Fibre",
436+
"fiber": "Fibers",
434437
"@fibres": {},
435438
"sodium": "Sodium",
436439
"@sodium": {},

lib/l10n/app_es.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
},
131131
"sodium": "Sodio",
132132
"@sodium": {},
133-
"fibres": "Fibra",
133+
"fiber": "Fibra",
134134
"@fibres": {},
135135
"saturatedFat": "Grasas saturadas",
136136
"@saturatedFat": {},

lib/l10n/app_fr.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
},
7070
"sodium": "Sodium",
7171
"@sodium": {},
72-
"fibres": "Fibres",
72+
"fiber": "fiber",
7373
"@fibres": {},
7474
"saturatedFat": "Graisses saturées",
7575
"@saturatedFat": {},

lib/l10n/app_he.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275
"@fat": {},
276276
"saturatedFat": "שומן רווי",
277277
"@saturatedFat": {},
278-
"fibres": "סיבים",
278+
"fiber": "סיבים",
279279
"@fibres": {},
280280
"sodium": "נתרן",
281281
"@sodium": {},

0 commit comments

Comments
 (0)