From 4b531cb655d59fb4318d02208ea3049b8d4d9ac2 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Fri, 11 Mar 2016 13:47:59 +0200
Subject: [PATCH] closes #4345

---
 src/views/admin/manage/flags.tpl  |  2 +-
 src/views/admin/manage/group.tpl  | 14 +++++++-------
 src/views/admin/settings/user.tpl | 22 +++++++++++-----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl
index b6abe3252a..d5807ce88e 100644
--- a/src/views/admin/manage/flags.tpl
+++ b/src/views/admin/manage/flags.tpl
@@ -23,7 +23,7 @@
 					</div>
 				</div>
 
-				<button type="submit" class="btn btn-primary">[[global:search]]</button>
+				<button type="submit" class="btn btn-primary">Search</button>
 			</form>
 			<br />
 			<hr/>
diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl
index 28cd6c006e..f39b9210e5 100644
--- a/src/views/admin/manage/group.tpl
+++ b/src/views/admin/manage/group.tpl
@@ -31,7 +31,7 @@
 				<fieldset>
 					<div class="checkbox">
 						<label>
-							<input id="group-userTitleEnabled" name="userTitleEnabled" type="checkbox"<!-- IF group.userTitleEnabled --> checked<!-- ENDIF group.userTitleEnabled -->> <strong>[[groups:details.userTitleEnabled]]</strong>
+							<input id="group-userTitleEnabled" name="userTitleEnabled" type="checkbox"<!-- IF group.userTitleEnabled --> checked<!-- ENDIF group.userTitleEnabled -->> <strong>Show Badge</strong>
 						</label>
 					</div>
 				</fieldset>
@@ -39,9 +39,9 @@
 				<fieldset>
 					<div class="checkbox">
 						<label>
-							<input id="group-private" name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->> <strong>[[groups:details.private]]</strong>
+							<input id="group-private" name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->> <strong>Private</strong>
 							<p class="help-block">
-								[[groups:details.private_help]]
+								If enabled, joining of groups requires approval from a group owner
 							</p>
 						</label>
 					</div>
@@ -50,7 +50,7 @@
 				<fieldset>
 					<div class="checkbox">
 						<label>
-							<input id="group-disableJoinRequests" name="disableJoinRequests" type="checkbox"<!-- IF group.disableJoinRequests --> checked<!-- ENDIF group.disableJoinRequests -->> <strong>[[groups:details.disableJoinRequests]]</strong>
+							<input id="group-disableJoinRequests" name="disableJoinRequests" type="checkbox"<!-- IF group.disableJoinRequests --> checked<!-- ENDIF group.disableJoinRequests -->> <strong>Disable join requests</strong>
 						</label>
 					</div>
 				</fieldset>
@@ -58,9 +58,9 @@
 				<fieldset>
 					<div class="checkbox">
 						<label>
-							<input id="group-hidden" name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->> <strong>[[groups:details.hidden]]</strong>
+							<input id="group-hidden" name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->> <strong>[Hidden</strong>
 							<p class="help-block">
-								[[groups:details.hidden_help]]
+								If enabled, this group will not be found in the groups listing, and users will have to be invited manually
 							</p>
 						</label>
 					</div>
@@ -76,7 +76,7 @@
 				<fieldset>
 					<div class="panel panel-default">
 						<div class="panel-heading">
-							<h3 class="panel-title"><i class="fa fa-users"></i> [[groups:details.members]]</h3>
+							<h3 class="panel-title"><i class="fa fa-users"></i> Member List</h3>
 						</div>
 						<div class="panel-body">
 							<!-- IMPORT partials/groups/memberlist.tpl -->
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index cf5360d5fb..08ae01fe68 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -178,40 +178,40 @@
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="showemail">
-					<span class="mdl-switch__label"><strong>[[user:show_email]]</strong></span>
+					<span class="mdl-switch__label"><strong>Show email</strong></span>
 				</label>
 			</div>
 
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="showfullname">
-					<span class="mdl-switch__label"><strong>[[user:show_fullname]]</strong></span>
+					<span class="mdl-switch__label"><strong>Show fullname</strong></span>
 				</label>
 			</div>
 
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="restrictChat">
-					<span class="mdl-switch__label"><strong>[[user:restrict_chats]]</strong></span>
+					<span class="mdl-switch__label"><strong>Only allow chat messages from users I follow</strong></span>
 				</label>
 			</div>
 
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="openOutgoingLinksInNewTab">
-					<span class="mdl-switch__label"><strong>[[user:open_links_in_new_tab]]</strong></span>
+					<span class="mdl-switch__label"><strong>Open outgoing links in new tab</strong></span>
 				</label>
 			</div>
 
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="topicSearchEnabled">
-					<span class="mdl-switch__label"><strong>[[user:enable_topic_searching]]</strong></span>
+					<span class="mdl-switch__label"><strong>Enable In-Topic Searching</strong></span>
 				</label>
 			</div>
 
 			<div class="form-group">
-				<label>[[user:digest_label]]</label>
+				<label>Subscribe to Digest</label>
 				<select class="form-control" data-field="dailyDigestFreq">
 					<option value="off">Off</option>
 					<option value="day">Daily</option>
@@ -223,35 +223,35 @@
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="sendChatNotifications">
-					<span class="mdl-switch__label"><strong>[[user:send_chat_notifications]]</strong></span>
+					<span class="mdl-switch__label"><strong>Send an email if a new chat message arrives and I am not online</strong></span>
 				</label>
 			</div>
 
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="sendPostNotifications">
-					<span class="mdl-switch__label"><strong>[[user:send_post_notifications]]</strong></span>
+					<span class="mdl-switch__label"><strong>Send an email when replies are made to topics I am subscribed to</strong></span>
 				</label>
 			</div>
 
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="followTopicsOnCreate">
-					<span class="mdl-switch__label"><strong>[[user:follow_topics_you_create]]</strong></span>
+					<span class="mdl-switch__label"><strong>Follow topics you create</strong></span>
 				</label>
 			</div>
 
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="followTopicsOnReply">
-					<span class="mdl-switch__label"><strong>[[user:follow_topics_you_reply_to]]</strong></span>
+					<span class="mdl-switch__label"><strong>Follow topics that you reply to</strong></span>
 				</label>
 			</div>
 
 			<div class="checkbox">
 				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
 					<input class="mdl-switch__input" type="checkbox" data-field="notificationSounds" />
-					<span class="mdl-switch__label">[[user:notification_sounds]]</span>
+					<span class="mdl-switch__label">Play a sound when you receive a notification</span>
 				</label>
 			</div>