diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml index d838df9e1..1f564da6a 100644 --- a/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml @@ -21,7 +21,7 @@ @Html.SelectOption((ContentsBulkAction)Model.Options.BulkAction, ContentsBulkAction.None, T("Choose action...").ToString()) @Html.SelectOption((ContentsBulkAction)Model.Options.BulkAction, ContentsBulkAction.PublishNow, T("Publish Now").ToString()) @Html.SelectOption((ContentsBulkAction)Model.Options.BulkAction, ContentsBulkAction.Unpublish, T("Unpublish").ToString()) - @Html.SelectOption((ContentsBulkAction)Model.Options.BulkAction, ContentsBulkAction.Remove, T("Remove").ToString()) + @Html.SelectOption((ContentsBulkAction)Model.Options.BulkAction, ContentsBulkAction.Remove, T("Delete").ToString()) diff --git a/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml index 9e9e42930..6db74edc4 100644 --- a/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml @@ -18,7 +18,7 @@ @if (Model.Content != null) {
@Display(Model.Content)
diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml index 015cbe101..51c088158 100644 --- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml @@ -29,7 +29,7 @@ @if (!menuPartEntry.IsMenuItem) { } else {} - @T("Remove") + @T("Delete") ++menuPartEntryIndex; } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml index e12fc5251..7ba2b209f 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml @@ -11,7 +11,7 @@ @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.ToUrlString()) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml index 80ff6fefa..11dcb60e6 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml @@ -8,7 +8,7 @@ @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.None, T("Choose action...").ToString()) @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.PublishNow, T("Publish Now").ToString()) @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.Unpublish, T("Unpublish").ToString()) - @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.Remove, T("Remove").ToString()) + @Html.SelectOption(ContentsBulkAction.None, ContentsBulkAction.Remove, T("Delete").ToString()) @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.ToUrlString()) diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml index 58bffb2b7..990ad322f 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml @@ -28,7 +28,7 @@ @Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Approve, T("Approve").ToString()) @Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Unapprove, T("Unapprove").ToString()) @Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.MarkAsSpam, T("Mark as Spam").ToString()) - @Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Delete, T("Remove").ToString()) + @Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Delete, T("Delete").ToString()) diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml index e91b9ca35..f0653d1ef 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml @@ -19,7 +19,7 @@ @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Approve, T("Approve").ToString()) @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Unapprove, T("Unapprove").ToString()) @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, T("Mark as Spam").ToString()) - @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, T("Remove").ToString()) + @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, T("Delete").ToString()) @@ -100,7 +100,7 @@ @("Unapprove")@T(" | ") } @T("Edit")@T(" | ") - @T("Remove") + @T("Delete") diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml index 896c3ca24..1a6d28ebc 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml @@ -24,7 +24,7 @@
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml index c217b2ddc..0517ef82d 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml @@ -24,6 +24,6 @@
- +
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml index e5d9745c0..417bc4a34 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml @@ -8,7 +8,7 @@
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.cshtml index 6eafa0d2a..784cfda95 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.cshtml @@ -24,7 +24,7 @@ @item.FeedTitle @Html.Link(item.FeedUrl, item.FeedUrl) - @Html.ActionLink(T("Remove").ToString(), "Remove", new { id = item.Id }) + @Html.ActionLink(T("Delete").ToString(), "Remove", new { id = item.Id }) } diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml index 29d507c48..1e6981b6b 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml @@ -60,7 +60,7 @@
@if (Model.Name != "Administrator") { - + }
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml index 1ce22b86c..686bbe1a1 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml @@ -12,7 +12,7 @@
@@ -39,7 +39,7 @@ @Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id }) @if (row.Name != "Administrator") { @T(" | ") - @T("Remove") + @T("Delete") } diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml index e440dc34a..1e8df36df 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml @@ -16,7 +16,7 @@ @@ -44,7 +44,7 @@ @Html.ActionLink(T("Edit").ToString(), "Edit", new {id = tagEntry.Tag.Id}) @T(" | ") - @T("Remove") + @T("Delete") tagIndex = tagIndex + 1; diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml index 6933bcca0..aa5bb6cac 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml @@ -19,7 +19,7 @@ @Html.SelectOption(Model.Options.BulkAction, UsersBulkAction.Approve, T("Approve").ToString()) @Html.SelectOption(Model.Options.BulkAction, UsersBulkAction.Disable, T("Disable").ToString()) @Html.SelectOption(Model.Options.BulkAction, UsersBulkAction.ChallengeEmail, T("Send challenge E-mail").ToString()) - @Html.SelectOption(Model.Options.BulkAction, UsersBulkAction.Delete, T("Remove").ToString()) + @Html.SelectOption(Model.Options.BulkAction, UsersBulkAction.Delete, T("Delete").ToString()) @@ -69,7 +69,7 @@ @Html.ActionLink(T("Edit").ToString(), "Edit", new { entry.User.Id }) | - @Html.ActionLink(T("Remove").ToString(), "Delete", new { entry.User.Id }) | + @Html.ActionLink(T("Delete").ToString(), "Delete", new { entry.User.Id }) | @if (entry.User.RegistrationStatus == UserStatus.Pending) { @Html.ActionLink(T("Approve").ToString(), "Approve", new { entry.User.Id }) } else {