diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index 3aa641f2..da5d5e28 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -221,7 +221,7 @@ RegisterDirective = ($auth, $confirm, $location, $navUrls, $config) ->
form = $el.find("form").checksley()
onSuccessSubmit = (response) ->
- $confirm.notify("success", "Our Oompa Loompas are happy, wellcome to Taiga.") #TODO: i18n
+ $confirm.notify("success", "Our Oompa Loompas are happy, welcome to Taiga.") #TODO: i18n
$location.path($navUrls.resolve("home"))
onErrorSubmit = (response) ->
@@ -305,7 +305,7 @@ ChangePasswordFromRecoveryDirective = ($auth, $confirm, $location, $params, $nav
onSuccessSubmit = (response) ->
$location.path($navUrls.resolve("login"))
- $confirm.success("Our Oompa Loompas save your new password.
+ $confirm.success("Our Oompa Loompas saved your new password.
Try to sign in with it.") #TODO: i18n
onErrorSubmit = (response) ->
@@ -346,8 +346,8 @@ InvitationDirective = ($auth, $confirm, $location, $params, $navUrls) ->
promise.then null, (response) ->
$location.path($navUrls.resolve("login"))
- $confirm.success("Ooops, we have a problems
- Our Oompa Loompas can't find your invitations.") #TODO: i18n
+ $confirm.success("Ooops, we have a problem
+ Our Oompa Loompas can't find your invitation.") #TODO: i18n
# Login form
$scope.dataLogin = {token: token}
@@ -355,12 +355,12 @@ InvitationDirective = ($auth, $confirm, $location, $params, $navUrls) ->
onSuccessSubmitLogin = (response) ->
$location.path($navUrls.resolve("project", {project: $scope.invitation.project_slug}))
- $confirm.notify("success", "You've successfully joined to this project",
- "Wellcome to #{$scope.invitation.project_name}")
+ $confirm.notify("success", "You've successfully joined this project",
+ "Welcome to #{$scope.invitation.project_name}")
onErrorSubmitLogin = (response) ->
$confirm.notify("light-error", "According to our Oompa Loompas, your are not registered yet or
- type an invalid password.") #TODO: i18n
+ typed an invalid password.") #TODO: i18n
submitLogin = ->
if not loginForm.validate()
@@ -383,11 +383,11 @@ InvitationDirective = ($auth, $confirm, $location, $params, $navUrls) ->
onSuccessSubmitRegister = (response) ->
$location.path($navUrls.resolve("project", {project: $scope.invitation.project_slug}))
- $confirm.notify("success", "You've successfully joined to this project",
- "Wellcome to #{$scope.invitation.project_name}")
+ $confirm.notify("success", "You've successfully joined this project",
+ "Welcome to #{$scope.invitation.project_name}")
onErrorSubmitRegister = (response) ->
- $confirm.notify("light-error", "According to our Oompa Loompas, the
+ $confirm.notify("light-error", "According to our Oompa Loompas, that
username or email is already in use.") #TODO: i18n
submitRegister = ->
diff --git a/app/coffee/modules/common/history.coffee b/app/coffee/modules/common/history.coffee
index ead7a6a8..98ba3356 100644
--- a/app/coffee/modules/common/history.coffee
+++ b/app/coffee/modules/common/history.coffee
@@ -269,7 +269,7 @@ HistoryDirective = ($log, $loading) ->
team_requirement: "team requirement"
# Task
- milestone: "spreint"
+ milestone: "sprint"
user_story: "user story"
is_iocaine: "is iocaine"