summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/errors/access_denied.html.haml2
-rw-r--r--app/views/errors/encoding.html.haml3
-rw-r--r--app/views/errors/git_not_found.html.haml2
-rw-r--r--app/views/errors/gitolite.html.haml3
-rw-r--r--app/views/errors/not_found.html.haml4
5 files changed, 5 insertions, 9 deletions
diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml
index 644ee03ec9f..d38e06137a1 100644
--- a/app/views/errors/access_denied.html.haml
+++ b/app/views/errors/access_denied.html.haml
@@ -1,5 +1,5 @@
.alert-message.block-message.error
%h3 Access Denied
%hr
- %p Youre not allowed to access this page
+ %p You are not allowed to access this page.
%p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml
index 1b1376be578..4662437f2d2 100644
--- a/app/views/errors/encoding.html.haml
+++ b/app/views/errors/encoding.html.haml
@@ -2,5 +2,4 @@
%h3 Encoding Error
%hr
%p
- Page can't be loaded cause of encoding error
-
+ Page can't be loaded because of an encoding error.
diff --git a/app/views/errors/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml
index abde7441a40..27ba201a43d 100644
--- a/app/views/errors/git_not_found.html.haml
+++ b/app/views/errors/git_not_found.html.haml
@@ -6,4 +6,4 @@
%span.label branch
or
%span.label commit
- in your repository. Maybe it was moved
+ in your repository. It may have been moved.
diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml
index 88ec66d5df6..3463e8f027a 100644
--- a/app/views/errors/gitolite.html.haml
+++ b/app/views/errors/gitolite.html.haml
@@ -2,9 +2,6 @@
%h3 Gitolite Error
%h4 Application can't get access to your gitolite system.
-
-
-
%h4 Tips for Administrator:
%ul
diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml
index 9b76a9bf908..374c4f37d17 100644
--- a/app/views/errors/not_found.html.haml
+++ b/app/views/errors/not_found.html.haml
@@ -1,5 +1,5 @@
.alert-message.block-message.error
%h3 Not found
%hr
- %p Resource you were looking for doesn't exist.
- %P You may have mistyped the address or it was removed.
+ %p The resource you were looking for doesn't exist.
+ %p You may have mistyped the address or it may have been removed.