diff --git a/app/models/project.rb b/app/models/project.rb index de1911f13b9fa6cf4aac1b56afd85848a2ca6593..714953c64c7362d598048baf1958d33ec79874f0 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -66,7 +66,7 @@ class Project < ActiveRecord::Base project rescue => ex project.error_code = :db - project.errors.add(:base, "Cant save project. Please try again later") + project.errors.add(:base, "Can't save project. Please try again later") project end @@ -112,7 +112,7 @@ class Project < ActiveRecord::Base errors[:base] << ("Your own projects limit is #{owner.projects_limit}! Please contact administrator to increase it") end rescue - errors[:base] << ("Cant check your ability to create project") + errors[:base] << ("Can't check your ability to create project") end def repo_name diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml index 4766ef7bcddb3d1de2ae9e4351fa08d4ad2fc783..3b60ed8b0ee355751d1d3ef7be6956f4ec3363a9 100644 --- a/app/views/errors/access_denied.html.haml +++ b/app/views/errors/access_denied.html.haml @@ -1,4 +1,4 @@ %h1 Access Denied %hr -%h2 You are not allowed to access this page +%h2 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 0ffbadeb08d4aa84fca99088e6b80222400738da..4662437f2d21f14e6f37eb2b9f464fc5a3fbbe0f 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 cant 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 7bc6e98026e59c8357b069cd943d2fa1b68e304b..cd01ea1b0e65d80510f6ccdd27c8caf2878a2fa9 100644 --- a/app/views/errors/git_not_found.html.haml +++ b/app/views/errors/git_not_found.html.haml @@ -2,4 +2,5 @@ %hr %h2 Git Resource Not found %p - Application cant get access to some branch or commit in your repository. Maybe it was removed + Application can't get access to some branch or commit 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 44276419bac407d99ad4e70033d3040068674097..4788c2e5237cb277fad3bc97f194618f81cf554f 100644 --- a/app/views/errors/gitolite.html.haml +++ b/app/views/errors/gitolite.html.haml @@ -1,7 +1,6 @@ %h1 Git Error %hr -%h2 Application cant get access to your gitolite system. - +%h2 Gitlab was unable to access your Gitolite system. .git_error_tips %h4 Tips for Administrator: diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml index d3734e07d3c86870d8fd3bc88bf7a785daebe889..a4e8d0204a9858372587213f6ec1b2c81c366b44 100644 --- a/app/views/errors/not_found.html.haml +++ b/app/views/errors/not_found.html.haml @@ -1,4 +1,4 @@ %h1 404 %hr -%h2 Resource you were looking for doesn't exist. +%h2 The resource you were looking for doesn't exist. %p You may have mistyped the address or the page may have moved. diff --git a/app/views/merge_requests/show/_mr_accept.html.haml b/app/views/merge_requests/show/_mr_accept.html.haml index a6c2afb117cd0abe47a0d8820bd41dd62fbf8ad8..efd47af0cda9fc142153b2497998afed2568b76f 100644 --- a/app/views/merge_requests/show/_mr_accept.html.haml +++ b/app/views/merge_requests/show/_mr_accept.html.haml @@ -28,7 +28,7 @@ %span = link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge" - %strong This request cant be merged with GitLab. You should do it manually + %strong This request can't be merged with GitLab. You should do it manually .automerge_widget.unchecked .alert-message diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml index 2d07921e879105e7a18fe9fd2ac100ae8c007adf..7229b587bc823ae80c2d6145fbc3516937fd26f8 100644 --- a/app/views/snippets/index.html.haml +++ b/app/views/snippets/index.html.haml @@ -4,7 +4,7 @@ .alert-message.block-message = link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do Add new snippet - Share code pastes with others if it cant be in a git repository + Share code pastes with others if it can't be in a git repository %br To add new snippet - click on button. diff --git a/lib/gitlab/gitolite.rb b/lib/gitlab/gitolite.rb index 7b80d4a836abf55fd8fc9ef049e7338c9109cab9..e82f9e6230798d628adcac9695247b142133c32e 100644 --- a/lib/gitlab/gitolite.rb +++ b/lib/gitlab/gitolite.rb @@ -137,7 +137,7 @@ module Gitlab owner_name = repo.permissions[0]["RW+"][""][0] raise StandardError if owner_name.blank? rescue => ex - puts "Cant determine gitolite-admin owner".red + puts "Can't determine gitolite-admin owner".red raise StandardError end