From 07564106843e0453b0059555899cd6f671cb58c7 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Sun, 16 Feb 2014 11:36:11 -0500
Subject: [PATCH] closes #1012

---
 public/language/en_GB/global.json    | 5 +++++
 public/language/en_GB/topic.json     | 3 +++
 public/language/en_GB/user.json      | 1 +
 public/src/app.js                    | 4 ++--
 public/templates/accountedit.tpl     | 6 +++---
 public/templates/accountsettings.tpl | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/public/language/en_GB/global.json b/public/language/en_GB/global.json
index 40e0f8ed98..3d36d5fc90 100644
--- a/public/language/en_GB/global.json
+++ b/public/language/en_GB/global.json
@@ -12,6 +12,9 @@
 	"register": "Register",
 	"login": "Login",
 
+	"welcome_back": "Welcome Back ",
+	"you_have_successfully_logged_in": "You have successfully logged in",
+
 	"logout": "Logout",
 	"logout.title": "You are now logged out.",
 	"logout.message": "You have successfully logged out of NodeBB",
@@ -19,6 +22,8 @@
 	"save_changes": "Save Changes",
 	"close": "Close",
 
+	"pagination": "Pagination",
+
 	"header.admin": "Admin",
 	"header.recent": "Recent",
 	"header.unread": "Unread",
diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json
index a3b2f62c82..85a923afbb 100644
--- a/public/language/en_GB/topic.json
+++ b/public/language/en_GB/topic.json
@@ -24,6 +24,9 @@
 	"flag_title": "Flag this post for moderation",
 	"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
 
+	"watch": "Watch",
+	"share_this_post": "Share this Post",
+
 	"thread_tools.title": "Thread Tools",
 	"thread_tools.markAsUnreadForAll": "Mark Unread",
 	"thread_tools.pin": "Pin Topic",
diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index 208fb5dd09..ec671f6576 100644
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -27,6 +27,7 @@
 	"edit": "Edit",
 	"uploaded_picture": "Uploaded Picture",
 	"upload_new_picture": "Upload New Picture",
+	"current_password": "Current Password",
 	"change_password": "Change Password",
 	"confirm_password": "Confirm Password",
 	"password": "Password",
diff --git a/public/src/app.js b/public/src/app.js
index dd738fe8eb..c13f1cfbe3 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -346,8 +346,8 @@ var socket,
 		function showAlert() {
 			app.alert({
 				type: 'success',
-				title: 'Welcome Back ' + app.username + '!',
-				message: 'You have successfully logged in!',
+				title: '[[global:welcome_back]] ' + app.username + '!',
+				message: '[[global:you_have_successfully_logged_in]]',
 				timeout: 5000
 			});
 		}
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 565bccd649..acfe85af56 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -27,8 +27,8 @@
 					<a id="uploadPictureBtn" href="#">[[user:upload_new_picture]]</a>
 				</div>
 				<div class="modal-footer">
-					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
-					<button id="savePictureChangesBtn" class="btn btn-primary">Save changes</button>
+					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">[[global:close]]</button>
+					<button id="savePictureChangesBtn" class="btn btn-primary">[[global:save_changes]]</button>
 				</div>
 			</div><!-- /.modal-content -->
 		</div><!-- /.modal-dialog -->
@@ -113,7 +113,7 @@
 			<div style="vertical-align:top;">
 				<form class='form-horizontal'>
 					<div class="control-group">
-						<label class="control-label" for="inputCurrentPassword">Current Password</label>
+						<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
 						<div class="controls">
 							<input class="form-control" type="password" id="inputCurrentPassword" placeholder="Current Password" value="">
 						</div>
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index 82bf8b6517..e20a388264 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -13,7 +13,7 @@
 					</label>
 				</div>
 			</div>
-			<h4>Pagination</h4>
+			<h4>[[global:pagination]]</h4>
 			<div class="well">
 				<div class="checkbox">
 					<label>