From 66483d5317b61744024b44ffe124d81a8ee40c57 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <nath@nkinka.de>
Date: Wed, 14 Nov 2012 20:44:41 +0000
Subject: Changed meal to recipe in a number of files.

---
 templates/edit_account.tpl     |  2 +-
 templates/edit_meal.tpl        |  6 +++---
 templates/faq.tpl              | 16 ++++++++--------
 templates/list_meals.tpl       |  2 +-
 templates/manage.tpl           |  6 +++---
 templates/nutrient_chooser.tpl |  2 +-
 templates/view_diary.tpl       |  6 +++---
 templates/view_meal.tpl        |  6 +++---
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/templates/edit_account.tpl b/templates/edit_account.tpl
index 48305c8..1b778b7 100644
--- a/templates/edit_account.tpl
+++ b/templates/edit_account.tpl
@@ -11,7 +11,7 @@
 <!--
 				Use this form to edit your account profile, or delete the account entirely.
 				<strong>NOTE</strong>: if you choose to delete the account, then be aware that
-				any and all data (foods, meals, diaries, etc.) associated with the account will
+				any and all data (foods, recipes, diaries, etc.) associated with the account will
 				also be permanently and irrevocably deleted.  This isn't a problem, but something
 				that you should be aware of.  For this reason, you will be prompted twice as to
 				whether you really want to delete the account.  If you don't wish to change your
diff --git a/templates/edit_meal.tpl b/templates/edit_meal.tpl
index b741395..70617cf 100644
--- a/templates/edit_meal.tpl
+++ b/templates/edit_meal.tpl
@@ -6,7 +6,7 @@
 			<h3 style='text-align: center;'>Edit Meals</h3>
 			<div style='float: left; padding-right: 2ex; width: 25%;'>
 				<div>
-					<span style='text-decoration: underline;'><strong>Saved meals</strong></span>
+					<span style='text-decoration: underline;'><strong>Saved recipes</strong></span>
 				</div>
 {if $savedMeals}
 	{foreach from=$savedMeals item=savedMeal}
@@ -15,7 +15,7 @@
 				</div>
 	{/foreach}
 {else}
-				No saved meals.
+				No saved recipes.
 {/if}
 			</div>
 			<div style='float: left; overflow: auto; margin-bottom: 1em;'>
@@ -24,7 +24,7 @@
 {if $editMeal}
 						<script type='text/javascript'>xajax_loadMealToEdit("{$editMeal}");</script>
 {else}
-						&lt;= Select a meal to edit.
+						&lt;= Select a recipe to edit.
 {/if}
 					</div>
 				</form>
diff --git a/templates/faq.tpl b/templates/faq.tpl
index f309106..b4edff6 100644
--- a/templates/faq.tpl
+++ b/templates/faq.tpl
@@ -137,7 +137,7 @@
 			<a name='timestamp' id='timestamp' style='position: absolute;'></a>
 			<div class='helpItem'>
 				<strong>What is a diary "Timestamp"</strong>?
-				A food diary "Timestamp" allows you to specify exactly when you ate a particular food or meal.
+				A food diary "Timestamp" allows you to specify exactly when you ate a particular food or recipe.
 				Most people are not going to be able to enter foods into the food diary exactly at the
 				moment they are eaten.  However, for a variety of reasons it is important to know when a
 				particular item was consumed, especially if you are trying to determine a food sensitivity, or
@@ -149,14 +149,14 @@
 			<a name='favorites' id='favorites' style='position: absolute;'></a>
 			<div class='helpItem'>
 				<strong>What are "favorites" and how do they work</strong>?<br />
-				Marking a food or meal as a favorite will give you quick access to the items that you use most
+				Marking a food or recipe as a favorite will give you quick access to the items that you use most
 				frequently.  For example, you may have saved 500 different foods, but perhaps you only reference,
 				say, 50 or 60 of those with any frequency, so you mark those 50 or 60 foods as "Favorites."  There
-				is nothing different about a favorite saved food or meal from any other saved food or meal, except
+				is nothing different about a favorite saved food or recipe from any other saved food or recipe, except
 				that your favorites will be located in the quick-access drop-down menus in the left sidebar, and you
-				will also have access to the "Quick Edit" functions for your favorite foods and meals.  There is no
-				limit to how many foods or meals can be marked as favorite.  However, if you have many foods and
-				meals you may find it inconvenient to have a drop-down menu with hundreds of items, but this is a 
+				will also have access to the "Quick Edit" functions for your favorite foods and recipes.  There is no
+				limit to how many foods or recipes can be marked as favorite.  However, if you have many foods and
+				recipes you may find it inconvenient to have a drop-down menu with hundreds of items, but this is a 
 				personal choice. <strong>Note</strong>: you cannot mark a diary as a favorite.  All diaries are
 				considered favorites.
 			</div>
@@ -164,11 +164,11 @@
 			<a name='nofavorites' id='nofavorites' style='position: absolute;'></a>
 			<div class='helpItem'>
 				<strong>I haven't marked anything as a favorite but things are still showing up in my favorites lists.  Why</strong>?<br />
-				If your total saved foods or meals, respectively, are less than 15 then the system will automatically
+				If your total saved foods or recipes, respectively, are less than 15 then the system will automatically
 				place those items in your favorites lists as a convenience.  However, only the first 15 will appear.
 				For example, if you have saved 40 foods, but haven't marked any as a favorite, then the system will
 				automatically select the first 15 saved foods and place them in the favorite foods drop-down menu.
-				Once you mark at least one food or meal as a favorite, only those foods or meals marked as favorites
+				Once you mark at least one food or recipe as a favorite, only those foods or reipes marked as favorites
 				will appear in the favorites drop-down menus, no matter how few or many. <strong>Note</strong>: you
 				cannot mark a diary as a favorite.  All diaries are considered favorites.
 			</div>
diff --git a/templates/list_meals.tpl b/templates/list_meals.tpl
index b357353..0580170 100644
--- a/templates/list_meals.tpl
+++ b/templates/list_meals.tpl
@@ -24,7 +24,7 @@
 			</div>
 	{/if}
 {else}
-			<div>* No saved meals.</div>
+			<div>* No saved recipes.</div>
 {/if}
 		</div>
 	</div>
diff --git a/templates/manage.tpl b/templates/manage.tpl
index 20a7e96..6205f42 100644
--- a/templates/manage.tpl
+++ b/templates/manage.tpl
@@ -70,7 +70,7 @@
 			</div>
 			<div style='clear: both;'></div>
 {else}
-			<div style='margin: 1ex;'>* No saved meals to manage.</div>
+			<div style='margin: 1ex;'>* No saved recipes to manage.</div>
 {/if}
 {if $userDiaries}
 			<div style='margin: 1ex;'>
@@ -112,7 +112,7 @@
 			</div>
 
 			<div style='margin-top: 2ex; margin-bottom: 2ex;'>
-				<a href='edit_meal.php?action=showMeals'>Edit meals</a> - use this section to edit any/all meals,
+				<a href='edit_meal.php?action=showMeals'>Edit recipes</a> - use this section to edit any/all recipes,
 				not just favorites.
 			</div>
 
@@ -131,7 +131,7 @@
 				concerned with the majority of them, but rather only a small percentage of the
 				available nutrients.  Use this section to filter out the nutrients you do not want
 				to see, though you will always have the option to view all nutrient data while
-				viewing any food or meal.
+				viewing any food or recipe.
 			</div>
 
 			<div style='margin-top: 2ex; margin-bottom: 2ex; text-align: justify;'>
diff --git a/templates/nutrient_chooser.tpl b/templates/nutrient_chooser.tpl
index cebe456..18b2f81 100644
--- a/templates/nutrient_chooser.tpl
+++ b/templates/nutrient_chooser.tpl
@@ -8,7 +8,7 @@
 				There is fairly bewildering array of nutrient data available for most of the foods
 				in this database.  In most cases, you may only be concerned with a select few of
 				these nutrients.  This form allows you to select which nutrients will be displayed
-				in your food and meal summaries.  Don't be afraid to uncheck too may options below.
+				in your food and recipe summaries.  Don't be afraid to uncheck too may options below.
 				With every summary you will have the option to view information for all nutrients,
 				including the ones you have selected to hide here.  Checked nutrients will be displayed
 				in summaries.  Unchecked nutrients will be hidden.
diff --git a/templates/view_diary.tpl b/templates/view_diary.tpl
index 614349c..52f65e4 100644
--- a/templates/view_diary.tpl
+++ b/templates/view_diary.tpl
@@ -139,10 +139,10 @@
 	{/if}
 {else}
 			<div class='standardMargins' style='text-align: justify;'>
-				This day has no diary entries.  If you would like to add a food or a meal, search for or view an item as
+				This day has no diary entries.  If you would like to add a food or a recipe, search for or view an item as
 				you normally would and then use the form at the bottom of the nutrition summary page to add the item
-				to a diary.  Using the "timestamp" field you can add a food or meal to this day.  Here's a tip:  create 
-				a collection of saved foods that you eat frequently and use them as the building blocks for diaries and meals.
+				to a diary.  Using the "timestamp" field you can add a food or recipe to this day.  Here's a tip:  create 
+				a collection of saved foods that you eat frequently and use them as the building blocks for diaries and recipes.
 				If you want to add a note to this diary, you may do so with the form below.
 			</div>
 {/if}
diff --git a/templates/view_meal.tpl b/templates/view_meal.tpl
index b3ffdc4..4ef1e62 100644
--- a/templates/view_meal.tpl
+++ b/templates/view_meal.tpl
@@ -48,17 +48,17 @@
 				<form action='add_meal.php' method='post' name='formAddMeal' id='formAddMeal' onsubmit='return validateAddMeal("formAddMeal","mealDesc");'>
 					<a name='save'></a>
 					<div style='margin-bottom: .5em; text-align: justify;'>
-						If you would like to save this meal for later reference, or add it
+						If you would like to save this recipe for later reference, or add it
 						to a diary, enter a short descriptive entry in the text box below
 						and then select the appropriate button.  If you are unsure how all
 						of this works, then take a look at the help on
-						<a href='faq.php#meals'>creating meals</a>.
+						<a href='faq.php#recipes'>creating recipes</a>.
 					</div>
 					<div style='margin-bottom: .5em;'>
 						<input type='text' name='description' id='mealDesc' style='width: 100%' value='{$mealDesc}' />
 					</div>
 					<div style='margin-bottom: .5em;'>
-						<input type='submit' name='saveMeal' value='Save meal' style='width: 20ex;' onclick='document.formAddMeal.action.value = "saveMeal";'  />
+						<input type='submit' name='saveMeal' value='Save recipe' style='width: 20ex;' onclick='document.formAddMeal.action.value = "saveMeal";'  />
 					</div>
 
 	{if $userDiaries}
-- 
cgit v1.2.3