From c5ea6db37269e09239487856bda94ffee6433372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?=
 <lehoczky_zoltan@pyrocenter.hu>
Date: Tue, 23 Jul 2013 17:55:01 +0200
Subject: [PATCH] Fixing typos in Taxonomies and Workflows

--HG--
branch : 1.x
extra : rebase_source : dcf609dbc4674c37e2ae2f026369490b369a6c8a
---
 .../Views/DefinitionTemplates/TaxonomyFieldSettings.cshtml    | 2 +-
 .../Views/EditorTemplates/Parts/Taxonomies.Term.Fields.cshtml | 2 +-
 .../Modules/Orchard.Taxonomies/Views/TermAdmin/Merge.cshtml   | 2 +-
 .../Modules/Orchard.Workflows/Forms/DecisionForms.cs          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TaxonomyFieldSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TaxonomyFieldSettings.cshtml
index 60a5016f2..71d072e4c 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TaxonomyFieldSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TaxonomyFieldSettings.cshtml
@@ -19,7 +19,7 @@
         <div class="content">
             @Html.CheckBoxFor(m => m.LeavesOnly) <label class="forcheckbox" for="@Html.FieldIdFor(m => m.LeavesOnly)">@T("Restrict selectable elements to leaves (parent / child terms) only")</label>  
         </div>
-        <a class="help" title="@T("A leave is the last descendant in a parent/child hierarchy")"></a>
+        <a class="help" title="@T("A leaf is the last descendant in a parent/child hierarchy")"></a>
     </div>
     @Html.CheckBoxFor(m => m.SingleChoice) <label class="forcheckbox" for="@Html.FieldIdFor(m => m.SingleChoice)">@T("Allow only one term to be selected")</label>
 </fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Parts/Taxonomies.Term.Fields.cshtml b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Parts/Taxonomies.Term.Fields.cshtml
index 45f26611e..60dc78494 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Parts/Taxonomies.Term.Fields.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Parts/Taxonomies.Term.Fields.cshtml
@@ -8,5 +8,5 @@
 <fieldset>
     @Html.LabelFor(m => m.Weight)
     @Html.TextBoxFor(m => m.Weight, new { @class = "text-small" }) 
-    <span class="hint">@T("If specified, will be used to sort terms at the same level")</span>
+    <span class="hint">@T("If specified, it will be used to sort terms at the same level")</span>
 </fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Merge.cshtml b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Merge.cshtml
index e04b3256a..780428a27 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Merge.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Merge.cshtml
@@ -5,7 +5,7 @@
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
     <fieldset>    
-        <p>@T("You are going to merge the terms '{0}' into the term you select below, please be aware that this term will then be delete", string.Join(", ", Model.TermsToMerge.Select(o => o.Name)))</p>
+        <p>@T("You are going to merge the terms '{0}' into the term you select below. Please be aware that this term will then be deleted.", string.Join(", ", Model.TermsToMerge.Select(o => o.Name)))</p>
     
         <label for="@Html.FieldIdFor(m => m.SelectedTermId)">@T("Parent term")</label>
         <select name="@Html.FieldNameFor(m => m.SelectedTermId)" id="@Html.FieldIdFor(m => m.SelectedTermId)">
diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Forms/DecisionForms.cs b/src/Orchard.Web/Modules/Orchard.Workflows/Forms/DecisionForms.cs
index 033ef354d..8545130e2 100644
--- a/src/Orchard.Web/Modules/Orchard.Workflows/Forms/DecisionForms.cs
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Forms/DecisionForms.cs
@@ -20,12 +20,12 @@ namespace Orchard.Workflows.Forms {
                 _Message: Shape.Textbox(
                   Id: "outcomes", Name: "Outcomes",
                   Title: T("Possible Outcomes."),
-                  Description: T("A comma separated list of possible outcomes."),
+                  Description: T("A comma-separated list of possible outcomes."),
                   Classes: new[] { "textMedium" }),
                 _Script: Shape.TextArea(
                   Id: "Script", Name: "Script",
                   Title: T("Script"),
-                  Description: T("The script to run every time the Decision Activity is invoked. You can use ContentItem, Services, WorkContext, and T().  Return type must be a string."),
+                  Description: T("The script to run every time the Decision Activity is invoked. You can use ContentItem, Services, WorkContext, and T(). Return type must be a string."),
                   Classes: new[] { "tokenized" }
                   )
                 );