diff --git a/.gitignore b/.gitignore
index 6087d632e..1e3a56c2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,6 @@ codekit-config.json
 
 config.rb
 
-deploy.sh
\ No newline at end of file
+deploy.sh
+
+.idea
\ No newline at end of file
diff --git a/client/main.js b/client/main.js
index 2f11d40b8..8913b437b 100644
--- a/client/main.js
+++ b/client/main.js
@@ -9,6 +9,20 @@ Meteor.subscribe('settings', function(){
   // runs once on site load
   analyticsInit();
   Session.set('settingsLoaded',true);
+
+  // Localisation
+  i18n.init({
+    lng: getSetting("language"),
+    resStore: eval(getSetting("language")),
+    saveMissing: true,
+    debug: true
+    });
+
+  Handlebars.registerHelper('i18n',
+    function(str){
+      return (i18n != undefined ? i18n.t(str) : str);
+    }
+  );
 });
 
 // Categories
diff --git a/client/models/setting.js b/client/models/setting.js
index 2132f434e..e3e104432 100644
--- a/client/models/setting.js
+++ b/client/models/setting.js
@@ -15,6 +15,7 @@ Setting = FormModel.extend({
     logoHeight: '',
     logoWidth: '',
     defaultEmail: '',
+    language: 'en',
     newPostsNotifications: true,
     backgroundColor: '',
     secondaryColor: '',
diff --git a/client/views/posts/post_item.html b/client/views/posts/post_item.html
index c80752563..aa66c906a 100644
--- a/client/views/posts/post_item.html
+++ b/client/views/posts/post_item.html
@@ -1,7 +1,7 @@
 <template name="post_item">
   <div class="post post-{{rank}} {{#if sticky}}sticky{{/if}} {{inactiveClass}}" id="{{_id}}">
     <ul class="post-actions">
-      <li class="post-share desktop"><a href="#" class="share-link"><i class="icon-share"></i><span class="action">Share</span></a>
+      <li class="post-share desktop"><a href="#" class="share-link"><i class="icon-share"></i><span class="action">{{i18n 'Share'}}</span></a>
         <div class="share-options hidden">
           {{#constant}}
           <div data-url="{{#if url}}{{url}}{{else}}{{current_domain}}/posts/{{_id}}{{/if}}" data-text="{{headline}}" class="share-replace">
@@ -13,7 +13,7 @@
         <a class="discuss-link go-to-comments" href="/posts/{{_id}}">
           <i class="icon-comment"></i>
           <span class="count">{{comments}}</span>
-          <span class="action">Discuss</span>
+          <span class="action">{{i18n 'Discuss'}}</span>
         </a>
       </li>
       <li class="post-more mobile"><a class="more-link"><i class="icon-share"></i><span class="action">Text </span></a></li>
@@ -22,14 +22,14 @@
       {{#if showRank}}<span class="post-rank">{{rank}}</span>{{/if}}
       <div class="post-upvote">
         {{#if voted}}
-          <span class="upvote-link voted"><i class="icon-check"></i><span>Upvote</span></span>
+          <span class="upvote-link voted"><i class="icon-check"></i><span>{{i18n "Upvote"}}</span></span>
         {{else}}
-          <a class="upvote-link not-voted" href="#"><i class="icon-up"></i><span>Upvote</span></a>
+          <a class="upvote-link not-voted" href="#"><i class="icon-up"></i><span>{{i18n "Upvote"}}</span></a>
         {{/if}}
       </div>
       <div class="post-info">
         {{#if sticky}}
-          <span class="post-sticky"><i class="icon-pin"></i><span>Sticky</span></span>
+          <span class="post-sticky"><i class="icon-pin"></i><span>{{i18n "Sticky"}}</span></span>
         {{/if}}
         <h3 class="post-heading">
           <a href="{{postLink}}" class="post-title" target="_blank">{{headline}}</a>
@@ -43,7 +43,7 @@
             | <a href="/posts/{{_id}}/edit" class="edit-link goto-edit">Edit</a>
           {{/if}}
           {{#if currentUser.isAdmin}}
-            | status: {{status}}</span>, votes: {{votes}}, baseScore: {{baseScore}}, score: {{short_score}}, clicks: {{clicks}}
+            | {{i18n "status"}}: {{status}}</span>, {{i18n "votes"}}: {{votes}}, {{i18n "baseScore"}}: {{baseScore}}, {{i18n "score"}}: {{short_score}}, {{i18n "clicks"}}: {{clicks}}
           {{/if}}
         </p>
       </div>
diff --git a/lib/locales/en.js b/lib/locales/en.js
new file mode 100644
index 000000000..8288ea30c
--- /dev/null
+++ b/lib/locales/en.js
@@ -0,0 +1,16 @@
+en = {
+  'en': {
+    translation: {
+      // Post item
+      "Share": "Share",
+      "Discuss": "Discuss",
+      "Upvote": "Upvote",
+      "Sticky": "Sticky",
+      "status": "status",
+      "votes": "votes",
+      "baseScore": "baseScore",
+      "score": "score",
+      "clicks": "clicks"
+    }
+  }
+};
\ No newline at end of file
diff --git a/lib/locales/fr.js b/lib/locales/fr.js
new file mode 100644
index 000000000..4a5429eb5
--- /dev/null
+++ b/lib/locales/fr.js
@@ -0,0 +1,16 @@
+fr = {
+  'fr': {
+    translation: {
+      // Post item
+      "Share": "Partager",
+      "Discuss": "Discuter",
+      "Upvote": "Voter",
+      "Sticky": "Collant",
+      "status": "status",
+      "votes": "votes",
+      "baseScore": "baseScore",
+      "score": "score",
+      "clicks": "clics"
+    }
+  }
+};
\ No newline at end of file