diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py
--- a/kallithea/controllers/admin/repo_groups.py
+++ b/kallithea/controllers/admin/repo_groups.py
@@ -284,7 +284,7 @@ class RepoGroupsController(BaseControlle
         gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         repos = gr.repositories.all()
         if repos:
-            h.flash(_('This group contains %s repositores and cannot be '
+            h.flash(_('This group contains %s repositories and cannot be '
                       'deleted') % len(repos), category='warning')
             return redirect(url('repos_groups'))
 
diff --git a/kallithea/controllers/api/api.py b/kallithea/controllers/api/api.py
--- a/kallithea/controllers/api/api.py
+++ b/kallithea/controllers/api/api.py
@@ -1431,7 +1431,7 @@ class ApiController(JSONRPCController):
         :param enable_statistics:
         :type enable_statistics: bool
         :param copy_permissions: Copy permission from group that repository is
-            beeing created.
+            being created.
         :type copy_permissions: bool
 
         OUTPUT::
diff --git a/kallithea/controllers/files.py b/kallithea/controllers/files.py
--- a/kallithea/controllers/files.py
+++ b/kallithea/controllers/files.py
@@ -303,7 +303,7 @@ class FilesController(BaseRepoController
     def delete(self, repo_name, revision, f_path):
         repo = c.db_repo
         if repo.enable_locking and repo.locked[0]:
-            h.flash(_('This repository is has been locked by %s on %s')
+            h.flash(_('This repository has been locked by %s on %s')
                 % (h.person_by_id(repo.locked[0]),
                    h.fmt_date(h.time_to_datetime(repo.locked[1]))),
                 'warning')
@@ -363,7 +363,7 @@ class FilesController(BaseRepoController
     def edit(self, repo_name, revision, f_path):
         repo = c.db_repo
         if repo.enable_locking and repo.locked[0]:
-            h.flash(_('This repository is has been locked by %s on %s')
+            h.flash(_('This repository has been locked by %s on %s')
                 % (h.person_by_id(repo.locked[0]),
                    h.fmt_date(h.time_to_datetime(repo.locked[1]))),
                 'warning')
@@ -430,7 +430,7 @@ class FilesController(BaseRepoController
 
         repo = Repository.get_by_repo_name(repo_name)
         if repo.enable_locking and repo.locked[0]:
-            h.flash(_('This repository is has been locked by %s on %s')
+            h.flash(_('This repository has been locked by %s on %s')
                 % (h.person_by_id(repo.locked[0]),
                    h.fmt_date(h.time_to_datetime(repo.locked[1]))),
                   'warning')
diff --git a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po
@@ -132,7 +132,7 @@ msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr ""
 
 #: kallithea/controllers/files.py:313
@@ -618,7 +618,7 @@ msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -952,7 +952,7 @@ msgid "You need to be a registered user 
 msgstr ""
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr ""
 
 #: kallithea/lib/diffs.py:66
@@ -1267,25 +1267,25 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1849,7 +1849,7 @@ msgid "Invalid clone url, provide a vali
 msgstr ""
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 
 #: kallithea/model/validators.py:534
@@ -2159,7 +2159,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3275,13 +3275,13 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"Repository \"%(repo_name)s\" is being created, you will be redirected when "
 "this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3369,7 +3369,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is disabled. "
-"Trigering a pull locks repository by user who pulled, only the same user can "
+"Triggering a pull locks repository by user who pulled, only the same user can "
 "unlock by doing a push"
 msgstr ""
 
@@ -3401,7 +3401,7 @@ msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
-"This repository will be renamed in a special way in order to be unaccesible "
+"This repository will be renamed in a special way in order to be inaccessible "
 "for Kallithea and VCS systems. If you need to fully delete it from file "
 "system please do it manually"
 msgstr ""
@@ -3513,8 +3513,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases "
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases "
 "that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3544,7 +3544,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3767,7 +3767,7 @@ msgstr ""
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3826,7 +3826,7 @@ msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4930,7 +4930,7 @@ msgid "Public repository"
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/de/LC_MESSAGES/kallithea.po b/kallithea/i18n/de/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po
@@ -136,7 +136,7 @@ msgstr "Es gibt hier noch keine Dateien.
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr "Dieses Repository ist von %s am %s gesperrt worden"
 
 #: kallithea/controllers/files.py:313
@@ -626,7 +626,7 @@ msgstr "Fehler bei der Aktualisierung de
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Die Gruppe enthält %s Repositorys und kann nicht gelöscht werden"
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -966,7 +966,7 @@ msgid "You need to be a registered user 
 msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen"
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr "Sie müssen sich anmelden um diese Seite aufzurufen"
 
 #: kallithea/lib/diffs.py:66
@@ -1279,25 +1279,25 @@ msgstr "Administrativer Zugang zum Repos
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Repository Gruppe hat Keinen Zugriff"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Repository Gruppe hat lesenden Zugriff"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Repository Gruppe hat schreibenden Zugriff"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Repository Gruppe hat Administrativen Zugriff"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1866,7 +1866,7 @@ msgid "Invalid clone url, provide a vali
 msgstr ""
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "Forke um den selben typ wie der Vorgesetze zu haben"
 
 #: kallithea/model/validators.py:534
@@ -2177,7 +2177,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "Der Passwort Reset LInk wird an die passende EMail Addresse gesendet"
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3291,13 +3291,13 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3387,7 +3387,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 
@@ -3419,7 +3419,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 
@@ -3530,8 +3530,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases"
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3561,7 +3561,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3785,7 +3785,7 @@ msgstr ""
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3844,7 +3844,7 @@ msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4941,7 +4941,7 @@ msgid "Public repository"
 msgstr "Öffenentliches Repository"
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/en/LC_MESSAGES/kallithea.po b/kallithea/i18n/en/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/en/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/en/LC_MESSAGES/kallithea.po
@@ -128,7 +128,7 @@ msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr ""
 
 #: kallithea/controllers/files.py:313
@@ -616,7 +616,7 @@ msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -950,7 +950,7 @@ msgid "You need to be a registered user 
 msgstr ""
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr ""
 
 #: kallithea/lib/diffs.py:66
@@ -1258,25 +1258,25 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1839,7 +1839,7 @@ msgid "Invalid clone url, provide a vali
 msgstr ""
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 
 #: kallithea/model/validators.py:534
@@ -2148,7 +2148,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3263,13 +3263,13 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3357,7 +3357,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 
@@ -3390,7 +3390,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 
@@ -3501,8 +3501,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases"
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3532,7 +3532,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3757,7 +3757,7 @@ msgstr ""
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3816,7 +3816,7 @@ msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4916,7 +4916,7 @@ msgid "Public repository"
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po
@@ -133,7 +133,7 @@ msgstr "Il n'y a actuellement pas de fic
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr "Ce dépôt a été verrouillé par %s sur %s."
 
 #: kallithea/controllers/files.py:313
@@ -629,7 +629,7 @@ msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s"
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Ce groupe contient %s dépôts et ne peut être supprimé"
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -970,7 +970,7 @@ msgid "You need to be a registered user 
 msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action"
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr "Vous devez être connecté pour visualiser cette page"
 
 #: kallithea/lib/diffs.py:66
@@ -1283,25 +1283,25 @@ msgstr "Accès administrateur au dépôt"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Aucun accès au groupe de dépôts"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Accès en lecture au groupe de dépôts"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Accès en écriture au groupe de dépôts"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Accès administrateur au groupe de dépôts"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1882,7 +1882,7 @@ msgstr ""
 "svn+http(s)"
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "Le fork doit être du même type que le parent"
 
 #: kallithea/model/validators.py:534
@@ -2199,7 +2199,7 @@ msgid "Send password reset email"
 msgstr "Envoyer le courriel de remise à zéro du mot de passe"
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "Votre nouveau mot de passe sera envoyé à l’adresse correspondante"
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3324,13 +3324,13 @@ msgstr "Création du dépôt"
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3420,7 +3420,7 @@ msgstr "Ce dépôt n’est pas verrouillé"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 
@@ -3452,7 +3452,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 
@@ -3565,8 +3565,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases"
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3596,7 +3596,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3824,7 +3824,7 @@ msgstr "Construire ex nihilo"
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3883,7 +3883,7 @@ msgstr "Nécessiter SSL pour les opérations de VCS"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 "Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour "
 "pousser ou tirer. Si le certificate SSL est manquant, une erreur HTTP 406 "
@@ -4991,7 +4991,7 @@ msgid "Public repository"
 msgstr "Dépôt public"
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po
@@ -130,7 +130,7 @@ msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr ""
 
 #: kallithea/controllers/files.py:313
@@ -616,7 +616,7 @@ msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -950,7 +950,7 @@ msgid "You need to be a registered user 
 msgstr ""
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr ""
 
 #: kallithea/lib/diffs.py:66
@@ -1259,25 +1259,25 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1841,7 +1841,7 @@ msgid "Invalid clone url, provide a vali
 msgstr ""
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 
 #: kallithea/model/validators.py:534
@@ -2151,7 +2151,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3265,13 +3265,13 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"Repository \"%(repo_name)s\" is being created, you will be redirected when "
 "this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3359,7 +3359,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is disabled. "
-"Trigering a pull locks repository by user who pulled, only the same user can "
+"Triggering a pull locks repository by user who pulled, only the same user can "
 "unlock by doing a push"
 msgstr ""
 
@@ -3390,7 +3390,7 @@ msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
-"This repository will be renamed in a special way in order to be unaccesible "
+"This repository will be renamed in a special way in order to be inaccessible "
 "for Kallithea and VCS systems. If you need to fully delete it from file "
 "system please do it manually"
 msgstr ""
@@ -3502,8 +3502,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases "
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases "
 "that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3533,7 +3533,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3756,7 +3756,7 @@ msgstr ""
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3815,7 +3815,7 @@ msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4913,7 +4913,7 @@ msgid "Public repository"
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po
@@ -133,7 +133,7 @@ msgstr "まだファイルがありません。 %s"
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr "このリポジトリは %s によって %s にロックされました"
 
 #: kallithea/controllers/files.py:313
@@ -617,7 +617,7 @@ msgstr "リポジトリグループ %s の更新中にエラーが発生しました"
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "このグループは %s 個のリポジトリを含んでいるため削除できません"
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -951,7 +951,7 @@ msgid "You need to be a registered user 
 msgstr "このアクションを実行するためには登録済みのユーザーである必要があります"
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr "このページを閲覧するためにはサインインが必要です"
 
 #: kallithea/lib/diffs.py:66
@@ -1255,25 +1255,25 @@ msgstr "リポジトリに管理権限でアクセス"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "リポジトリグループへのアクセス権限なし"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "リポジトリグループに読込権限でアクセス"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "リポジトリグループに書込権限でアクセス"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "リポジトリグループに管理権限でアクセス"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1838,7 +1838,7 @@ msgid "Invalid clone url, provide a vali
 msgstr "無効なクローンURIです。有効な http(s)/svn+http(s) のURIを指定してください"
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "フォークは親と同じ種別の必要があります"
 
 #: kallithea/model/validators.py:534
@@ -2147,7 +2147,7 @@ msgid "Send password reset email"
 msgstr "パスワードリセットのメールを送信"
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "該当するメールアドレスにパスワードリセットのリンクを送信します"
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3259,13 +3259,13 @@ msgstr "リポジトリを作成中"
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr "リポジトリ \"%(repo_name)s\" を作成中です。処理を完了したらリダイレクトします。"
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr "恐れいります。操作中にエラーが発生しました。 Kallithea サーバのログをチェックするか、管理者に問い合わせてください。"
 
@@ -3353,7 +3353,7 @@ msgstr "リポジトリはロックされていません"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr "リポジトリのロックを強制します。匿名アクセスが無効のときしか使えません。ユーザーがリポジトリをプルすると、そのユーザーでリポジトリをロックし、同じユーザーがプッシュするまでアンロックしません。"
 
@@ -3384,7 +3384,7 @@ msgstr "フォークも削除"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 "このリポジトリはKallitheaとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n"
@@ -3497,8 +3497,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases"
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 "通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリのURLが変わります。\n"
@@ -3531,7 +3531,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "オプション：このリポジトリが属するグループを選択します"
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3755,7 +3755,7 @@ msgstr "一度削除してから再度インデックスを作成"
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea 中の全てのファイルのインデックスを再生成します。"
 
@@ -3814,7 +3814,7 @@ msgstr "VCSの操作にSSLを必須とする"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。"
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4930,7 +4930,7 @@ msgid "Public repository"
 msgstr "公開リポジトリ"
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr "リポジトリを作成しています..."
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/kallithea.pot b/kallithea/i18n/kallithea.pot
--- a/kallithea/i18n/kallithea.pot
+++ b/kallithea/i18n/kallithea.pot
@@ -122,7 +122,7 @@ msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr ""
 
 #: kallithea/controllers/files.py:313
@@ -604,7 +604,7 @@ msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -936,7 +936,7 @@ msgid "You need to be a registered user 
 msgstr ""
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr ""
 
 #: kallithea/lib/diffs.py:66
@@ -1241,25 +1241,25 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1816,7 +1816,7 @@ msgid "Invalid clone url, provide a vali
 msgstr ""
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 
 #: kallithea/model/validators.py:534
@@ -2123,7 +2123,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3207,11 +3207,11 @@ msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
-msgid "Repository \"%(repo_name)s\" is beeing created, you will be redirected when this process is finished.repo_name"
+msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
-msgid "We're sorry but error occured during this operation. Please check your Kallithea server logs, or contact administrator."
+msgid "We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator."
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit.html:8
@@ -3294,7 +3294,7 @@ msgid "Repository is not locked"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
-msgid "Force locking on repository. Works only when anonymous access is disabled. Trigering a pull locks repository by user who pulled, only the same user can unlock by doing a push"
+msgid "Force locking on repository. Works only when anonymous access is disabled. Triggering a pull locks repository by user who pulled, only the same user can unlock by doing a push"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:83
@@ -3323,7 +3323,7 @@ msgid "Delete forks"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
-msgid "This repository will be renamed in a special way in order to be unaccesible for Kallithea and VCS systems. If you need to fully delete it from file system please do it manually"
+msgid "This repository will be renamed in a special way in order to be inaccessible for Kallithea and VCS systems. If you need to fully delete it from file system please do it manually"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
@@ -3429,8 +3429,8 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_settings.html:14
 msgid ""
 "In case this repository is renamed or moved into another group the repository url changes.\n"
-"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+"                               Using above url guarantees that this repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:21
@@ -3459,7 +3459,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3671,7 +3671,7 @@ msgid "Build from scratch"
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_search.html:15
-msgid "This option completely reindex all the files within Kallithea for proper fulltext search capabilities."
+msgid "This option completely reindexes all the files within Kallithea for proper fulltext search capabilities."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_search.html:21
@@ -3727,7 +3727,7 @@ msgid "Require SSL for vcs operations"
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:13
-msgid "Activate to set Kallithea to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgid "Activate to set Kallithea to require SSL for pushing or pulling. If SSL certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4796,7 +4796,7 @@ msgid "Public repository"
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po
@@ -141,7 +141,7 @@ msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr "Repozytorium zostało zablokowane przez %s na %s"
 
 #: kallithea/controllers/files.py:313
@@ -629,7 +629,7 @@ msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s"
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta"
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -965,7 +965,7 @@ msgid "You need to be a registered user 
 msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie"
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr "Musisz być zalogowany, żeby oglądać stronę"
 
 #: kallithea/lib/diffs.py:66
@@ -1284,25 +1284,25 @@ msgstr "Administracja dostępu do repozytorium"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Grupy repozytoriów brak dostępu"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Grupy repozytoriów dostęp do odczytu"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Grupy repozytoriów dostęp do zapisu"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Repozytoria Grupy dostęp administratora"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1876,7 +1876,7 @@ msgid "Invalid clone url, provide a vali
 msgstr "Nieprawidłowe url klonowania, wstaw prawidłowy url http(s)/svn+http(s)"
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "Fork musi być tego samego typu, jak rodzic"
 
 #: kallithea/model/validators.py:534
@@ -2189,7 +2189,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "Link do zresetowania hasła zostanie wysłany na adres e-mail"
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3317,13 +3317,13 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3413,7 +3413,7 @@ msgstr "Repozytorium nie jest zablokowan
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 
@@ -3446,7 +3446,7 @@ msgstr "Usuń rozwidlenie"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 "To repozytorium zostanie zmienione w sposób szczególny, żeby było "
@@ -3562,8 +3562,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases"
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3593,7 +3593,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium."
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3817,7 +3817,7 @@ msgstr "Buduj od podstaw"
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3876,7 +3876,7 @@ msgstr "Wymagaj ssl dla operacji vcs"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4989,7 +4989,7 @@ msgid "Public repository"
 msgstr "Publiczne repozytorium"
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
@@ -133,7 +133,7 @@ msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr "Este repositório foi travado por %s em %s"
 
 #: kallithea/controllers/files.py:313
@@ -621,7 +621,7 @@ msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s"
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Esse grupo contém %s repositórios e não pode ser excluído"
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -955,7 +955,7 @@ msgid "You need to be a registered user 
 msgstr "Você precisa ser um usuário registrado para realizar essa ação"
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr "Você precisa estar logado para ver essa página"
 
 #: kallithea/lib/diffs.py:66
@@ -1268,25 +1268,25 @@ msgstr "Acesso administrativo ao repositório"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Nenhum acesso ao Grupo de Repositórios"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Acesso de leitura ao Grupo de Repositórios"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Acesso de escrita ao Grupo de Repositórios"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Acesso administrativo ao Grupo de Repositórios"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1860,7 +1860,7 @@ msgid "Invalid clone url, provide a vali
 msgstr "URL inválida, por favor, forneça uma URL de clone http(s)/svn+http(s)"
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "A bifurcação deve ser do mesmo tipo que o pai"
 
 #: kallithea/model/validators.py:534
@@ -2173,7 +2173,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 "Link de reinicialização de senha será enviado ao endereço de e-mail "
 "correspondente"
@@ -3302,13 +3302,13 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3400,7 +3400,7 @@ msgstr "Repositório não está travado"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 
@@ -3432,7 +3432,7 @@ msgstr "Excluir bifurcações"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 "Este repositório será renomeado de um modo especial para não ser mais "
@@ -3549,8 +3549,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases"
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3580,7 +3580,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório."
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3804,7 +3804,7 @@ msgstr "Construir do zero"
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3863,7 +3863,7 @@ msgstr "Requer SSL para operações de VCS"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4974,7 +4974,7 @@ msgid "Public repository"
 msgstr "Repositório público"
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po
@@ -142,7 +142,7 @@ msgstr "Нет файлов. %s"
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr "Репозиторий заблокировал %s в %s"
 
 #: kallithea/controllers/files.py:313
@@ -635,7 +635,7 @@ msgstr "Произошла ошибка при обновлении группы репозиториев %s"
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "Данная группа содержит %s репозитариев и не может быть удалена"
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -973,7 +973,7 @@ msgstr ""
 "действие"
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr "Страница доступна только авторизованным пользователям"
 
 #: kallithea/lib/diffs.py:66
@@ -1292,25 +1292,25 @@ msgstr "Репозитарий - администрирование"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "Группа Репозиториев - нет доступа"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "Группа Репозиториев - доступ на чтение"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "Группа Репозиториев - доступ на запись"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "Группа Репозиториев - администрирование"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1886,7 +1886,7 @@ msgstr ""
 "клонирования - http(s)/svn+http(s)."
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "Тип форка будет совпадать с родительским"
 
 #: kallithea/model/validators.py:534
@@ -2203,7 +2203,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "Ссылка для сброса пароля была отправлена на соответствующий E-mail"
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3330,13 +3330,13 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3426,7 +3426,7 @@ msgstr "Репозиторий не заблокирован"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 
@@ -3459,7 +3459,7 @@ msgstr "Удалить fork'и"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 "Этот репозитарий будет переименован таким образом, чтобы сделать его "
@@ -3574,8 +3574,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases"
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3605,7 +3605,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "Опционально выбрать группу, в которую поместить данный репозиторий."
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3831,7 +3831,7 @@ msgstr "Сборка с нуля"
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3890,7 +3890,7 @@ msgstr "Запрашивать SSL для операций с VCS"
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -5003,7 +5003,7 @@ msgid "Public repository"
 msgstr "Публичный репозиторий"
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
@@ -132,7 +132,7 @@ msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr "版本库由%s于%s锁定"
 
 #: kallithea/controllers/files.py:313
@@ -616,7 +616,7 @@ msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr "这个组内有%s个版本库因而无法删除"
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -950,7 +950,7 @@ msgid "You need to be a registered user 
 msgstr "必须是注册用户才能进行此操作"
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr "必须登录才能访问该页面"
 
 #: kallithea/lib/diffs.py:66
@@ -1252,25 +1252,25 @@ msgstr "版本库管理权限"
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr "无版本库组访问权限"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr "版本库组读取权限"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr "版本库组写入"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr "版本库组管理权限"
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1833,7 +1833,7 @@ msgid "Invalid clone url, provide a vali
 msgstr "无效的克隆地址，提供一个有效的克隆 http(s)或svn+http(s)地址"
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr "复刻版本库必须和父版本库类型相同"
 
 #: kallithea/model/validators.py:534
@@ -2142,7 +2142,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "密码重置地址已经发送到邮件"
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3252,13 +3252,13 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3346,7 +3346,7 @@ msgstr "版本库未锁定"
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 
@@ -3377,7 +3377,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 
@@ -3488,8 +3488,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases"
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3519,7 +3519,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr "可选的，选择一个组将版本库放到其中"
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3743,7 +3743,7 @@ msgstr ""
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3802,7 +3802,7 @@ msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4893,7 +4893,7 @@ msgid "Public repository"
 msgstr "公共版本库"
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
@@ -128,7 +128,7 @@ msgstr ""
 #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361
 #: kallithea/controllers/files.py:428
 #, python-format
-msgid "This repository is has been locked by %s on %s"
+msgid "This repository has been locked by %s on %s"
 msgstr ""
 
 #: kallithea/controllers/files.py:313
@@ -612,7 +612,7 @@ msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:289
 #, python-format
-msgid "This group contains %s repositores and cannot be deleted"
+msgid "This group contains %s repositories and cannot be deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/repo_groups.py:296
@@ -946,7 +946,7 @@ msgid "You need to be a registered user 
 msgstr "您必須是註冊使用者才能執行這個動作"
 
 #: kallithea/lib/auth.py:846
-msgid "You need to be a signed in to view this page"
+msgid "You need to be signed in to view this page"
 msgstr "您必須登入後才能瀏覽這個頁面"
 
 #: kallithea/lib/diffs.py:66
@@ -1248,25 +1248,25 @@ msgstr ""
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group no access"
+msgid "Repository Group no access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311
-msgid "Repositories Group read access"
+msgid "Repository Group read access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1312
-msgid "Repositories Group write access"
+msgid "Repository Group write access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
-msgid "Repositories Group admin access"
+msgid "Repository Group admin access"
 msgstr ""
 
 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176
@@ -1829,7 +1829,7 @@ msgid "Invalid clone url, provide a vali
 msgstr ""
 
 #: kallithea/model/validators.py:519
-msgid "Fork have to be the same type as parent"
+msgid "Fork has to be the same type as parent"
 msgstr ""
 
 #: kallithea/model/validators.py:534
@@ -2138,7 +2138,7 @@ msgid "Send password reset email"
 msgstr ""
 
 #: kallithea/templates/password_reset.html:64
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr "密碼重設連結已郵寄至您的信箱"
 
 #: kallithea/templates/register.html:5 kallithea/templates/register.html:30
@@ -3248,13 +3248,13 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid ""
-"Repository \"%(repo_name)s\" is beeing created, you will be redirected "
+"Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_creating.html:42
 msgid ""
-"We're sorry but error occured during this operation. Please check your "
+"We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 
@@ -3342,7 +3342,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
 "Force locking on repository. Works only when anonymous access is "
-"disabled. Trigering a pull locks repository by user who pulled, only the "
+"disabled. Triggering a pull locks repository by user who pulled, only the "
 "same user can unlock by doing a push"
 msgstr ""
 
@@ -3373,7 +3373,7 @@ msgstr ""
 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
+"inaccessible for Kallithea and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 
@@ -3484,8 +3484,8 @@ msgid ""
 "In case this repository is renamed or moved into another group the "
 "repository url changes.\n"
 "                               Using above url guarantees that this "
-"repository will allways be accessible under such url.\n"
-"                               Usefull for CI systems, or any other cases"
+"repository will always be accessible under such url.\n"
+"                               Useful for CI systems, or any other cases"
 " that you need to hardcode the url into 3rd party service."
 msgstr ""
 
@@ -3515,7 +3515,7 @@ msgid "http[s] url used for doing remote
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:46
-msgid "Optional select a group to put this repository into."
+msgid "Optionally select a group to put this repository into."
 msgstr ""
 
 #: kallithea/templates/admin/repos/repo_edit_settings.html:55
@@ -3739,7 +3739,7 @@ msgstr ""
 
 #: kallithea/templates/admin/settings/settings_search.html:15
 msgid ""
-"This option completely reindex all the files within Kallithea for proper "
+"This option completely reindexes all the files within Kallithea for proper "
 "fulltext search capabilities."
 msgstr ""
 
@@ -3798,7 +3798,7 @@ msgstr ""
 #: kallithea/templates/admin/settings/settings_vcs.html:13
 msgid ""
 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
-"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+"certificate is missing it will return an HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -4889,7 +4889,7 @@ msgid "Public repository"
 msgstr "公開的版本庫"
 
 #: kallithea/templates/data_table/_dt_elements.html:82
-msgid "Repository creating in progress..."
+msgid "Repository creation in progress..."
 msgstr ""
 
 #: kallithea/templates/data_table/_dt_elements.html:96
diff --git a/kallithea/lib/auth.py b/kallithea/lib/auth.py
--- a/kallithea/lib/auth.py
+++ b/kallithea/lib/auth.py
@@ -840,7 +840,7 @@ class PermsDecorator(object):
                 p = url.current()
 
                 import kallithea.lib.helpers as h
-                h.flash(_('You need to be a signed in to '
+                h.flash(_('You need to be signed in to '
                           'view this page'),
                         category='warning')
                 return redirect(url('login_home', came_from=p))
diff --git a/kallithea/lib/celerylib/tasks.py b/kallithea/lib/celerylib/tasks.py
--- a/kallithea/lib/celerylib/tasks.py
+++ b/kallithea/lib/celerylib/tasks.py
@@ -372,7 +372,7 @@ def create_repo(form_data, cur_user):
         repo.set_state(Repository.STATE_CREATED)
         DBS.commit()
     except Exception, e:
-        log.warning('Exception %s occured when forking repository, '
+        log.warning('Exception %s occurred when forking repository, '
                     'doing cleanup...' % e)
         # rollback things manually !
         repo = Repository.get_by_repo_name(repo_name_full)
@@ -457,7 +457,7 @@ def create_repo_fork(form_data, cur_user
         repo.set_state(Repository.STATE_CREATED)
         DBS.commit()
     except Exception, e:
-        log.warning('Exception %s occured when forking repository, '
+        log.warning('Exception %s occurred when forking repository, '
                     'doing cleanup...' % e)
         #rollback things manually !
         repo = Repository.get_by_repo_name(repo_name_full)
diff --git a/kallithea/lib/dbmigrate/schema/db_1_4_0.py b/kallithea/lib/dbmigrate/schema/db_1_4_0.py
--- a/kallithea/lib/dbmigrate/schema/db_1_4_0.py
+++ b/kallithea/lib/dbmigrate/schema/db_1_4_0.py
@@ -1165,10 +1165,10 @@ class Permission(Base, BaseModel):
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
 
-        ('group.none', _('Repositories Group no access')),
-        ('group.read', _('Repositories Group read access')),
-        ('group.write', _('Repositories Group write access')),
-        ('group.admin', _('Repositories Group admin access')),
+        ('group.none', _('Repository Group no access')),
+        ('group.read', _('Repository Group read access')),
+        ('group.write', _('Repository Group write access')),
+        ('group.admin', _('Repository Group admin access')),
 
         ('hg.admin', _('Kallithea Administrator')),
         ('hg.create.none', _('Repository creation disabled')),
diff --git a/kallithea/lib/dbmigrate/schema/db_1_5_0.py b/kallithea/lib/dbmigrate/schema/db_1_5_0.py
--- a/kallithea/lib/dbmigrate/schema/db_1_5_0.py
+++ b/kallithea/lib/dbmigrate/schema/db_1_5_0.py
@@ -1184,10 +1184,10 @@ class Permission(Base, BaseModel):
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
 
-        ('group.none', _('Repositories Group no access')),
-        ('group.read', _('Repositories Group read access')),
-        ('group.write', _('Repositories Group write access')),
-        ('group.admin', _('Repositories Group admin access')),
+        ('group.none', _('Repository Group no access')),
+        ('group.read', _('Repository Group read access')),
+        ('group.write', _('Repository Group write access')),
+        ('group.admin', _('Repository Group admin access')),
 
         ('hg.admin', _('Kallithea Administrator')),
         ('hg.create.none', _('Repository creation disabled')),
diff --git a/kallithea/lib/dbmigrate/schema/db_1_5_2.py b/kallithea/lib/dbmigrate/schema/db_1_5_2.py
--- a/kallithea/lib/dbmigrate/schema/db_1_5_2.py
+++ b/kallithea/lib/dbmigrate/schema/db_1_5_2.py
@@ -1305,10 +1305,10 @@ class Permission(Base, BaseModel):
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
 
-        ('group.none', _('Repositories Group no access')),
-        ('group.read', _('Repositories Group read access')),
-        ('group.write', _('Repositories Group write access')),
-        ('group.admin', _('Repositories Group admin access')),
+        ('group.none', _('Repository Group no access')),
+        ('group.read', _('Repository Group read access')),
+        ('group.write', _('Repository Group write access')),
+        ('group.admin', _('Repository Group admin access')),
 
         ('hg.admin', _('Kallithea Administrator')),
         ('hg.create.none', _('Repository creation disabled')),
diff --git a/kallithea/lib/helpers.py b/kallithea/lib/helpers.py
--- a/kallithea/lib/helpers.py
+++ b/kallithea/lib/helpers.py
@@ -1438,7 +1438,7 @@ def journal_filter_help():
             date:[20120101100000 TO 20120102]
 
         Generate wildcards using '*' character:
-            "repositroy:vcs*" - search everything starting with 'vcs'
+            "repository:vcs*" - search everything starting with 'vcs'
             "repository:*vcs*" - search for repository containing 'vcs'
 
         Optional AND / OR operators in queries
diff --git a/kallithea/lib/paster_commands/make_index.py b/kallithea/lib/paster_commands/make_index.py
--- a/kallithea/lib/paster_commands/make_index.py
+++ b/kallithea/lib/paster_commands/make_index.py
@@ -95,14 +95,14 @@ class Command(BasePasterCommand):
         self.parser.add_option('--index-only',
                           action='store',
                           dest='repo_list',
-                          help="Specifies a comma separated list of repositores "
+                          help="Specifies a comma separated list of repositories "
                                 "to build index on. If not given all repositories "
                                 "are scanned for indexing. OPTIONAL",
                           )
         self.parser.add_option('--update-only',
                           action='store',
                           dest='repo_update_list',
-                          help="Specifies a comma separated list of repositores "
+                          help="Specifies a comma separated list of repositories "
                                 "to re-build index on. OPTIONAL",
                           )
         self.parser.add_option('-f',
diff --git a/kallithea/lib/paster_commands/update_repoinfo.py b/kallithea/lib/paster_commands/update_repoinfo.py
--- a/kallithea/lib/paster_commands/update_repoinfo.py
+++ b/kallithea/lib/paster_commands/update_repoinfo.py
@@ -81,7 +81,7 @@ class Command(BasePasterCommand):
         self.parser.add_option('--update-only',
                            action='store',
                            dest='repo_update_list',
-                           help="Specifies a comma separated list of repositores "
+                           help="Specifies a comma separated list of repositories "
                                 "to update last commit info for. OPTIONAL")
         self.parser.add_option('--invalidate-cache',
                            action='store_true',
diff --git a/kallithea/lib/vcs/utils/hgcompat.py b/kallithea/lib/vcs/utils/hgcompat.py
--- a/kallithea/lib/vcs/utils/hgcompat.py
+++ b/kallithea/lib/vcs/utils/hgcompat.py
@@ -4,7 +4,7 @@ Mercurial libs compatibility
 
 import mercurial
 import mercurial.demandimport
-## patch demandimport, due to bug in mercurial when it allways triggers demandimport.enable()
+## patch demandimport, due to bug in mercurial when it always triggers demandimport.enable()
 mercurial.demandimport.enable = lambda *args, **kwargs: 1
 from mercurial import archival, merge as hg_merge, patch, ui
 from mercurial import discovery
diff --git a/kallithea/model/validators.py b/kallithea/model/validators.py
--- a/kallithea/model/validators.py
+++ b/kallithea/model/validators.py
@@ -497,7 +497,7 @@ def ValidCloneUri():
 def ValidForkType(old_data={}):
     class _validator(formencode.validators.FancyValidator):
         messages = {
-            'invalid_fork_type': _(u'Fork have to be the same type as parent')
+            'invalid_fork_type': _(u'Fork has to be the same type as parent')
         }
 
         def validate_python(self, value, state):
diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html
--- a/kallithea/templates/admin/repos/repo_creating.html
+++ b/kallithea/templates/admin/repos/repo_creating.html
@@ -27,7 +27,7 @@
     </div>
 
     <div style="display:table; padding: 10px 0px; font-size: 14px;font-weight: bold;margin-right: auto;margin-left: auto">
-        ${_('Repository "%(repo_name)s" is beeing created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
+        ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
     </div>
 
     <div id="progress" style="width: 500px;margin-left: auto; margin-right: auto">
@@ -39,7 +39,7 @@
     </div>
     <div id="progress_error" style="display: none;">
         <div style="font-weight: bold; color:#aa1111">
-        ${_("We're sorry but error occured during this operation. Please check your Kallithea server logs, or contact administrator.")}
+        ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")}
         </div>
     </div>
 </div>
diff --git a/kallithea/templates/admin/repos/repo_edit_settings.html b/kallithea/templates/admin/repos/repo_edit_settings.html
--- a/kallithea/templates/admin/repos/repo_edit_settings.html
+++ b/kallithea/templates/admin/repos/repo_edit_settings.html
@@ -12,8 +12,8 @@ ${h.form(url('repo', repo_name=c.repo_in
                     <span id="clone_id" class="help-block" style="display: none">
                         ${_('URL by id')}: `${c.repo_info.clone_url(with_id=True)}` </br>
                         ${_('''In case this repository is renamed or moved into another group the repository url changes.
-                               Using the above url guarantees that this repository will allways be accessible under such url.
-                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service.''')}</span>
+                               Using the above url guarantees that this repository will always be accessible under such url.
+                               Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service.''')}</span>
                 </div>
            </div>
            <div class="field">
diff --git a/kallithea/templates/admin/settings/settings_search.html b/kallithea/templates/admin/settings/settings_search.html
--- a/kallithea/templates/admin/settings/settings_search.html
+++ b/kallithea/templates/admin/settings/settings_search.html
@@ -12,7 +12,7 @@ ${h.form(url('admin_settings_search'), m
                         <label for="full_index">${_('Build from scratch')}</label>
 
                     </div>
-                    <span class="help-block">${_('This option completely reindexes all of the repositories for proper fulltext search capabilities.')}</span>
+                    <span class="help-block">${_('This option completely reindexeses all of the repositories for proper fulltext search capabilities.')}</span>
 
                 </div>
             </div>
diff --git a/kallithea/templates/admin/settings/settings_vcs.html b/kallithea/templates/admin/settings/settings_vcs.html
--- a/kallithea/templates/admin/settings/settings_vcs.html
+++ b/kallithea/templates/admin/settings/settings_vcs.html
@@ -10,7 +10,7 @@ ${h.form(url('admin_settings'), method='
                         ${h.checkbox('web_push_ssl', 'True')}
                         <label for="web_push_ssl">${_('Require SSL for vcs operations')}</label>
                     </div>
-                    <span class="help-block">${_('Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return a HTTP Error 406: Not Acceptable.')}</span>
+                    <span class="help-block">${_('Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable.')}</span>
                 </div>
              </div>
 
diff --git a/kallithea/templates/data_table/_dt_elements.html b/kallithea/templates/data_table/_dt_elements.html
--- a/kallithea/templates/data_table/_dt_elements.html
+++ b/kallithea/templates/data_table/_dt_elements.html
@@ -87,7 +87,7 @@
       <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-fork"></i></a>
     %endif
     %if rstate == 'repo_state_pending':
-      <i class="icon-wrench" style="color: #036185;" title="${_('Repository creating in progress...')}"></i>
+      <i class="icon-wrench" style="color: #036185;" title="${_('Repository creation in progress...')}"></i>
     %endif
   </div>
 </%def>
diff --git a/kallithea/tests/api/api_base.py b/kallithea/tests/api/api_base.py
--- a/kallithea/tests/api/api_base.py
+++ b/kallithea/tests/api/api_base.py
@@ -1166,7 +1166,7 @@ class BaseTestApi(object):
             fixture.destroy_repo(repo_name)
 
     @mock.patch.object(RepoModel, 'update', crash)
-    def test_api_update_repo_exception_occured(self):
+    def test_api_update_repo_exception_occurred(self):
         repo_name = 'api_update_me'
         fixture.create_repo(repo_name, repo_type=self.REPO_TYPE)
         id_, params = _build_data(self.apikey, 'update_repo',
@@ -1454,7 +1454,7 @@ class BaseTestApi(object):
             fixture.destroy_user_group(gr_name)
 
     @mock.patch.object(UserGroupModel, 'update', crash)
-    def test_api_update_user_group_exception_occured(self):
+    def test_api_update_user_group_exception_occurred(self):
         gr_name = 'test_group'
         fixture.create_user_group(gr_name)
         id_, params = _build_data(self.apikey, 'update_user_group',
@@ -1582,7 +1582,7 @@ class BaseTestApi(object):
             if UserGroupModel().get_by_name(gr_name):
                 fixture.destroy_user_group(gr_name)
 
-    def test_api_delete_user_group_exception_occured(self):
+    def test_api_delete_user_group_exception_occurred(self):
         gr_name = 'test_group'
         ugroup = fixture.create_user_group(gr_name)
         gr_id = ugroup.users_group_id
@@ -2239,7 +2239,7 @@ class BaseTestApi(object):
         self._compare_ok(id_, expected, given=response.body)
 
     @mock.patch.object(GistModel, 'create', crash)
-    def test_api_create_gist_exception_occured(self):
+    def test_api_create_gist_exception_occurred(self):
         id_, params = _build_data(self.apikey_regular, 'create_gist',
                                   files={})
         response = api_call(self, params)
@@ -2271,7 +2271,7 @@ class BaseTestApi(object):
         self._compare_error(id_, expected, given=response.body)
 
     @mock.patch.object(GistModel, 'delete', crash)
-    def test_api_delete_gist_exception_occured(self):
+    def test_api_delete_gist_exception_occurred(self):
         gist_id = fixture.create_gist().gist_access_id
         id_, params = _build_data(self.apikey, 'delete_gist',
                                   gistid=gist_id)