diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 3d5792d3..b90aee45 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -1,18 +1,17 @@
 - provide(:title, generate_title("Sign Up"))
 .container
-  %h1 Sign up
+  %h1= t('views.sessions.new')
 
   = bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
     = devise_error_messages!
 
-    = f.text_field :screen_name, autofocus: true, label: "User name"
-    = f.email_field :email, autofocus: false, label: "Email address"
+    = f.text_field :screen_name, autofocus: true, label: t('views.settings.account.username')
+    = f.email_field :email, autofocus: false, label: t('views.settings.account.email')
 
-    = f.password_field :password, autocomplete: "off", label: "Password"
-    = f.password_field :password_confirmation, autocomplete: "off", label: "Confirm password"
+    = f.password_field :password, autocomplete: "off", label: t('views.settings.account.password')
+    = f.password_field :password_confirmation, autocomplete: "off", label: t('views.settings.account.password_confirm')
 
-    %p
-      With signing up you accept our
+    %p= raw t('views.sessions.info', terms: link_to(t('views.general.terms'), terms_path))
       = link_to "Terms of Service", terms_path
     = f.submit "Sign up"
 
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index e6e4e0d2..3ef2cdf2 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,17 +1,17 @@
 - provide(:title, generate_title("Sign In"))
 .container
-  %h1 Sign in
+  %h1= t('views.sessions.create')
   = render 'layouts/messages'
 
   = bootstrap_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
 
-    = f.text_field :login, autofocus: true, label: "User name"
-    = f.password_field :password, autocomplete: "off", label: "Password"
+    = f.text_field :login, autofocus: true, label: t('views.settings.account.username')
+    = f.password_field :password, autocomplete: "off", label: t('views.settings.account.password')
 
     - if devise_mapping.rememberable?
       = f.check_box :remember_me
 
-    = f.submit "Sign in"
+    = f.submit t('views.sessions.create')
 
   = render "devise/shared/links"
 = render "shared/links"
diff --git a/app/views/shared/_links.html.haml b/app/views/shared/_links.html.haml
index 2d3294a9..66245fbe 100644
--- a/app/views/shared/_links.html.haml
+++ b/app/views/shared/_links.html.haml
@@ -3,10 +3,10 @@
   = Date.today.year
   = APP_CONFIG['site_name']
   ·
-  = link_to "About", about_path
+  = link_to t('views.general.about'), about_path
   ·
   = link_to "Github", 'https://github.com/retrospring/retrospring'
   ·
-  = link_to "Terms of Service", terms_path
+  = link_to t('views.general.terms'), terms_path
   ·
-  = link_to "Privacy Policy", privacy_policy_path
\ No newline at end of file
+  = link_to t('views.general.privacy'), privacy_policy_path
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c8b2914f..eeafecb7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -255,6 +255,9 @@ en:
       timeline: "Timeline"
       public: "Public"
       user: "User"
+      terms: "Terms of Service"
+      privacy: "Privacy Policy"
+      about: "About"
     group:
       title: "Group"
       members: "Members"
@@ -287,6 +290,7 @@ en:
       destroy: "Logout"
       create: "Sign in"
       new: "Sign up"
+      info: "With signing up you accept our %{terms}"
     moderation:
       tabs:
         all: "All reports"