mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-06 14:48:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/custom_filters

Browse Source 
# Conflicts:
#	vue/src/components/MealPlanEditModal.vue
#	vue/src/locales/en.json
This commit is contained in:
vabene1111
2022-02-17 10:57:35 +01:00
parent a76c4365ea caeaab22ce
commit 3292c596ff
7 changed files with 131 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vue/src/locales/en.json
View File

@@ -326,6 +326,11 @@
"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",
"copy_to_new": "Copy To New Recipe",
"recipe_name": "Recipe Name",
"paste_ingredients_placeholder": "Paste ingredient list here...",
"paste_ingredients": "Paste Ingredients",
"ingredient_list": "Ingredient List",
"explain": "Explain",
"filter": "Filter",
"reset_children": "Reset Child Inheritance",