From 08f151af60a686ea184e74a65d047124a1f6f598 Mon Sep 17 00:00:00 2001
From: Daniel Stolt <daniel@ideliverable.com>
Date: Sat, 4 Mar 2017 08:41:54 +0100
Subject: [PATCH] Replaced the word "remove" with "delete" where appropriate.

---
 .../Views/Parts.Contents.Publish.SummaryAdmin.cshtml   |  4 ++--
 .../Views/EditorTemplates/Field.cshtml                 |  2 +-
 .../Views/BlueprintAdmin/Index.cshtml                  |  2 +-
 .../Views/SubmissionAdmin/Index.cshtml                 |  2 +-
 .../Orchard.Layouts/Views/BlueprintAdmin/Index.cshtml  |  2 +-
 .../Views/TransliterationAdmin/Index.cshtml            | 10 ++++++++--
 .../Orchard.Taxonomies/Views/Admin/Index.cshtml        |  2 +-
 .../Orchard.Taxonomies/Views/TermAdmin/Index.cshtml    |  2 +-
 .../Modules/Orchard.Workflows/Views/Admin/Edit.cshtml  |  2 +-
 9 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
index 797fc89ac..db5fb23e1 100644
--- a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
@@ -29,7 +29,7 @@
                 @Html.ItemEditLink(T("Edit").Text, contentItem)
             </li>
             <li class="action-link">
-                @Html.ActionLink(T(" Clone").Text, "Clone", "Admin", new { Id = contentItem.Id, ReturnUrl = Request.ToUrlString(), Area = "Contents" }, new { itemprop = "UnsafeUrl" })
+                @Html.ActionLink(T("Clone").Text, "Clone", "Admin", new { Id = contentItem.Id, ReturnUrl = Request.ToUrlString(), Area = "Contents" }, new { itemprop = "UnsafeUrl" })
             </li>
         }
 
@@ -41,7 +41,7 @@
 
         if (authorizedToDelete) {
             <li class="action-link">
-                @Html.Link(T("Remove").Text, Url.ItemRemoveUrl(contentItem, new { returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
+                @Html.Link(T("Delete").Text, Url.ItemRemoveUrl(contentItem, new { returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
             </li>
         }
     }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml
index db780c845..f21cc83a0 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml
@@ -7,7 +7,7 @@
     <h3>@Model.DisplayName <span>(@Model.FieldDefinition.Name.CamelFriendly())</span></h3>
     <div class="manage">
         @Html.ActionLink(T("Edit").Text, "EditField", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name, returnUrl }) |
-        @Html.ActionLink(T("Remove").Text, "RemoveFieldFrom", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name }, new { itemprop = "RemoveUrl UnsafeUrl" })
+        @Html.ActionLink(T("Delete").Text, "RemoveFieldFrom", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name }, new { itemprop = "RemoveUrl UnsafeUrl" })
     </div>
     <div class="details">
         @{Html.RenderTemplates(Model.Templates);}
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/BlueprintAdmin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/BlueprintAdmin/Index.cshtml
index b6fe93a14..53a8d6572 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/BlueprintAdmin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/BlueprintAdmin/Index.cshtml
@@ -37,7 +37,7 @@
                                 @Html.ActionLink(T("Edit").Text, "Edit", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.DynamicForms" }, null)
                             </li>
                             <li class="action-link">
-                                @Html.ActionLink(T("Remove").Text, "Delete", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
+                                @Html.ActionLink(T("Delete").Text, "Delete", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
                             </li>
                         </ul>
                     </td>
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Index.cshtml
index f5ed11faf..e13df3d4f 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/SubmissionAdmin/Index.cshtml
@@ -47,7 +47,7 @@
                                 @Html.ActionLink(T("Details").Text, "Details", "SubmissionAdmin", new { id = id, area = "Orchard.DynamicForms" }, null)
                             </li>
                             <li class="action-link">
-                                @Html.ActionLink(T("Remove").Text, "Delete", "SubmissionAdmin", new { id = id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
+                                @Html.ActionLink(T("Delete").Text, "Delete", "SubmissionAdmin", new { id = id, area = "Orchard.DynamicForms" }, new { itemprop = "RemoveUrl UnsafeUrl" })
                             </li>
                         </ul>
                     </td>
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/BlueprintAdmin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/BlueprintAdmin/Index.cshtml
index 36c8f29bf..0fd745edb 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/BlueprintAdmin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/BlueprintAdmin/Index.cshtml
@@ -40,7 +40,7 @@
                                 @Html.ActionLink(T("Properties").Text, "Properties", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.Layouts" }, null)
                             </li>
                             <li class="action-link">
-                                @Html.ActionLink(T("Remove").Text, "Delete", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.Layouts" }, new { itemprop = "RemoveUrl UnsafeUrl" })
+                                @Html.ActionLink(T("Delete").Text, "Delete", "BlueprintAdmin", new { id = blueprint.Id, area = "Orchard.Layouts" }, new { itemprop = "RemoveUrl UnsafeUrl" })
                             </li>
                         </ul>
                     </td>
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Views/TransliterationAdmin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Localization/Views/TransliterationAdmin/Index.cshtml
index a1159db61..cd67625cc 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Views/TransliterationAdmin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Views/TransliterationAdmin/Index.cshtml
@@ -28,8 +28,14 @@
                     <td>@cultureInfoFrom.DisplayName</td>
                     <td>@cultureInfoTo.DisplayName</td>
                     <td>
-                        <a href="@Url.Action("Edit", "TransliterationAdmin", new { id = currentSpecification.Id})">@T("Edit")</a> |
-                        <a href="@Url.Action("Remove", "TransliterationAdmin", new { id = currentSpecification.Id})">@T("Remove")</a>
+                        <ul class="action-links">
+                            <li class="action-link">
+                                <a href="@Url.Action("Edit", "TransliterationAdmin", new { id = currentSpecification.Id})">@T("Edit")</a>
+                            </li>
+                            <li class="action-link">
+                                <a href="@Url.Action("Remove", "TransliterationAdmin", new { id = currentSpecification.Id})">@T("Delete")</a>
+                            </li>
+                        </ul>
                     </td>
                 </tr>
             }
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Admin/Index.cshtml
index faa351f19..96802613f 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Admin/Index.cshtml
@@ -13,7 +13,7 @@
         <label for="publishActions">@T("Actions:")</label>
         <select id="publishActions" name="@Html.NameOf(m => m.BulkAction)">
             @Html.SelectOption(Model.BulkAction, TaxonomiesAdminIndexBulkAction.None, T("Choose action...").ToString())
-            @Html.SelectOption(Model.BulkAction, TaxonomiesAdminIndexBulkAction.Delete, T("Remove").ToString())
+            @Html.SelectOption(Model.BulkAction, TaxonomiesAdminIndexBulkAction.Delete, T("Delete").ToString())
         </select>
         <input class="button" type="submit" name="submit.BulkEdit" value="@T("Apply")" />
     </fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Index.cshtml
index 1185666bd..ceb3a9e46 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Index.cshtml
@@ -16,7 +16,7 @@
         <label for="publishActions">@T("Actions:")</label>
         <select id="publishActions" name="@Html.NameOf(m => m.BulkAction)">
             @Html.SelectOption(Model.BulkAction, TermsAdminIndexBulkAction.None, T("Choose action...").ToString())
-            @Html.SelectOption(Model.BulkAction, TermsAdminIndexBulkAction.Delete, T("Remove").ToString())
+            @Html.SelectOption(Model.BulkAction, TermsAdminIndexBulkAction.Delete, T("Delete").ToString())
             @Html.SelectOption(Model.BulkAction, TermsAdminIndexBulkAction.Move, T("Move").ToString())
         </select>
         <input class="button" type="submit" name="submit.BulkEdit" value="@T("Apply")" />
diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Edit.cshtml
index a0a281067..74ef536bf 100644
--- a/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Edit.cshtml
@@ -28,7 +28,7 @@
                         <label title="@T("Edit")"></label>
                     </div>
                     <div id="activity-toolbar-delete">
-                        <label title="@T("Remove")"></label>
+                        <label title="@T("Delete")"></label>
                     </div>
                 </div>
             </div>