diff --git a/src/App.vue b/src/App.vue
index 48cf9ea6e0..479358b298 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
         <div class='item right'>
           <user-finder></user-finder>
           <router-link :to="{ name: 'settings'}"><i class="icon-cog"></i></router-link>
-          <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout" title="Logout" ></i></a>
+          <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout" :title="$t('login.logout')" ></i></a>
         </div>
       </div>
     </nav>
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index e8d97f9901..b430d87540 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="timeline panel panel-default base00-background">
     <div class="panel-heading base01-background base04 base03-border conversation-heading">
-      Conversation
+      {{ $t('timeline.conversation') }}
       <span v-if="collapsable" style="float:right;">
         <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small>
       </span>
diff --git a/src/components/friends_timeline/friends_timeline.vue b/src/components/friends_timeline/friends_timeline.vue
index 3bf3b5432f..66c0c058a4 100644
--- a/src/components/friends_timeline/friends_timeline.vue
+++ b/src/components/friends_timeline/friends_timeline.vue
@@ -1,5 +1,5 @@
 <template>
-  <Timeline :title="'Friends'" v-bind:timeline="timeline" v-bind:timeline-name="'friends'"/>
+  <Timeline :title="$t('nav.timeline')" v-bind:timeline="timeline" v-bind:timeline-name="'friends'"/>
 </template>
 
 <script src="./friends_timeline.js"></script>
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index d629114820..c05488ec35 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -2,22 +2,22 @@
   <div class="login panel panel-default base00-background">
     <!-- Default panel contents -->
     <div class="panel-heading base01-background base04">
-      Log in
+      {{$t('login.login')}}
     </div>
     <div class="panel-body">
       <form v-on:submit.prevent='submit(user)' class='login-form'>
         <div class='form-group'>
-          <label for='username'>Username</label>
+          <label for='username'>{{$t('login.username')}}</label>
           <input :disabled="loggingIn" v-model='user.username' class='form-control' id='username' placeholder='e.g. lain'>
         </div>
         <div class='form-group'>
-          <label for='password'>Password</label>
+          <label for='password'>{{$t('login.password')}}</label>
           <input :disabled="loggingIn" v-model='user.password' class='form-control' id='password' type='password'>
         </div>
         <div class='form-group'>
           <div class='login-bottom'>
-            <div><router-link :to="{name: 'registration'}" v-if='registrationOpen' class='register'>Register</router-link></div>
-            <button :disabled="loggingIn" type='submit' class='btn btn-default base05 base01-background'>Log in</button>
+            <div><router-link :to="{name: 'registration'}" v-if='registrationOpen' class='register'>{{$t('login.register')}}</router-link></div>
+            <button :disabled="loggingIn" type='submit' class='btn btn-default base05 base01-background'>{{$t('login.login')}}</button>
           </div>
         </div>
         <div v-if="authError" class='form-group'>
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 5a6e02e515..0a744c10b6 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -2,7 +2,7 @@
   <div class="post-status-form">
     <form @submit.prevent="postStatus(newStatus)">
       <div class="form-group base03-border" >
-        <textarea @click="setCaret" @keyup="setCaret" v-model="newStatus.status" placeholder="Just landed in L.A." rows="1" class="form-control" @keydown.meta.enter="postStatus(newStatus)" @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop" @dragover.prevent="fileDrag" @input="resize"></textarea>
+        <textarea @click="setCaret" @keyup="setCaret" v-model="newStatus.status" :placeholder="$t('post_status.default')" rows="1" class="form-control" @keydown.meta.enter="postStatus(newStatus)" @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop" @dragover.prevent="fileDrag" @input="resize"></textarea>
       </div>
       <div style="position:relative;" v-if="candidates">
         <div class="autocomplete-panel base05-background">
@@ -17,8 +17,8 @@
       </div>
       <div class='form-bottom'>
         <media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit" :drop-files="dropFiles"></media-upload>
-        <button v-if="posting" disabled class="btn btn-default base05 base01-background">Posting</button>
-        <button v-else :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">Submit</button>
+        <button v-if="posting" disabled class="btn btn-default base05 base01-background">{{$t('post_status.posting')}}</button>
+        <button v-else :disabled="submitDisabled" type="submit" class="btn btn-default base05 base01-background">{{$t('general.submit')}}</button>
       </div>
       <div class='error' v-if="error">
         Error: {{ error }}
diff --git a/src/components/public_and_external_timeline/public_and_external_timeline.vue b/src/components/public_and_external_timeline/public_and_external_timeline.vue
index fd69693858..aded2ead06 100644
--- a/src/components/public_and_external_timeline/public_and_external_timeline.vue
+++ b/src/components/public_and_external_timeline/public_and_external_timeline.vue
@@ -1,5 +1,5 @@
 <template>
-  <Timeline :title="'THE WHOLE KNOWN NETWORK'"v-bind:timeline="timeline" v-bind:timeline-name="'publicAndExternal'"/>
+  <Timeline :title="$t('nav.twkn')"v-bind:timeline="timeline" v-bind:timeline-name="'publicAndExternal'"/>
 </template>
 
 <script src="./public_and_external_timeline.js"></script>
diff --git a/src/components/public_timeline/public_timeline.vue b/src/components/public_timeline/public_timeline.vue
index bd6a23ed71..85d42ccae2 100644
--- a/src/components/public_timeline/public_timeline.vue
+++ b/src/components/public_timeline/public_timeline.vue
@@ -1,5 +1,5 @@
 <template>
-  <Timeline :title="'Public Timeline'" v-bind:timeline="timeline" v-bind:timeline-name="'public'"/>
+  <Timeline :title="$t('nav.public_tl')" v-bind:timeline="timeline" v-bind:timeline-name="'public'"/>
 </template>
 
 <script src="./public_timeline.js"></script>
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index bb3e5e04f3..755489d796 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -1,34 +1,34 @@
 <template>
   <div class="settings panel panel-default base00-background">
     <div class="panel-heading base01-background base04">
-      Registration
+      {{$t('registration.registration')}}
     </div>
     <div class="panel-body">
       <form v-on:submit.prevent='submit(user)' class='registration-form'>
         <div class='container'>
           <div class='text-fields'>
             <div class='form-group'>
-              <label for='username'>Username</label>
+              <label for='username'>{{$t('login.username')}}</label>
               <input :disabled="registering" v-model='user.username' class='form-control' id='username' placeholder='e.g. lain'>
             </div>
             <div class='form-group'>
-              <label for='fullname'>Fullname</label>
+              <label for='fullname'>{{$t('registration.fullname')}}</label>
               <input :disabled="registering" v-model='user.fullname' class='form-control' id='fullname' placeholder='e.g. Lain Iwakura'>
             </div>
             <div class='form-group'>
-              <label for='email'>Email</label>
+              <label for='email'>{{$t('registration.email')}}</label>
               <input :disabled="registering" v-model='user.email' class='form-control' id='email' type="email">
             </div>
             <div class='form-group'>
-              <label for='bio'>Bio</label>
+              <label for='bio'>{{$t('registration.bio')}}</label>
               <input :disabled="registering" v-model='user.bio' class='form-control' id='bio'>
             </div>
             <div class='form-group'>
-              <label for='password'>Password</label>
+              <label for='password'>{{$t('login.password')}}</label>
               <input :disabled="registering" v-model='user.password' class='form-control' id='password' type='password'>
             </div>
             <div class='form-group'>
-              <label for='password_confirmation'>Password confirmation</label>
+              <label for='password_confirmation'>{{$t('registration.password_confirm')}}</label>
               <input :disabled="registering" v-model='user.confirm' class='form-control' id='password_confirmation' type='password'>
             </div>
             <!--
@@ -39,7 +39,7 @@
             </div>
             -->
             <div class='form-group'>
-              <button :disabled="registering" type='submit' class='btn btn-default base05 base01-background'>Submit</button>
+              <button :disabled="registering" type='submit' class='btn btn-default base05 base01-background'>{{$t('general.submit')}}</button>
             </div>
           </div>
           <div class='terms-of-service' v-html="termsofservice">
diff --git a/src/components/user_finder/user_finder.vue b/src/components/user_finder/user_finder.vue
index 2ca476fa35..a54b8ae26e 100644
--- a/src/components/user_finder/user_finder.vue
+++ b/src/components/user_finder/user_finder.vue
@@ -2,12 +2,12 @@
   <span>
     <span class="finder-error base05" v-if="error">
       <i class="icon-cancel user-finder-icon" @click="dismissError"/>
-      Error fetching user
+      {{$t('finder.error_fetching_user')}}
     </span>
     <i class="icon-spin4 user-finder-icon animate-spin-slow" v-if="loading" />
     <a href="#" v-if="hidden"><i class="icon-user-plus user-finder-icon" @click.prevent="toggleHidden"/></a>
     <span v-else>
-      <input class="user-finder-input base03-border" @keyup.enter="findUser(username)" v-model="username" placeholder="Find user" id="user-finder-input" type="text"/>
+      <input class="user-finder-input base03-border" @keyup.enter="findUser(username)" v-model="username" :placeholder="$t('finder.find_user')" id="user-finder-input" type="text"/>
     <i class="icon-cancel user-finder-icon" @click="toggleHidden"/>
     </span>
   </span>
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index da2f936a9d..de3b7fab03 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -78,7 +78,8 @@ const fi = {
     show_new: 'Näytä uudet',
     error_fetching: 'Virhe ladatessa viestejä',
     up_to_date: 'Ajantasalla',
-    load_older: 'Lataa vanhempia viestejä'
+    load_older: 'Lataa vanhempia viestejä',
+    conversation: 'Keskustelu'
   },
   settings: {
     user_settings: 'Käyttäjän asetukset',
@@ -109,6 +110,28 @@ const fi = {
     read: 'Lue!',
     followed_you: 'seuraa sinua'
   },
+  login: {
+    login: 'Kirjaudu sisään',
+    username: 'Käyttäjänimi',
+    password: 'Salasana',
+    register: 'Rekisteröidy',
+    logout: 'Kirjaudu ulos'
+  },
+  registration: {
+    registration: 'Rekisteröityminen',
+    fullname: 'Koko nimi',
+    email: 'Sähköposti',
+    bio: 'Kuvaus',
+    password_confirm: 'Salasanan vahvistaminen'
+  },
+  post_status: {
+    posting: 'Lähetetään',
+    default: 'Tulin juuri saunasta.'
+  },
+  finder: {
+    find_user: 'Hae käyttäjä',
+    error_fetching_user: 'Virhe hakiessa käyttäjää'
+  },
   general: {
     submit: 'Lähetä'
   }
@@ -138,7 +161,8 @@ const en = {
     show_new: 'Show new',
     error_fetching: 'Error fetching updates',
     up_to_date: 'Up-to-date',
-    load_older: 'Load older statuses'
+    load_older: 'Load older statuses',
+    conversation: 'Conversation'
   },
   settings: {
     user_settings: 'User Settings',
@@ -169,6 +193,28 @@ const en = {
     read: 'Read!',
     followed_you: 'followed you'
   },
+  login: {
+    login: 'Log in',
+    username: 'Username',
+    password: 'Password',
+    register: 'Register',
+    logout: 'Log out'
+  },
+  registration: {
+    registration: 'Registration',
+    fullname: 'Display name',
+    email: 'Email',
+    bio: 'Bio',
+    password_confirm: 'Password confirmation'
+  },
+  post_status: {
+    posting: 'Posting',
+    default: 'Just landed in L.A.'
+  },
+  finder: {
+    find_user: 'Find user',
+    error_fetching_user: 'Error fetching user'
+  },
   general: {
     submit: 'Submit'
   }