Merge remote-tracking branch 'upstream/feature/custom_filters' into feature/custom_filters

This commit is contained in:
smilerz
2022-02-13 14:14:28 -06:00
44 changed files with 2509 additions and 2331 deletions

View File

@@ -323,9 +323,10 @@
"search_rank": "Search Rank",
"make_now": "Make Now",
"recipe_filter": "Recipe Filter",
"book_filter_help": "Include recipes from recipe filter instead of assigning each recipe",
"book_filter_help": "Include recipes from recipe filter in addition to manually assigned ones.",
"review_shopping": "Review shopping entries before saving",
"view_recipe": "View Recipe",
"explain": "Explain",
"filter": "Filter",
"reset_children": "Reset Child Inheritance",
"reset_children_help": "Overwrite all children with values from inherited fields. Inheritted fields of children will be set to Inherit Fields unless Children Inherit Fields is set.",