Fix unintended renaming

9 files changed, 25 insertions, 25 deletions

diff --git a/krecipes/src/backends/usda_ingredient_data.h b/krecipes/src/backends/usda_ingredient_data.h
index c633bdd..9fb4b8a 100644
--- a/krecipes/src/backends/usda_ingredient_data.h
+++ b/krecipes/src/backends/usda_ingredient_data.h
@@ -76,7 +76,7 @@ static ingredient_data ingredient_data_list[] = {
             {I18N_NOOP( "canned beef" ), 13934},
             {I18N_NOOP( "canned black beans" ), 16018},
             {I18N_NOOP( "canned carrot slices" ), 11128},
-            {I18N_NOOP( "canned cooked stquid" ), 15175},
+            {I18N_NOOP( "canned cooked squid" ), 15175},
             {I18N_NOOP( "canned corn" ), 11174},
             {I18N_NOOP( "canned crushed tomatoes" ), 11693},
             {I18N_NOOP( "canned green beans" ), 11056},
diff --git a/krecipes/src/tests/kretest.cpp b/krecipes/src/tests/kretest.cpp
index a984ea7..d8ce8a3 100644
--- a/krecipes/src/tests/kretest.cpp
+++ b/krecipes/src/tests/kretest.cpp
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
 	ing8.units.name = "c.";
 	ing8.prepMethodList.append( Element("softened") );
 	ing8.prepMethodList.append( Element("at room temperature") );
-	ing8.groupID = 1; ing8.group = "Fat & Litquids";
+	ing8.groupID = 1; ing8.group = "Fat & Liquids";
 	recipe.ingList.append( ing8 );
 
 	Ingredient ing6;
@@ -96,7 +96,7 @@ main(int argc, char *argv[])
 	ing6.amount = 1;
 	ing6.amount_offset = 0;
 	ing6.units.name = "c.";
-	ing6.groupID = 1; ing6.group = "Fat & Litquids";
+	ing6.groupID = 1; ing6.group = "Fat & Liquids";
 	recipe.ingList.append( ing6 );
 
 	Ingredient ing5;
@@ -104,7 +104,7 @@ main(int argc, char *argv[])
 	ing5.amount = 2;
 	ing5.amount_offset = 0;
 	ing5.units.plural = "";
-	ing5.groupID = 1; ing5.group = "Fat & Litquids";
+	ing5.groupID = 1; ing5.group = "Fat & Liquids";
 	recipe.ingList.append( ing5 );
 
 	Ingredient ing7;
@@ -112,7 +112,7 @@ main(int argc, char *argv[])
 	ing7.amount = 1;
 	ing7.amount_offset = 0;
 	ing7.units.name = "tsp.";
-	ing7.groupID = 1; ing7.group = "Fat & Litquids";
+	ing7.groupID = 1; ing7.group = "Fat & Liquids";
 	recipe.ingList.append( ing7 );
 
 	Ingredient ing9;
diff --git a/krecipes/src/tests/kretest.txt b/krecipes/src/tests/kretest.txt
index 8392347..35b4ae6 100644
--- a/krecipes/src/tests/kretest.txt
+++ b/krecipes/src/tests/kretest.txt
@@ -136,7 +136,7 @@ iT/nkv50f2xJ/wA8l/Oiijkj2C7F/th/+eS/nR/a7n/lkv50UUKEewXZmtJudjtHJooorexkf//Z]]><
 <unit>tsp.</unit>
 </ingredient>
 </ingredient-group>
-<ingredient-group name="Fat &amp; Litquids">
+<ingredient-group name="Fat &amp; Liquids">
 <ingredient>
 <name>shortening</name>
 <amount>1</amount>
@@ -336,7 +336,7 @@ iT/nkv50f2xJ/wA8l/Oiijkj2C7F/th/+eS/nR/a7n/lkv50UUKEewXZmtJudjtHJooorexkf//Z]]><
 <unit>tsp.</unit>
 </ingredient>
 </ingredient-group>
-<ingredient-group name="Fat &amp; Litquids">
+<ingredient-group name="Fat &amp; Liquids">
 <ingredient>
 <name>shortening</name>
 <amount>1</amount>
diff --git a/krecipes/src/tests/mmftest.cpp b/krecipes/src/tests/mmftest.cpp
index 5271294..ae4cd34 100644
--- a/krecipes/src/tests/mmftest.cpp
+++ b/krecipes/src/tests/mmftest.cpp
@@ -92,25 +92,25 @@ main(int argc, char *argv[])
 	ing8.amount = 1;
 	ing8.prepMethodList.append( Element("softened") );
 	ing8.prepMethodList.append( Element("at room temperature") );
-	ing8.groupID = 1; ing8.group = "Fat & Litquids";
+	ing8.groupID = 1; ing8.group = "Fat & Liquids";
 	recipe.ingList.append( ing8 );
 
 	Ingredient ing6;
 	ing6.name = "c. peanut butter";
 	ing6.amount = 1;
-	ing6.groupID = 1; ing6.group = "Fat & Litquids";
+	ing6.groupID = 1; ing6.group = "Fat & Liquids";
 	recipe.ingList.append( ing6 );
 
 	Ingredient ing5;
 	ing5.name = "eggs";
 	ing5.amount = 2;
-	ing5.groupID = 1; ing5.group = "Fat & Litquids";
+	ing5.groupID = 1; ing5.group = "Fat & Liquids";
 	recipe.ingList.append( ing5 );
 
 	Ingredient ing7;
 	ing7.name = "tsp. vanilla extract";
 	ing7.amount = 1;
-	ing7.groupID = 1; ing7.group = "Fat & Litquids";
+	ing7.groupID = 1; ing7.group = "Fat & Liquids";
 	recipe.ingList.append( ing7 );
 
 
diff --git a/krecipes/src/tests/mmftest.txt b/krecipes/src/tests/mmftest.txt
index 6210b66..9d13af3 100644
--- a/krecipes/src/tests/mmftest.txt
+++ b/krecipes/src/tests/mmftest.txt
@@ -12,7 +12,7 @@
       1    c. brown sugar
       2    c. all-purpose flour
       1    tsp. baking soda
--------------------------------Fat & Litquids--------------------------------
+-------------------------------Fat & Liquids--------------------------------
       1    c. shortening; softened, at
            -room temperature
       1    c. peanut butter
@@ -37,7 +37,7 @@
       1    c. brown sugar
       2    c. all-purpose flour
       1    tsp. baking soda
--------------------------------Fat & Litquids--------------------------------
+-------------------------------Fat & Liquids--------------------------------
       1    c. shortening; softened, at
            -room temperature
       1    c. peanut butter
diff --git a/krecipes/src/tests/recipemltest.cpp b/krecipes/src/tests/recipemltest.cpp
index 2ac6c63..86afa08 100644
--- a/krecipes/src/tests/recipemltest.cpp
+++ b/krecipes/src/tests/recipemltest.cpp
@@ -85,7 +85,7 @@ main(int argc, char *argv[])
 	ing8.units.name = "c.";
 	ing8.prepMethodList.append( Element("softened") );
 	ing8.prepMethodList.append( Element("at room temperature") );
-	ing8.groupID = 1; ing8.group = "Fat & Litquids";
+	ing8.groupID = 1; ing8.group = "Fat & Liquids";
 	recipe.ingList.append( ing8 );
 
 	Ingredient ing6;
@@ -93,7 +93,7 @@ main(int argc, char *argv[])
 	ing6.amount = 1;
 	ing6.amount_offset = 0;
 	ing6.units.name = "c.";
-	ing6.groupID = 1; ing6.group = "Fat & Litquids";
+	ing6.groupID = 1; ing6.group = "Fat & Liquids";
 	recipe.ingList.append( ing6 );
 
 	Ingredient ing5;
@@ -101,7 +101,7 @@ main(int argc, char *argv[])
 	ing5.amount = 2;
 	ing5.amount_offset = 0;
 	ing5.units.plural = "";
-	ing5.groupID = 1; ing5.group = "Fat & Litquids";
+	ing5.groupID = 1; ing5.group = "Fat & Liquids";
 	recipe.ingList.append( ing5 );
 
 	Ingredient ing7;
@@ -109,7 +109,7 @@ main(int argc, char *argv[])
 	ing7.amount = 1;
 	ing7.amount_offset = 0;
 	ing7.units.name = "tsp.";
-	ing7.groupID = 1; ing7.group = "Fat & Litquids";
+	ing7.groupID = 1; ing7.group = "Fat & Liquids";
 	recipe.ingList.append( ing7 );
 
 	Ingredient ing9;
diff --git a/krecipes/src/tests/recipemltest.txt b/krecipes/src/tests/recipemltest.txt
index 321a33c..330f757 100644
--- a/krecipes/src/tests/recipemltest.txt
+++ b/krecipes/src/tests/recipemltest.txt
@@ -63,7 +63,7 @@
    </ing>
   </ing-div>
   <ing-div>
-   <title>Fat &amp; Litquids</title>
+   <title>Fat &amp; Liquids</title>
    <ing>
     <amt>
      <qty>1</qty>
@@ -186,7 +186,7 @@
    </ing>
   </ing-div>
   <ing-div>
-   <title>Fat &amp; Litquids</title>
+   <title>Fat &amp; Liquids</title>
    <ing>
     <amt>
      <qty>1</qty>
diff --git a/krecipes/src/tests/rezkonvtest.cpp b/krecipes/src/tests/rezkonvtest.cpp
index 5672049..7999558 100644
--- a/krecipes/src/tests/rezkonvtest.cpp
+++ b/krecipes/src/tests/rezkonvtest.cpp
@@ -103,7 +103,7 @@ main(int argc, char *argv[])
 	ing8.units.name = "c.";
 	ing8.prepMethodList.append( Element("softened") );
 	ing8.prepMethodList.append( Element("at room temperature") );
-	ing8.groupID = 1; ing8.group = "Fat & Litquids";
+	ing8.groupID = 1; ing8.group = "Fat & Liquids";
 	recipe.ingList.append( ing8 );
 
 	Ingredient ing6;
@@ -111,7 +111,7 @@ main(int argc, char *argv[])
 	ing6.amount = 1;
 	ing6.amount_offset = 0;
 	ing6.units.name = "c.";
-	ing6.groupID = 1; ing6.group = "Fat & Litquids";
+	ing6.groupID = 1; ing6.group = "Fat & Liquids";
 	recipe.ingList.append( ing6 );
 
 	Ingredient ing5;
@@ -119,7 +119,7 @@ main(int argc, char *argv[])
 	ing5.amount = 2;
 	ing5.amount_offset = 0;
 	ing5.units.plural = "";
-	ing5.groupID = 1; ing5.group = "Fat & Litquids";
+	ing5.groupID = 1; ing5.group = "Fat & Liquids";
 	recipe.ingList.append( ing5 );
 
 	Ingredient ing7;
@@ -127,7 +127,7 @@ main(int argc, char *argv[])
 	ing7.amount = 1;
 	ing7.amount_offset = 0;
 	ing7.units.name = "tsp.";
-	ing7.groupID = 1; ing7.group = "Fat & Litquids";
+	ing7.groupID = 1; ing7.group = "Fat & Liquids";
 	recipe.ingList.append( ing7 );
 
 	check( importer, recipe );
diff --git a/krecipes/src/tests/rezkonvtest.txt b/krecipes/src/tests/rezkonvtest.txt
index 6e2dbda..38e4ac2 100644
--- a/krecipes/src/tests/rezkonvtest.txt
+++ b/krecipes/src/tests/rezkonvtest.txt
@@ -13,7 +13,7 @@ Kategorien:  Snacks, Cookies & Squares
       2        c. all-purpose flour
       1      tsp. baking soda
 
-=========================== Fat & Litquids ===========================
+=========================== Fat & Liquids ===========================
       1        c. shortening, softened,at room temperature
       1        c. peanut butter
       2           eggs
@@ -41,7 +41,7 @@ Kategorien:  Snacks, Cookies & Squares
       2        c. all-purpose flour
       1      tsp. baking soda
 
-=========================== Fat & Litquids ===========================
+=========================== Fat & Liquids ===========================
       1        c. shortening, softened,at room temperature
       1        c. peanut butter
       2           eggs