diff --git a/layouts/vlayout/modules/Migration/MigrationStep1.tpl b/layouts/vlayout/modules/Migration/MigrationStep1.tpl
index e559e4dfee5e1cc61b9ac66862e16ed95be1acd6..fbf97fbfb78ad988305ea56cc40ec0329d44a209 100644
--- a/layouts/vlayout/modules/Migration/MigrationStep1.tpl
+++ b/layouts/vlayout/modules/Migration/MigrationStep1.tpl
@@ -44,7 +44,7 @@
 					<input type="hidden" id="module" name="module" value="Migration">
 					<input type="hidden" id="view" name="view" value="Index">
 					<input type="hidden" name="mode" value="step2">
-					<input type="submit" class="btn btn-large btn-primary" value="Next"/>
+					<input type="submit" class="btn btn-large btn-primary" value="{vtranslate('Next', $MODULE)}"/>
 				</form>
 			</div>
 		</div>
diff --git a/layouts/vlayout/modules/Migration/MigrationStep2.tpl b/layouts/vlayout/modules/Migration/MigrationStep2.tpl
index 166dba08f41fb3ecd33a0eaaa633b25ab509cabe..5452d20ad7aee08a808faa43d81b2232227a636f 100644
--- a/layouts/vlayout/modules/Migration/MigrationStep2.tpl
+++ b/layouts/vlayout/modules/Migration/MigrationStep2.tpl
@@ -49,7 +49,7 @@
 	                            &nbsp;&nbsp;<a href="//www.vtiger.com/products/crm/privacy_policy.html" target="_blank"><img src="{vimage_path('linkedin.png')}"></a> 
 								<br><br>
 							<div class="button-container">
-								<input type="button" onclick="window.location.href='index.php'" class="btn btn-large btn-primary" value="Finish"/>
+								<input type="button" onclick="window.location.href='index.php'" class="btn btn-large btn-primary" value="{vtranslate('Finish', $MODULE)}"/>
 							</div>
 					</div>
 				</div>
diff --git a/layouts/vlayout/modules/Settings/Groups/EditView.tpl b/layouts/vlayout/modules/Settings/Groups/EditView.tpl
index fcddbbfc21c69c7aec40b4c17f53fb0b84f90f67..ad23aeae82eeb8060ee8acd8e1c0120faf298901 100644
--- a/layouts/vlayout/modules/Settings/Groups/EditView.tpl
+++ b/layouts/vlayout/modules/Settings/Groups/EditView.tpl
@@ -51,7 +51,7 @@
 						{assign var="GROUP_MEMBERS" value=$RECORD_MODEL->getMembers()}
 						<select id="memberList" class="row-fluid members" multiple="true" name="members[]" data-placeholder="{vtranslate('LBL_ADD_USERS_ROLES', $QUALIFIED_MODULE)}" data-validation-engine="validate[required]">
 							{foreach from=$MEMBER_GROUPS key=GROUP_LABEL item=ALL_GROUP_MEMBERS}
-								<optgroup label="{$GROUP_LABEL}">
+								<optgroup label="{vtranslate($GROUP_LABEL, $QUALIFIED_MODULE)}">
 								{foreach from=$ALL_GROUP_MEMBERS item=MEMBER}
 									{if $MEMBER->getName() neq $RECORD_MODEL->getName()}
 										<option value="{$MEMBER->getId()}"  data-member-type="{$GROUP_LABEL}" {if isset($GROUP_MEMBERS[$GROUP_LABEL][$MEMBER->getId()])}selected="true"{/if}>{$MEMBER->getName()}</option>
diff --git a/layouts/vlayout/modules/Settings/MailConverter/ListViewContents.tpl b/layouts/vlayout/modules/Settings/MailConverter/ListViewContents.tpl
index ea1232738c2e7f9dab441716b085acdc8c5b03eb..325e785da03af191f4edbc275cb503c8135be89f 100644
--- a/layouts/vlayout/modules/Settings/MailConverter/ListViewContents.tpl
+++ b/layouts/vlayout/modules/Settings/MailConverter/ListViewContents.tpl
@@ -18,7 +18,7 @@
 						<span class="font-x-large">{$RECORD->getName()}</span>
 					<div class="pull-right btn-group">
 						<button class="btn dropdown-toggle" data-toggle="dropdown">
-							Actions
+							{vtranslate('Actions',$QUALIFIED_MODULE)}
 							<span class="caret"></span>
 						</button>
 						<ul class="dropdown-menu pull-right">
diff --git a/layouts/vlayout/modules/Settings/Profiles/EditView.tpl b/layouts/vlayout/modules/Settings/Profiles/EditView.tpl
index 09eca1f21e04aa3a84974a21391c24b222138b48..d814a90cabaec83c9dc4e1cee336832966e7422b 100644
--- a/layouts/vlayout/modules/Settings/Profiles/EditView.tpl
+++ b/layouts/vlayout/modules/Settings/Profiles/EditView.tpl
@@ -215,7 +215,7 @@
 										{else}
 											style="border-right: 1px solid #DDD !important;"
 										{/if}>
-									<input type="checkbox" class="alignTop"  name="permissions[{$TABID}][actions][{$ACTIONID}]" {if $RECORD_MODEL->hasModuleActionPermission($PROFILE_MODULE, $ACTIONID)}checked="true" {elseif empty($RECORD_ID) && empty($IS_DUPLICATE_RECORD)} checked="true" {/if}> {$ACTION_MODEL->getName()}</td>
+									<input type="checkbox" class="alignTop"  name="permissions[{$TABID}][actions][{$ACTIONID}]" {if $RECORD_MODEL->hasModuleActionPermission($PROFILE_MODULE, $ACTIONID)}checked="true" {elseif empty($RECORD_ID) && empty($IS_DUPLICATE_RECORD)} checked="true" {/if}> {vtranslate($ACTION_MODEL->getName(), $MODULE)}</td>
 									{if $smarty.foreach.actions.last OR ($smarty.foreach.actions.index+1) % 3 == 0}
 										</div>
 									{/if}
diff --git a/layouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl b/layouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl
index 2c2d112a1b5f938bb9e69e373f17744d9b1382c5..b319ee4689f76bc805bddd5253ce776c3ad255fb 100644
--- a/layouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl
+++ b/layouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl
@@ -56,7 +56,7 @@
 					{assign var=LISTVIEW_HEADERNAME value=$LISTVIEW_HEADER->get('name')}
 					{assign var=LAST_COLUMN value=$LISTVIEW_HEADER@last}
 					<td class="listViewEntryValue {$WIDTHTYPE}"  width="{$WIDTH}%" nowrap>
-						&nbsp;{$LISTVIEW_ENTRY->getDisplayValue($LISTVIEW_HEADERNAME)}
+						&nbsp;{vtranslate($LISTVIEW_ENTRY->getDisplayValue($LISTVIEW_HEADERNAME),$QUALIFIED_MODULE)}
 						{if $LAST_COLUMN && $LISTVIEW_ENTRY->getRecordLinks()}
 							</td><td nowrap class="{$WIDTHTYPE}">
 								<div class="pull-right actions">
diff --git a/layouts/vlayout/modules/Settings/Workflows/EditTask.tpl b/layouts/vlayout/modules/Settings/Workflows/EditTask.tpl
index f8e1b02f1a87c4f6a1689b06eab71489b077c88f..f446dac8a02ae909dbfd8e79b61bc91e81858f80 100644
--- a/layouts/vlayout/modules/Settings/Workflows/EditTask.tpl
+++ b/layouts/vlayout/modules/Settings/Workflows/EditTask.tpl
@@ -14,7 +14,7 @@
 	<div class='modelContainer' id="addTaskContainer">
 		<div class="modal-header contentsBackground">
 			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-			<h3>{vtranslate('LBL_ADD_TASKS_FOR_WORKFLOW', $QUALIFIED_MODULE)} -> {$TASK_TYPE_MODEL->get('label')}</h3>
+			<h3>{vtranslate('LBL_ADD_TASKS_FOR_WORKFLOW', $QUALIFIED_MODULE)} -> {vtranslate($TASK_TYPE_MODEL->get('label'), $QUALIFIED_MODULE)}</h3>
 		</div>
 		<form class="form-horizontal" id="saveTask" method="post" action="index.php">
 			<input type="hidden" name="module" value="{$MODULE}" />
diff --git a/layouts/vlayout/modules/Users/ForgotPassword.tpl b/layouts/vlayout/modules/Users/ForgotPassword.tpl
index f0593237009f96587db8b92f52eb947fb38f4664..0c740c66b7fd960098f109d85965d6577eaab69d 100644
--- a/layouts/vlayout/modules/Users/ForgotPassword.tpl
+++ b/layouts/vlayout/modules/Users/ForgotPassword.tpl
@@ -99,7 +99,7 @@
 								<tr><td></td></tr>
 								<tr>
 									<td></td>
-									<td><input type="submit" id="btn" value="Submit" onclick="return checkPassword();"/></td>
+									<td><input type="submit" id="btn" value={vtranslate('Submit', $MODULE)} onclick="return checkPassword();"/></td>
 								</tr>
 							</table>
 						</form>
diff --git a/layouts/vlayout/modules/Users/ListViewContents.tpl b/layouts/vlayout/modules/Users/ListViewContents.tpl
index 950024ab87ec17560d8c0bb05e110176de61a22d..40c779c73b1fd228aae5e01d77638be619210717 100644
--- a/layouts/vlayout/modules/Users/ListViewContents.tpl
+++ b/layouts/vlayout/modules/Users/ListViewContents.tpl
@@ -100,7 +100,7 @@
 					</div>
 					</td>
 				{elseif $LISTVIEW_HEADER->getName() neq 'last_name' and $LISTVIEW_HEADER->getName() neq 'email1'}
-					<td class="{$WIDTHTYPE}" nowrap>{$LISTVIEW_ENTRY->get($LISTVIEW_HEADERNAME)}
+					<td class="{$WIDTHTYPE}" nowrap>{vtranslate($LISTVIEW_ENTRY->get($LISTVIEW_HEADERNAME), $MODULE)}
 						{if !$LISTVIEW_HEADER@last}</td>{/if}
 				{/if}
 				{if $LISTVIEW_HEADER@last}
diff --git a/layouts/vlayout/modules/Users/UserSetup.tpl b/layouts/vlayout/modules/Users/UserSetup.tpl
index 395eac2dd06611e640c9c766a694119dae1ecd09..d07613b16ce04bd224cad23c1c69a8dea68b78de 100644
--- a/layouts/vlayout/modules/Users/UserSetup.tpl
+++ b/layouts/vlayout/modules/Users/UserSetup.tpl
@@ -1,459 +1,459 @@
-{*<!--
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-* ("License"); You may not use this file except in compliance with the License
-* The Original Code is:  vtiger CRM Open Source
-* The Initial Developer of the Original Code is vtiger.
-* Portions created by vtiger are Copyright (C) vtiger.
-* All Rights Reserved.
-*
-********************************************************************************/
--->*}
-{strip}
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>Vtiger</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-		<link REL="SHORTCUT ICON" HREF="layouts/vlayout/skins/images/favicon.ico">
-		<link rel="stylesheet" href="libraries/bootstrap/css/bootstrap.css" type="text/css" media="screen" />
-		<link rel="stylesheet" href="resources/styles.css" type="text/css" media="screen" />
-		<link rel="stylesheet" href="libraries/jquery/select2/select2.css" />
-		<link rel="stylesheet" href="libraries/jquery/posabsolute-jQuery-Validation-Engine/css/validationEngine.jquery.css" />
-
-		<script type="text/javascript" src="libraries/jquery/jquery.min.js"></script>
-		<script type="text/javascript" src="libraries/bootstrap/js/bootstrap-tooltip.js"></script>
-		<script type="text/javascript" src="libraries/jquery/select2/select2.min.js"></script>
-		<script type="text/javascript" src="libraries/jquery/posabsolute-jQuery-Validation-Engine/js/jquery.validationEngine.js" ></script>
-		<script type="text/javascript" src="libraries/jquery/posabsolute-jQuery-Validation-Engine/js/jquery.validationEngine-en.js" ></script>
-
-		<script type="text/javascript">{literal}
-			jQuery(function(){
-				jQuery('select').select2({blurOnChange:true});
-				jQuery('[rel="tooltip"]').tooltip();
-				jQuery('form').validationEngine({
-					prettySelect: true,
-					usePrefix: 's2id_',
-					autoPositionUpdate: true,
-					promptPosition : "topLeft",
-					showOneMessage: true
-				});
-				jQuery('#currency_name_controls').mouseenter(function() {
-					jQuery('#currency_name_tooltip').tooltip('show');
-				});
-				jQuery('#currency_name_controls').mouseleave(function() {
-					jQuery('#currency_name_tooltip').tooltip('hide');
-				});
-			});
-		{/literal}</script>
-		<style type="text/css">{literal}
-			 body { background: #ffffff url('layouts/vlayout/skins/images/usersetupbg.png') no-repeat center top; background-size: 100%; font-size: 14px; }
-			.modal-backdrop { opacity: 0.35; }
-			.tooltip { z-index: 1055; }
-			input, select, textarea { font-size: 14px; }
-		{/literal}</style>
-	</head>
-	<body>
-
-		<div class="container">
-			<div class="modal-backdrop"></div>
-			<form class="form" method="POST" action="index.php?module=Users&action=UserSetupSave">
-				<div class="modal" {if false && $IS_FIRST_USER}style="width: 700px;"{/if}> {* FirstUser information gather - paused *}
-					<div class="modal-header">
-						<h3>{vtranslate('LBL_ALMOST_THERE', $MODULE)}</h3>
-					</div>
-					<div class="modal-body">
-						<div class="row">
-							{if false && $IS_FIRST_USER} {* FirstUser information gather - paused *}
-							<div class="span4">
-								<label class="control-label"><strong>{vtranslate('LBL_ABOUT_ME', $MODULE)}</strong> <span class="muted">{vtranslate('LBL_WE_PROMISE_TO_KEEP_THIS_PRIVATE', $MODULE)}</span></label>
-								<div class="controls">
-									<input type="text" name="about[phone]" id="phone" placeholder="{vtranslate('LBL_PHONE', $MODULE)}" rel="tooltip" title="{vtranslate('LBL_YOUR_CONTACT_NUMBER', $MODULE)}" style="width:250px;">
-								</div>
-								<div class="controls">
-									<select name="about[country]" id="country" placeholder="{vtranslate('LBL_SELECT_COUNTRY', $MODULE)}" rel="tooltip" title="{vtranslate('LBL_WHERE_ARE_YOU_FROM', $MODULE)}" style="width:250px;">
-										<option value=""></option><!-- to allow select2 pick placeholder -->
-										<option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
-										<option value="United States">United States</option>
-										<option value="Afghanistan">Afghanistan</option>
-										<option value="Africa">Africa</option>
-										<option value="Albania">Albania</option>
-										<option value="Algeria">Algeria</option>
-										<option value="American Samoa">American Samoa</option>
-										<option value="Andorra">Andorra</option>
-										<option value="Angola">Angola</option>
-										<option value="Anguilla">Anguilla</option>
-										<option value="Antarctica">Antarctica</option>
-										<option value="Antigua &amp; Barbuda">Antigua &amp; Barbuda</option>
-										<option value="Antilles, Netherlands">Antilles, Netherlands</option>
-										<option value="Arabia, Saudi">Arabia, Saudi</option>
-										<option value="Argentina">Argentina</option>
-										<option value="Armenia">Armenia</option>
-										<option value="Aruba">Aruba</option>
-										<option value="Asia">Asia</option>
-										<option value="Australia">Australia</option>
-										<option value="Austria">Austria</option>
-										<option value="Azerbaijan">Azerbaijan</option>
-										<option value="Bahamas, The">Bahamas, The</option>
-										<option value="Bahrain">Bahrain</option>
-										<option value="Bangladesh">Bangladesh</option>
-										<option value="Barbados">Barbados</option>
-										<option value="Belarus">Belarus</option>
-										<option value="Belgium">Belgium</option>
-										<option value="Belize">Belize</option>
-										<option value="Benin">Benin</option>
-										<option value="Bermuda">Bermuda</option>
-										<option value="Bhutan">Bhutan</option>
-										<option value="Bolivia">Bolivia</option>
-										<option value="Bosnia and Herzegovina">Bosnia and Herzegovina</option>
-										<option value="Botswana">Botswana</option>
-										<option value="Bouvet Island">Bouvet Island</option>
-										<option value="Brazil">Brazil</option>
-										<option value="British Indian Ocean T.">British Indian Ocean T.</option>
-										<option value="British Virgin Islands">British Virgin Islands</option>
-										<option value="Brunei Darussalam">Brunei Darussalam</option>
-										<option value="Bulgaria">Bulgaria</option>
-										<option value="Burkina Faso">Burkina Faso</option>
-										<option value="Burundi">Burundi</option>
-										<option value="Cambodia">Cambodia</option>
-										<option value="Cameroon">Cameroon</option>
-										<option value="Canada">Canada</option>
-										<option value="Cape Verde">Cape Verde</option>
-										<option value="Caribbean, the">Caribbean, the</option>
-										<option value="Cayman Islands">Cayman Islands</option>
-										<option value="Central African Republic">Central African Republic</option>
-										<option value="Central America">Central America</option>
-										<option value="Chad">Chad</option>
-										<option value="Chile">Chile</option>
-										<option value="China">China</option>
-										<option value="Christmas Island">Christmas Island</option>
-										<option value="Cocos (Keeling) Islands">Cocos (Keeling) Islands</option>
-										<option value="Colombia">Colombia</option>
-										<option value="Comoros">Comoros</option>
-										<option value="Congo">Congo</option>
-										<option value="Congo, Dem. Rep. of the">Congo, Dem. Rep. of the</option>
-										<option value="Cook Islands">Cook Islands</option>
-										<option value="Costa Rica">Costa Rica</option>
-										<option value="Cote D'Ivoire">Cote D'Ivoire</option>
-										<option value="Croatia">Croatia</option>
-										<option value="Cuba">Cuba</option>
-										<option value="Cyprus">Cyprus</option>
-										<option value="Czech Republic">Czech Republic</option>
-										<option value="Denmark">Denmark</option>
-										<option value="Djibouti">Djibouti</option>
-										<option value="Dominica">Dominica</option>
-										<option value="Dominican Republic">Dominican Republic</option>
-										<option value="East Timor (Timor-Leste)">East Timor (Timor-Leste)</option>
-										<option value="Ecuador">Ecuador</option>
-										<option value="Egypt">Egypt</option>
-										<option value="El Salvador">El Salvador</option>
-										<option value="Equatorial Guinea">Equatorial Guinea</option>
-										<option value="Eritrea">Eritrea</option>
-										<option value="Estonia">Estonia</option>
-										<option value="Ethiopia">Ethiopia</option>
-										<option value="Europe">Europe</option>
-										<option value="European Union">European Union</option>
-										<option value="Falkland Islands (Malvinas)">Falkland Islands (Malvinas)</option>
-										<option value="Faroe Islands">Faroe Islands</option>
-										<option value="Fiji">Fiji</option>
-										<option value="Finland">Finland</option>
-										<option value="France">France</option>
-										<option value="French Guiana">French Guiana</option>
-										<option value="French Polynesia">French Polynesia</option>
-										<option value="French Southern Terr.">French Southern Terr.</option>
-										<option value="Gabon">Gabon</option>
-										<option value="Gambia, the">Gambia, the</option>
-										<option value="Georgia">Georgia</option>
-										<option value="Germany">Germany</option>
-										<option value="Ghana">Ghana</option>
-										<option value="Gibraltar">Gibraltar</option>
-										<option value="Greece">Greece</option>
-										<option value="Greenland">Greenland</option>
-										<option value="Grenada">Grenada</option>
-										<option value="Guadeloupe">Guadeloupe</option>
-										<option value="Guam">Guam</option>
-										<option value="Guatemala">Guatemala</option>
-										<option value="Guernsey and Alderney">Guernsey and Alderney</option>
-										<option value="Guiana, French">Guiana, French</option>
-										<option value="Guinea">Guinea</option>
-										<option value="Guinea-Bissau">Guinea-Bissau</option>
-										<option value="Guinea, Equatorial">Guinea, Equatorial</option>
-										<option value="Guyana">Guyana</option>
-										<option value="Haiti">Haiti</option>
-										<option value="Heard &amp; McDonald Is.(AU)">Heard &amp; McDonald Is.(AU)</option>
-										<option value="Holy See (Vatican)">Holy See (Vatican)</option>
-										<option value="Honduras">Honduras</option>
-										<option value="Hong Kong, (China)">Hong Kong, (China)</option>
-										<option value="Hungary">Hungary</option>
-										<option value="Iceland">Iceland</option>
-										<option value="India">India</option>
-										<option value="Indonesia">Indonesia</option>
-										<option value="Iran, Islamic Republic of">Iran, Islamic Republic of</option>
-										<option value="Iraq">Iraq</option>
-										<option value="Ireland">Ireland</option>
-										<option value="Israel">Israel</option>
-										<option value="Italy">Italy</option>
-										<option value="Ivory Coast (Cote d'Ivoire)">Ivory Coast (Cote d'Ivoire)</option>
-										<option value="Jamaica">Jamaica</option>
-										<option value="Japan">Japan</option>
-										<option value="Jersey">Jersey</option>
-										<option value="Jordan">Jordan</option>
-										<option value="Kazakhstan">Kazakhstan</option>
-										<option value="Kenya">Kenya</option>
-										<option value="Kiribati">Kiribati</option>
-										<option value="Korea Dem. People's Rep.">Korea Dem. People's Rep.</option>
-										<option value="Korea, (South) Republic of">Korea, (South) Republic of</option>
-										<option value="Kosovo">Kosovo</option>
-										<option value="Kuwait">Kuwait</option>
-										<option value="Kyrgyzstan">Kyrgyzstan</option>
-										<option value="Lao People's Democ. Rep.">Lao People's Democ. Rep.</option>
-										<option value="Latvia">Latvia</option>
-										<option value="Lebanon">Lebanon</option>
-										<option value="Lesotho">Lesotho</option>
-										<option value="Liberia">Liberia</option>
-										<option value="Libyan Arab Jamahiriya">Libyan Arab Jamahiriya</option>
-										<option value="Liechtenstein">Liechtenstein</option>
-										<option value="Lithuania">Lithuania</option>
-										<option value="Luxembourg">Luxembourg</option>
-										<option value="Macao, (China)">Macao, (China)</option>
-										<option value="Macedonia, TFYR">Macedonia, TFYR</option>
-										<option value="Madagascar">Madagascar</option>
-										<option value="Malawi">Malawi</option>
-										<option value="Malaysia">Malaysia</option>
-										<option value="Maldives">Maldives</option>
-										<option value="Mali">Mali</option>
-										<option value="Malta">Malta</option>
-										<option value="Man, Isle of">Man, Isle of</option>
-										<option value="Marshall Islands">Marshall Islands</option>
-										<option value="Martinique (FR)">Martinique (FR)</option>
-										<option value="Mauritania">Mauritania</option>
-										<option value="Mauritius">Mauritius</option>
-										<option value="Mayotte (FR)">Mayotte (FR)</option>
-										<option value="Mexico">Mexico</option>
-										<option value="Micronesia, Fed. States of">Micronesia, Fed. States of</option>
-										<option value="Middle East">Middle East</option>
-										<option value="Moldova, Republic of">Moldova, Republic of</option>
-										<option value="Monaco">Monaco</option>
-										<option value="Mongolia">Mongolia</option>
-										<option value="Montenegro">Montenegro</option>
-										<option value="Montserrat">Montserrat</option>
-										<option value="Morocco">Morocco</option>
-										<option value="Mozambique">Mozambique</option>
-										<option value="Myanmar (ex-Burma)">Myanmar (ex-Burma)</option>
-										<option value="Namibia">Namibia</option>
-										<option value="Nauru">Nauru</option>
-										<option value="Nepal">Nepal</option>
-										<option value="Netherlands">Netherlands</option>
-										<option value="Netherlands Antilles">Netherlands Antilles</option>
-										<option value="New Caledonia">New Caledonia</option>
-										<option value="New Zealand">New Zealand</option>
-										<option value="Nicaragua">Nicaragua</option>
-										<option value="Niger">Niger</option>
-										<option value="Nigeria">Nigeria</option>
-										<option value="Niue">Niue</option>
-										<option value="Norfolk Island">Norfolk Island</option>
-										<option value="North America">North America</option>
-										<option value="Northern Mariana Islands">Northern Mariana Islands</option>
-										<option value="Norway">Norway</option>
-										<option value="Oceania">Oceania</option>
-										<option value="Oman">Oman</option>
-										<option value="Pakistan">Pakistan</option>
-										<option value="Palau">Palau</option>
-										<option value="Palestinian Territory">Palestinian Territory</option>
-										<option value="Panama">Panama</option>
-										<option value="Papua New Guinea">Papua New Guinea</option>
-										<option value="Paraguay">Paraguay</option>
-										<option value="Peru">Peru</option>
-										<option value="Philippines">Philippines</option>
-										<option value="Pitcairn Island">Pitcairn Island</option>
-										<option value="Poland">Poland</option>
-										<option value="Portugal">Portugal</option>
-										<option value="Puerto Rico">Puerto Rico</option>
-										<option value="Qatar">Qatar</option>
-										<option value="Reunion (FR)">Reunion (FR)</option>
-										<option value="Romania">Romania</option>
-										<option value="Russia (Russian Fed.)">Russia (Russian Fed.)</option>
-										<option value="Rwanda">Rwanda</option>
-										<option value="Sahara, Western">Sahara, Western</option>
-										<option value="Saint Barthelemy (FR)">Saint Barthelemy (FR)</option>
-										<option value="Saint Helena (UK)">Saint Helena (UK)</option>
-										<option value="Saint Kitts and Nevis">Saint Kitts and Nevis</option>
-										<option value="Saint Lucia">Saint Lucia</option>
-										<option value="Saint Martin (FR)">Saint Martin (FR)</option>
-										<option value="S Pierre &amp; Miquelon(FR)">S Pierre &amp; Miquelon(FR)</option>
-										<option value="S Vincent &amp; Grenadines">S Vincent &amp; Grenadines</option>
-										<option value="Samoa">Samoa</option>
-										<option value="San Marino">San Marino</option>
-										<option value="Sao Tome and Principe">Sao Tome and Principe</option>
-										<option value="Saudi Arabia">Saudi Arabia</option>
-										<option value="Senegal">Senegal</option>
-										<option value="Serbia">Serbia</option>
-										<option value="Seychelles">Seychelles</option>
-										<option value="Sierra Leone">Sierra Leone</option>
-										<option value="Singapore">Singapore</option>
-										<option value="Slovakia">Slovakia</option>
-										<option value="Slovenia">Slovenia</option>
-										<option value="Solomon Islands">Solomon Islands</option>
-										<option value="Somalia">Somalia</option>
-										<option value="South Africa">South Africa</option>
-										<option value="South America">South America</option>
-										<option value="S.George &amp; S.Sandwich">S.George &amp; S.Sandwich</option>
-										<option value="South Sudan">South Sudan</option>
-										<option value="Spain">Spain</option>
-										<option value="Sri Lanka (ex-Ceilan)">Sri Lanka (ex-Ceilan)</option>
-										<option value="Sudan">Sudan</option>
-										<option value="Suriname">Suriname</option>
-										<option value="Svalbard &amp; Jan Mayen Is.">Svalbard &amp; Jan Mayen Is.</option>
-										<option value="Swaziland">Swaziland</option>
-										<option value="Sweden">Sweden</option>
-										<option value="Switzerland">Switzerland</option>
-										<option value="Syrian Arab Republic">Syrian Arab Republic</option>
-										<option value="Taiwan">Taiwan</option>
-										<option value="Tajikistan">Tajikistan</option>
-										<option value="Tanzania, United Rep. of">Tanzania, United Rep. of</option>
-										<option value="Thailand">Thailand</option>
-										<option value="Timor-Leste (East Timor)">Timor-Leste (East Timor)</option>
-										<option value="Togo">Togo</option>
-										<option value="Tokelau">Tokelau</option>
-										<option value="Tonga">Tonga</option>
-										<option value="Trinidad &amp; Tobago">Trinidad &amp; Tobago</option>
-										<option value="Tunisia">Tunisia</option>
-										<option value="Turkey">Turkey</option>
-										<option value="Turkmenistan">Turkmenistan</option>
-										<option value="Turks and Caicos Is.">Turks and Caicos Is.</option>
-										<option value="Tuvalu">Tuvalu</option>
-										<option value="Uganda">Uganda</option>
-										<option value="Ukraine">Ukraine</option>
-										<option value="United Arab Emirates">United Arab Emirates</option>
-										<option value="United Kingdom">United Kingdom</option>
-										<option value="US Minor Outlying Isl.">US Minor Outlying Isl.</option>
-										<option value="Uruguay">Uruguay</option>
-										<option value="Uzbekistan">Uzbekistan</option>
-										<option value="Vanuatu">Vanuatu</option>
-										<option value="Vatican (Holy See)">Vatican (Holy See)</option>
-										<option value="Venezuela">Venezuela</option>
-										<option value="Viet Nam">Viet Nam</option>
-										<option value="Virgin Islands, British">Virgin Islands, British</option>
-										<option value="Virgin Islands, U.S.">Virgin Islands, U.S.</option>
-										<option value="Wallis and Futuna">Wallis and Futuna</option>
-										<option value="Western Sahara">Western Sahara</option>
-										<option value="Yemen">Yemen</option>
-										<option value="Zambia">Zambia</option>
-										<option value="Zimbabwe">Zimbabwe</option>
-									</select>
-									<div style="padding-top:10px;"></div>
-								</div>
-								<div class="controls">
-									<select name="about[company_size]" id="company_size" placeholder="{vtranslate('LBL_COMPANY_SIZE', $MODULE)}" style="width:250px;">
-										<option value=""></option><!-- to allow select2 pick placeholder -->
-										<option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
-										<option value="1">1</option>
-										<option value="2 - 3">2 - 3</option>
-										<option value="4 - 7">4 - 7</option>
-										<option value="8 - 15">8 - 15</option>
-										<option value="16 - 25">16 - 25</option>
-										<option value="26 - 50">26 - 50</option>
-										<option value="51 - 100">51 - 100</option>
-										<option value="101 - 250">101 - 250</option>
-										<option value="251 - 500">251 - 500</option>
-										<option value="501 +">501 +</option>
-									</select>
-									<div style="padding-top:10px;"></div>
-								</div>
-								<div class="controls">
-									<select name="about[company_job]" id="company_job" placeholder="{vtranslate('LBL_JOB_TITLE', $MODULE)}" style="width:250px;">
-										<option value=""></option><!-- to allow select2 pick placeholder -->
-										<option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
-										<option value="CEO/President">CEO/President</option>
-										<option value="Chief Officer">Chief Officer</option>
-										<option value="Vice President">Vice President</option>
-										<option value="Director">Director</option>
-										<option value="Manager">Manager</option>
-										<option value="Project Manager">Project Manager</option>
-										<option value="Specialist">Specialist</option>
-										<option value="Consultant">Consultant</option>
-										<option value="Employee">Employee</option>
-										<option value="Other">Other</option>
-									</select>
-									<div style="padding-top:10px;"></div>
-								</div>
-								<div class="controls">
-									<select name="about[department]" id="department" placeholder="{vtranslate('LBL_DEPARTMENT', $MODULE)}" style="width:250px;">
-										<option value=""></option><!-- to allow select2 pick placeholder -->
-										<option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
-										<option value="Administration">Administration</option>
-										<option value="Sales">Sales</option>
-										<option value="Marketing">Marketing</option>
-										<option value="Support/Customer Service">Support/Customer Service</option>
-										<option value="Information Technology">Information Technology</option>
-										<option value="Finance/Accounting">Finance/Accounting</option>
-										<option value="Business Development">Business Development</option>
-										<option value="Product Development">Product Development</option>
-										<option value="Professional Services">Professional Services</option>
-										<option value="Project Management">Project Management</option>
-										<option value="Other">Other</option>
-									</select>
-									<div style="padding-top:10px;"></div>
-								</div>
-							</div>
-							{/if}
-
-							<div class="span4">
-								<label class="control-label"><strong>Preferences</strong> <span class="muted">{vtranslate('LBL_ALL_FIELDS_BELOW_ARE_REQUIRED', $MODULE)}</label>
-
-								{if $IS_FIRST_USER}
-								<div class="controls" id="currency_name_controls">
-									<select name="currency_name" id="currency_name" placeholder="{vtranslate('LBL_BASE_CURRENCY', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_BASE_CURRENCY', $MODULE)}" class="validate[required]" style="width:250px;">
-										<option value=""></option>
+{*<!--
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+* ("License"); You may not use this file except in compliance with the License
+* The Original Code is:  vtiger CRM Open Source
+* The Initial Developer of the Original Code is vtiger.
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+*
+********************************************************************************/
+-->*}
+{strip}
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Vtiger</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+		<link REL="SHORTCUT ICON" HREF="layouts/vlayout/skins/images/favicon.ico">
+		<link rel="stylesheet" href="libraries/bootstrap/css/bootstrap.css" type="text/css" media="screen" />
+		<link rel="stylesheet" href="resources/styles.css" type="text/css" media="screen" />
+		<link rel="stylesheet" href="libraries/jquery/select2/select2.css" />
+		<link rel="stylesheet" href="libraries/jquery/posabsolute-jQuery-Validation-Engine/css/validationEngine.jquery.css" />
+
+		<script type="text/javascript" src="libraries/jquery/jquery.min.js"></script>
+		<script type="text/javascript" src="libraries/bootstrap/js/bootstrap-tooltip.js"></script>
+		<script type="text/javascript" src="libraries/jquery/select2/select2.min.js"></script>
+		<script type="text/javascript" src="libraries/jquery/posabsolute-jQuery-Validation-Engine/js/jquery.validationEngine.js" ></script>
+		<script type="text/javascript" src="libraries/jquery/posabsolute-jQuery-Validation-Engine/js/jquery.validationEngine-en.js" ></script>
+
+		<script type="text/javascript">{literal}
+			jQuery(function(){
+				jQuery('select').select2({blurOnChange:true});
+				jQuery('[rel="tooltip"]').tooltip();
+				jQuery('form').validationEngine({
+					prettySelect: true,
+					usePrefix: 's2id_',
+					autoPositionUpdate: true,
+					promptPosition : "topLeft",
+					showOneMessage: true
+				});
+				jQuery('#currency_name_controls').mouseenter(function() {
+					jQuery('#currency_name_tooltip').tooltip('show');
+				});
+				jQuery('#currency_name_controls').mouseleave(function() {
+					jQuery('#currency_name_tooltip').tooltip('hide');
+				});
+			});
+		{/literal}</script>
+		<style type="text/css">{literal}
+			 body { background: #ffffff url('layouts/vlayout/skins/images/usersetupbg.png') no-repeat center top; background-size: 100%; font-size: 14px; }
+			.modal-backdrop { opacity: 0.35; }
+			.tooltip { z-index: 1055; }
+			input, select, textarea { font-size: 14px; }
+		{/literal}</style>
+	</head>
+	<body>
+
+		<div class="container">
+			<div class="modal-backdrop"></div>
+			<form class="form" method="POST" action="index.php?module=Users&action=UserSetupSave">
+				<div class="modal" {if false && $IS_FIRST_USER}style="width: 700px;"{/if}> {* FirstUser information gather - paused *}
+					<div class="modal-header">
+						<h3>{vtranslate('LBL_ALMOST_THERE', $MODULE)}</h3>
+					</div>
+					<div class="modal-body">
+						<div class="row">
+							{if false && $IS_FIRST_USER} {* FirstUser information gather - paused *}
+							<div class="span4">
+								<label class="control-label"><strong>{vtranslate('LBL_ABOUT_ME', $MODULE)}</strong> <span class="muted">{vtranslate('LBL_WE_PROMISE_TO_KEEP_THIS_PRIVATE', $MODULE)}</span></label>
+								<div class="controls">
+									<input type="text" name="about[phone]" id="phone" placeholder="{vtranslate('LBL_PHONE', $MODULE)}" rel="tooltip" title="{vtranslate('LBL_YOUR_CONTACT_NUMBER', $MODULE)}" style="width:250px;">
+								</div>
+								<div class="controls">
+									<select name="about[country]" id="country" placeholder="{vtranslate('LBL_SELECT_COUNTRY', $MODULE)}" rel="tooltip" title="{vtranslate('LBL_WHERE_ARE_YOU_FROM', $MODULE)}" style="width:250px;">
+										<option value=""></option><!-- to allow select2 pick placeholder -->
+										<option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
+										<option value="United States">United States</option>
+										<option value="Afghanistan">Afghanistan</option>
+										<option value="Africa">Africa</option>
+										<option value="Albania">Albania</option>
+										<option value="Algeria">Algeria</option>
+										<option value="American Samoa">American Samoa</option>
+										<option value="Andorra">Andorra</option>
+										<option value="Angola">Angola</option>
+										<option value="Anguilla">Anguilla</option>
+										<option value="Antarctica">Antarctica</option>
+										<option value="Antigua &amp; Barbuda">Antigua &amp; Barbuda</option>
+										<option value="Antilles, Netherlands">Antilles, Netherlands</option>
+										<option value="Arabia, Saudi">Arabia, Saudi</option>
+										<option value="Argentina">Argentina</option>
+										<option value="Armenia">Armenia</option>
+										<option value="Aruba">Aruba</option>
+										<option value="Asia">Asia</option>
+										<option value="Australia">Australia</option>
+										<option value="Austria">Austria</option>
+										<option value="Azerbaijan">Azerbaijan</option>
+										<option value="Bahamas, The">Bahamas, The</option>
+										<option value="Bahrain">Bahrain</option>
+										<option value="Bangladesh">Bangladesh</option>
+										<option value="Barbados">Barbados</option>
+										<option value="Belarus">Belarus</option>
+										<option value="Belgium">Belgium</option>
+										<option value="Belize">Belize</option>
+										<option value="Benin">Benin</option>
+										<option value="Bermuda">Bermuda</option>
+										<option value="Bhutan">Bhutan</option>
+										<option value="Bolivia">Bolivia</option>
+										<option value="Bosnia and Herzegovina">Bosnia and Herzegovina</option>
+										<option value="Botswana">Botswana</option>
+										<option value="Bouvet Island">Bouvet Island</option>
+										<option value="Brazil">Brazil</option>
+										<option value="British Indian Ocean T.">British Indian Ocean T.</option>
+										<option value="British Virgin Islands">British Virgin Islands</option>
+										<option value="Brunei Darussalam">Brunei Darussalam</option>
+										<option value="Bulgaria">Bulgaria</option>
+										<option value="Burkina Faso">Burkina Faso</option>
+										<option value="Burundi">Burundi</option>
+										<option value="Cambodia">Cambodia</option>
+										<option value="Cameroon">Cameroon</option>
+										<option value="Canada">Canada</option>
+										<option value="Cape Verde">Cape Verde</option>
+										<option value="Caribbean, the">Caribbean, the</option>
+										<option value="Cayman Islands">Cayman Islands</option>
+										<option value="Central African Republic">Central African Republic</option>
+										<option value="Central America">Central America</option>
+										<option value="Chad">Chad</option>
+										<option value="Chile">Chile</option>
+										<option value="China">China</option>
+										<option value="Christmas Island">Christmas Island</option>
+										<option value="Cocos (Keeling) Islands">Cocos (Keeling) Islands</option>
+										<option value="Colombia">Colombia</option>
+										<option value="Comoros">Comoros</option>
+										<option value="Congo">Congo</option>
+										<option value="Congo, Dem. Rep. of the">Congo, Dem. Rep. of the</option>
+										<option value="Cook Islands">Cook Islands</option>
+										<option value="Costa Rica">Costa Rica</option>
+										<option value="Cote D'Ivoire">Cote D'Ivoire</option>
+										<option value="Croatia">Croatia</option>
+										<option value="Cuba">Cuba</option>
+										<option value="Cyprus">Cyprus</option>
+										<option value="Czech Republic">Czech Republic</option>
+										<option value="Denmark">Denmark</option>
+										<option value="Djibouti">Djibouti</option>
+										<option value="Dominica">Dominica</option>
+										<option value="Dominican Republic">Dominican Republic</option>
+										<option value="East Timor (Timor-Leste)">East Timor (Timor-Leste)</option>
+										<option value="Ecuador">Ecuador</option>
+										<option value="Egypt">Egypt</option>
+										<option value="El Salvador">El Salvador</option>
+										<option value="Equatorial Guinea">Equatorial Guinea</option>
+										<option value="Eritrea">Eritrea</option>
+										<option value="Estonia">Estonia</option>
+										<option value="Ethiopia">Ethiopia</option>
+										<option value="Europe">Europe</option>
+										<option value="European Union">European Union</option>
+										<option value="Falkland Islands (Malvinas)">Falkland Islands (Malvinas)</option>
+										<option value="Faroe Islands">Faroe Islands</option>
+										<option value="Fiji">Fiji</option>
+										<option value="Finland">Finland</option>
+										<option value="France">France</option>
+										<option value="French Guiana">French Guiana</option>
+										<option value="French Polynesia">French Polynesia</option>
+										<option value="French Southern Terr.">French Southern Terr.</option>
+										<option value="Gabon">Gabon</option>
+										<option value="Gambia, the">Gambia, the</option>
+										<option value="Georgia">Georgia</option>
+										<option value="Germany">Germany</option>
+										<option value="Ghana">Ghana</option>
+										<option value="Gibraltar">Gibraltar</option>
+										<option value="Greece">Greece</option>
+										<option value="Greenland">Greenland</option>
+										<option value="Grenada">Grenada</option>
+										<option value="Guadeloupe">Guadeloupe</option>
+										<option value="Guam">Guam</option>
+										<option value="Guatemala">Guatemala</option>
+										<option value="Guernsey and Alderney">Guernsey and Alderney</option>
+										<option value="Guiana, French">Guiana, French</option>
+										<option value="Guinea">Guinea</option>
+										<option value="Guinea-Bissau">Guinea-Bissau</option>
+										<option value="Guinea, Equatorial">Guinea, Equatorial</option>
+										<option value="Guyana">Guyana</option>
+										<option value="Haiti">Haiti</option>
+										<option value="Heard &amp; McDonald Is.(AU)">Heard &amp; McDonald Is.(AU)</option>
+										<option value="Holy See (Vatican)">Holy See (Vatican)</option>
+										<option value="Honduras">Honduras</option>
+										<option value="Hong Kong, (China)">Hong Kong, (China)</option>
+										<option value="Hungary">Hungary</option>
+										<option value="Iceland">Iceland</option>
+										<option value="India">India</option>
+										<option value="Indonesia">Indonesia</option>
+										<option value="Iran, Islamic Republic of">Iran, Islamic Republic of</option>
+										<option value="Iraq">Iraq</option>
+										<option value="Ireland">Ireland</option>
+										<option value="Israel">Israel</option>
+										<option value="Italy">Italy</option>
+										<option value="Ivory Coast (Cote d'Ivoire)">Ivory Coast (Cote d'Ivoire)</option>
+										<option value="Jamaica">Jamaica</option>
+										<option value="Japan">Japan</option>
+										<option value="Jersey">Jersey</option>
+										<option value="Jordan">Jordan</option>
+										<option value="Kazakhstan">Kazakhstan</option>
+										<option value="Kenya">Kenya</option>
+										<option value="Kiribati">Kiribati</option>
+										<option value="Korea Dem. People's Rep.">Korea Dem. People's Rep.</option>
+										<option value="Korea, (South) Republic of">Korea, (South) Republic of</option>
+										<option value="Kosovo">Kosovo</option>
+										<option value="Kuwait">Kuwait</option>
+										<option value="Kyrgyzstan">Kyrgyzstan</option>
+										<option value="Lao People's Democ. Rep.">Lao People's Democ. Rep.</option>
+										<option value="Latvia">Latvia</option>
+										<option value="Lebanon">Lebanon</option>
+										<option value="Lesotho">Lesotho</option>
+										<option value="Liberia">Liberia</option>
+										<option value="Libyan Arab Jamahiriya">Libyan Arab Jamahiriya</option>
+										<option value="Liechtenstein">Liechtenstein</option>
+										<option value="Lithuania">Lithuania</option>
+										<option value="Luxembourg">Luxembourg</option>
+										<option value="Macao, (China)">Macao, (China)</option>
+										<option value="Macedonia, TFYR">Macedonia, TFYR</option>
+										<option value="Madagascar">Madagascar</option>
+										<option value="Malawi">Malawi</option>
+										<option value="Malaysia">Malaysia</option>
+										<option value="Maldives">Maldives</option>
+										<option value="Mali">Mali</option>
+										<option value="Malta">Malta</option>
+										<option value="Man, Isle of">Man, Isle of</option>
+										<option value="Marshall Islands">Marshall Islands</option>
+										<option value="Martinique (FR)">Martinique (FR)</option>
+										<option value="Mauritania">Mauritania</option>
+										<option value="Mauritius">Mauritius</option>
+										<option value="Mayotte (FR)">Mayotte (FR)</option>
+										<option value="Mexico">Mexico</option>
+										<option value="Micronesia, Fed. States of">Micronesia, Fed. States of</option>
+										<option value="Middle East">Middle East</option>
+										<option value="Moldova, Republic of">Moldova, Republic of</option>
+										<option value="Monaco">Monaco</option>
+										<option value="Mongolia">Mongolia</option>
+										<option value="Montenegro">Montenegro</option>
+										<option value="Montserrat">Montserrat</option>
+										<option value="Morocco">Morocco</option>
+										<option value="Mozambique">Mozambique</option>
+										<option value="Myanmar (ex-Burma)">Myanmar (ex-Burma)</option>
+										<option value="Namibia">Namibia</option>
+										<option value="Nauru">Nauru</option>
+										<option value="Nepal">Nepal</option>
+										<option value="Netherlands">Netherlands</option>
+										<option value="Netherlands Antilles">Netherlands Antilles</option>
+										<option value="New Caledonia">New Caledonia</option>
+										<option value="New Zealand">New Zealand</option>
+										<option value="Nicaragua">Nicaragua</option>
+										<option value="Niger">Niger</option>
+										<option value="Nigeria">Nigeria</option>
+										<option value="Niue">Niue</option>
+										<option value="Norfolk Island">Norfolk Island</option>
+										<option value="North America">North America</option>
+										<option value="Northern Mariana Islands">Northern Mariana Islands</option>
+										<option value="Norway">Norway</option>
+										<option value="Oceania">Oceania</option>
+										<option value="Oman">Oman</option>
+										<option value="Pakistan">Pakistan</option>
+										<option value="Palau">Palau</option>
+										<option value="Palestinian Territory">Palestinian Territory</option>
+										<option value="Panama">Panama</option>
+										<option value="Papua New Guinea">Papua New Guinea</option>
+										<option value="Paraguay">Paraguay</option>
+										<option value="Peru">Peru</option>
+										<option value="Philippines">Philippines</option>
+										<option value="Pitcairn Island">Pitcairn Island</option>
+										<option value="Poland">Poland</option>
+										<option value="Portugal">Portugal</option>
+										<option value="Puerto Rico">Puerto Rico</option>
+										<option value="Qatar">Qatar</option>
+										<option value="Reunion (FR)">Reunion (FR)</option>
+										<option value="Romania">Romania</option>
+										<option value="Russia (Russian Fed.)">Russia (Russian Fed.)</option>
+										<option value="Rwanda">Rwanda</option>
+										<option value="Sahara, Western">Sahara, Western</option>
+										<option value="Saint Barthelemy (FR)">Saint Barthelemy (FR)</option>
+										<option value="Saint Helena (UK)">Saint Helena (UK)</option>
+										<option value="Saint Kitts and Nevis">Saint Kitts and Nevis</option>
+										<option value="Saint Lucia">Saint Lucia</option>
+										<option value="Saint Martin (FR)">Saint Martin (FR)</option>
+										<option value="S Pierre &amp; Miquelon(FR)">S Pierre &amp; Miquelon(FR)</option>
+										<option value="S Vincent &amp; Grenadines">S Vincent &amp; Grenadines</option>
+										<option value="Samoa">Samoa</option>
+										<option value="San Marino">San Marino</option>
+										<option value="Sao Tome and Principe">Sao Tome and Principe</option>
+										<option value="Saudi Arabia">Saudi Arabia</option>
+										<option value="Senegal">Senegal</option>
+										<option value="Serbia">Serbia</option>
+										<option value="Seychelles">Seychelles</option>
+										<option value="Sierra Leone">Sierra Leone</option>
+										<option value="Singapore">Singapore</option>
+										<option value="Slovakia">Slovakia</option>
+										<option value="Slovenia">Slovenia</option>
+										<option value="Solomon Islands">Solomon Islands</option>
+										<option value="Somalia">Somalia</option>
+										<option value="South Africa">South Africa</option>
+										<option value="South America">South America</option>
+										<option value="S.George &amp; S.Sandwich">S.George &amp; S.Sandwich</option>
+										<option value="South Sudan">South Sudan</option>
+										<option value="Spain">Spain</option>
+										<option value="Sri Lanka (ex-Ceilan)">Sri Lanka (ex-Ceilan)</option>
+										<option value="Sudan">Sudan</option>
+										<option value="Suriname">Suriname</option>
+										<option value="Svalbard &amp; Jan Mayen Is.">Svalbard &amp; Jan Mayen Is.</option>
+										<option value="Swaziland">Swaziland</option>
+										<option value="Sweden">Sweden</option>
+										<option value="Switzerland">Switzerland</option>
+										<option value="Syrian Arab Republic">Syrian Arab Republic</option>
+										<option value="Taiwan">Taiwan</option>
+										<option value="Tajikistan">Tajikistan</option>
+										<option value="Tanzania, United Rep. of">Tanzania, United Rep. of</option>
+										<option value="Thailand">Thailand</option>
+										<option value="Timor-Leste (East Timor)">Timor-Leste (East Timor)</option>
+										<option value="Togo">Togo</option>
+										<option value="Tokelau">Tokelau</option>
+										<option value="Tonga">Tonga</option>
+										<option value="Trinidad &amp; Tobago">Trinidad &amp; Tobago</option>
+										<option value="Tunisia">Tunisia</option>
+										<option value="Turkey">Turkey</option>
+										<option value="Turkmenistan">Turkmenistan</option>
+										<option value="Turks and Caicos Is.">Turks and Caicos Is.</option>
+										<option value="Tuvalu">Tuvalu</option>
+										<option value="Uganda">Uganda</option>
+										<option value="Ukraine">Ukraine</option>
+										<option value="United Arab Emirates">United Arab Emirates</option>
+										<option value="United Kingdom">United Kingdom</option>
+										<option value="US Minor Outlying Isl.">US Minor Outlying Isl.</option>
+										<option value="Uruguay">Uruguay</option>
+										<option value="Uzbekistan">Uzbekistan</option>
+										<option value="Vanuatu">Vanuatu</option>
+										<option value="Vatican (Holy See)">Vatican (Holy See)</option>
+										<option value="Venezuela">Venezuela</option>
+										<option value="Viet Nam">Viet Nam</option>
+										<option value="Virgin Islands, British">Virgin Islands, British</option>
+										<option value="Virgin Islands, U.S.">Virgin Islands, U.S.</option>
+										<option value="Wallis and Futuna">Wallis and Futuna</option>
+										<option value="Western Sahara">Western Sahara</option>
+										<option value="Yemen">Yemen</option>
+										<option value="Zambia">Zambia</option>
+										<option value="Zimbabwe">Zimbabwe</option>
+									</select>
+									<div style="padding-top:10px;"></div>
+								</div>
+								<div class="controls">
+									<select name="about[company_size]" id="company_size" placeholder="{vtranslate('LBL_COMPANY_SIZE', $MODULE)}" style="width:250px;">
+										<option value=""></option><!-- to allow select2 pick placeholder -->
+										<option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
+										<option value="1">1</option>
+										<option value="2 - 3">2 - 3</option>
+										<option value="4 - 7">4 - 7</option>
+										<option value="8 - 15">8 - 15</option>
+										<option value="16 - 25">16 - 25</option>
+										<option value="26 - 50">26 - 50</option>
+										<option value="51 - 100">51 - 100</option>
+										<option value="101 - 250">101 - 250</option>
+										<option value="251 - 500">251 - 500</option>
+										<option value="501 +">501 +</option>
+									</select>
+									<div style="padding-top:10px;"></div>
+								</div>
+								<div class="controls">
+									<select name="about[company_job]" id="company_job" placeholder="{vtranslate('LBL_JOB_TITLE', $MODULE)}" style="width:250px;">
+										<option value=""></option><!-- to allow select2 pick placeholder -->
+										<option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
+										<option value="CEO/President">CEO/President</option>
+										<option value="Chief Officer">Chief Officer</option>
+										<option value="Vice President">Vice President</option>
+										<option value="Director">Director</option>
+										<option value="Manager">Manager</option>
+										<option value="Project Manager">Project Manager</option>
+										<option value="Specialist">Specialist</option>
+										<option value="Consultant">Consultant</option>
+										<option value="Employee">Employee</option>
+										<option value="Other">Other</option>
+									</select>
+									<div style="padding-top:10px;"></div>
+								</div>
+								<div class="controls">
+									<select name="about[department]" id="department" placeholder="{vtranslate('LBL_DEPARTMENT', $MODULE)}" style="width:250px;">
+										<option value=""></option><!-- to allow select2 pick placeholder -->
+										<option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
+										<option value="Administration">Administration</option>
+										<option value="Sales">Sales</option>
+										<option value="Marketing">Marketing</option>
+										<option value="Support/Customer Service">Support/Customer Service</option>
+										<option value="Information Technology">Information Technology</option>
+										<option value="Finance/Accounting">Finance/Accounting</option>
+										<option value="Business Development">Business Development</option>
+										<option value="Product Development">Product Development</option>
+										<option value="Professional Services">Professional Services</option>
+										<option value="Project Management">Project Management</option>
+										<option value="Other">Other</option>
+									</select>
+									<div style="padding-top:10px;"></div>
+								</div>
+							</div>
+							{/if}
+
+							<div class="span4">
+								<label class="control-label"><strong>{vtranslate('Preferences', $MODULE)}</strong> <span class="muted">{vtranslate('LBL_ALL_FIELDS_BELOW_ARE_REQUIRED', $MODULE)}</label>
+
+								{if $IS_FIRST_USER}
+								<div class="controls" id="currency_name_controls">
+									<select name="currency_name" id="currency_name" placeholder="{vtranslate('LBL_BASE_CURRENCY', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_BASE_CURRENCY', $MODULE)}" class="validate[required]" style="width:250px;">
+										<option value=""></option>
 										{foreach key=header item=currency from=$CURRENCIES}
-										<!--Open source fix to select user preferred currency during installation -->
-											<option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('currency_name')}selected{/if}>{$header|@getTranslatedCurrencyString}({$currency.1})</option> 
-										{/foreach}
-									</select>
-									&nbsp;
-									<span rel="tooltip" title="{vtranslate('LBL_OPERATING_CURRENCY', $MODULE)}" id="currency_name_tooltip" class="icon-info-sign"></span>
-									<div style="padding-top:10px;"></div>
-								</div>
-								{/if}
-
-								<div class="controls">
-									<select name="lang_name" id="lang_name" style="width:250px;" placeholder="{vtranslate('LBL_LANGUAGE', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_LANGUAGE', $MODULE)}" class="validate[required]">
-										<option value=""></option>
-										{foreach key=header item=language from=$LANGUAGES}
-												<option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('language')}selected{/if}>{$language|@getTranslatedString:$MODULE}</option>
-										{/foreach}
-									</select>
-									<div style="padding-top:10px;"></div>
-								</div>
-								<div class="controls">
-									<select name="time_zone" id="time_zone" style="width:250px;" placeholder="{vtranslate('LBL_CHOOSE_TIMEZONE', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_TIMEZONE', $MODULE)}" class="validate[required]">
-										<option value=""></option>
-										{foreach key=header item=time_zone from=$TIME_ZONES}
-												<option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('time_zone')}selected{/if}>{$time_zone|@getTranslatedString:$MODULE}</option>
-										{/foreach}
-									</select>
-									<div style="padding-top:10px;"></div>
-								</div>
-								<div class="controls">
-									<select name="date_format" id="date_format" style="width:250px;" placeholder="{vtranslate('LBL_DATE_FORMAT', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_DATE_FORMAT', $MODULE)}" class="validate[required]">
-										<option value=""></option>
-										<option value="dd-mm-yyyy" {if $CURRENT_USER_MODEL->get('date_format') eq "dd-mm-yyyy"} selected{/if}>dd-mm-yyyy</option>
-										<option value="mm-dd-yyyy" {if $CURRENT_USER_MODEL->get('date_format') eq "mm-dd-yyyy"} selected{/if}>mm-dd-yyyy</option>
-										<option value="yyyy-mm-dd" {if $CURRENT_USER_MODEL->get('date_format') eq "yyyy-mm-dd"} selected{/if}>yyyy-mm-dd</option>
-									</select>
-									<div style="padding-top:10px;"></div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="modal-footer">
-						<button class="btn btn-success" type="submit">{vtranslate('LBL_GET_STARTED', $MODULE)}</button>
-					</div>
-				</div>
-			</form>
-		</div>
-
-	</body>
-</html>
-{/strip}
+										<!--Open source fix to select user preferred currency during installation -->
+											<option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('currency_name')}selected{/if}>{$header|@getTranslatedCurrencyString}({$currency.1})</option> 
+										{/foreach}
+									</select>
+									&nbsp;
+									<span rel="tooltip" title="{vtranslate('LBL_OPERATING_CURRENCY', $MODULE)}" id="currency_name_tooltip" class="icon-info-sign"></span>
+									<div style="padding-top:10px;"></div>
+								</div>
+								{/if}
+
+								<div class="controls">
+									<select name="lang_name" id="lang_name" style="width:250px;" placeholder="{vtranslate('LBL_LANGUAGE', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_LANGUAGE', $MODULE)}" class="validate[required]">
+										<option value=""></option>
+										{foreach key=header item=language from=$LANGUAGES}
+												<option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('language')}selected{/if}>{$language|@getTranslatedString:$MODULE}</option>
+										{/foreach}
+									</select>
+									<div style="padding-top:10px;"></div>
+								</div>
+								<div class="controls">
+									<select name="time_zone" id="time_zone" style="width:250px;" placeholder="{vtranslate('LBL_CHOOSE_TIMEZONE', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_TIMEZONE', $MODULE)}" class="validate[required]">
+										<option value=""></option>
+										{foreach key=header item=time_zone from=$TIME_ZONES}
+												<option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('time_zone')}selected{/if}>{$time_zone|@getTranslatedString:$MODULE}</option>
+										{/foreach}
+									</select>
+									<div style="padding-top:10px;"></div>
+								</div>
+								<div class="controls">
+									<select name="date_format" id="date_format" style="width:250px;" placeholder="{vtranslate('LBL_DATE_FORMAT', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_DATE_FORMAT', $MODULE)}" class="validate[required]">
+										<option value=""></option>
+										<option value="dd-mm-yyyy" {if $CURRENT_USER_MODEL->get('date_format') eq "dd-mm-yyyy"} selected{/if}>dd-mm-yyyy</option>
+										<option value="mm-dd-yyyy" {if $CURRENT_USER_MODEL->get('date_format') eq "mm-dd-yyyy"} selected{/if}>mm-dd-yyyy</option>
+										<option value="yyyy-mm-dd" {if $CURRENT_USER_MODEL->get('date_format') eq "yyyy-mm-dd"} selected{/if}>yyyy-mm-dd</option>
+									</select>
+									<div style="padding-top:10px;"></div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="modal-footer">
+						<button class="btn btn-success" type="submit">{vtranslate('LBL_GET_STARTED', $MODULE)}</button>
+					</div>
+				</div>
+			</form>
+		</div>
+
+	</body>
+</html>
+{/strip}
diff --git a/layouts/vlayout/modules/Vtiger/MenuBar.tpl b/layouts/vlayout/modules/Vtiger/MenuBar.tpl
index cbce281797c407ec58c09ad628a3f0dc7701c97e..2fdfcdc5ae98c8713b48380fb5feb5958c5436bb 100644
--- a/layouts/vlayout/modules/Vtiger/MenuBar.tpl
+++ b/layouts/vlayout/modules/Vtiger/MenuBar.tpl
@@ -128,7 +128,7 @@
 					<span id="headerLinksBig" class="pull-right headerLinksContainer">
 						<span class="dropdown span settingIcons">
 							<a class="dropdown-toggle" data-toggle="dropdown" href="#">
-								<img src="{vimage_path('theme_brush.png')}" alt="theme roller" title="Theme Roller" />
+								<img src="{vimage_path('theme_brush.png')}" alt="theme roller" title="{vtranslate('Theme Roller',$MODULE)}" />
 							</a>
 							<ul class="dropdown-menu themeMenuContainer">
 								<div id="themeContainer">
diff --git a/layouts/vlayout/modules/Vtiger/MergeRecords.tpl b/layouts/vlayout/modules/Vtiger/MergeRecords.tpl
index 0b94f7747d8ba42f5b2bce115fcea5ede231c7f3..d9d2ae3d1341a8cfa5a47324048ccfeab5a6b437 100644
--- a/layouts/vlayout/modules/Vtiger/MergeRecords.tpl
+++ b/layouts/vlayout/modules/Vtiger/MergeRecords.tpl
@@ -13,7 +13,7 @@
 <div style='background: white;'>
 	<div>
 		<br>
-		<div style='margin-left:10px'><h3>{vtranslate('LBL_MERGE_RECORDS_IN', $MODULE)} > {$MODULE}</h3></div><br>
+		<div style='margin-left:10px'><h3>{vtranslate('LBL_MERGE_RECORDS_IN', $MODULE)} > {vtranslate($MODULE, $MODULE)}</h3></div><br>
 		<div class='alert-info'>{vtranslate('LBL_MERGE_RECORDS_DESCRIPTION', $MODULE)}</div>
 	</div>
 
diff --git a/layouts/vlayout/modules/Vtiger/RecordNamesList.tpl b/layouts/vlayout/modules/Vtiger/RecordNamesList.tpl
index ec395996437592bc8e5a2270574202e15952b1c7..6009445d954855cdbd02fde564475951c6deb231 100644
--- a/layouts/vlayout/modules/Vtiger/RecordNamesList.tpl
+++ b/layouts/vlayout/modules/Vtiger/RecordNamesList.tpl
@@ -16,7 +16,7 @@
 			<ul class="nav nav-list">
 				{foreach item=recordsModel from=$RECORDS}
 				<li>
-					<a data-id={$recordsModel->getId()} href="{$recordsModel->getDetailViewUrl()}" title="{decode_html($recordsModel->getName())}">{decode_html($recordsModel->getName())}</a>
+					<a data-id={$recordsModel->getId()} href="{$recordsModel->getDetailViewUrl()}" title="{decode_html($recordsModel->getName())}">{vtranslate(decode_html($recordsModel->getName()), $MODULE)}</a>
 				</li>
 				{foreachelse}
 					<li style="text-align:center">{vtranslate('LBL_NO_RECORDS', $MODULE)}
diff --git a/layouts/vlayout/modules/Vtiger/dashboards/MiniListWizard.tpl b/layouts/vlayout/modules/Vtiger/dashboards/MiniListWizard.tpl
index 679ff6b9aa2a87b4703a9febda83a1da4d44014e..671b93377186ba95057a2df03130459666c37925 100644
--- a/layouts/vlayout/modules/Vtiger/dashboards/MiniListWizard.tpl
+++ b/layouts/vlayout/modules/Vtiger/dashboards/MiniListWizard.tpl
@@ -57,9 +57,9 @@
 {elseif $WIZARD_STEP eq 'step2'}
 	<option></option>
 	{foreach from=$ALLFILTERS item=FILTERS key=FILTERGROUP}
-		<optgroup label="{$FILTERGROUP}">
+		<optgroup label="{vtranslate($FILTERGROUP)}">
 			{foreach from=$FILTERS item=FILTER key=FILTERNAME}
-				<option value="{$FILTER->getId()}">{$FILTER->get('viewname')}</option>
+				<option value="{$FILTER->getId()}">{vtranslate($FILTER->get('viewname'))}</option>
 			{/foreach}
 		</optgroup>
 	{/foreach}
diff --git a/layouts/vlayout/modules/Vtiger/uitypes/Image.tpl b/layouts/vlayout/modules/Vtiger/uitypes/Image.tpl
index 838cbf3b4c6d1f20a28667385bd97aea46d15804..fa3de99f5432c6c883fdf13ec84f1c98ce24fa40 100644
--- a/layouts/vlayout/modules/Vtiger/uitypes/Image.tpl
+++ b/layouts/vlayout/modules/Vtiger/uitypes/Image.tpl
@@ -26,7 +26,7 @@
 				<span class="span8" name="existingImages"><img src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" data-image-id="{$IMAGE_INFO.id}"></span>
 				<span class="span3 row-fluid">
 					<span class="row-fluid">[{$IMAGE_INFO.name}]</span>
-					<span class="row-fluid"><input type="button" id="file_{$ITER}" value="Delete" class="imageDelete"></span>
+					<span class="row-fluid"><input type="button" id="file_{$ITER}" value={vtranslate("LBL_DELETE")} class="imageDelete"></span>
 				</span>
 			{/if}
 		</div>
diff --git a/layouts/vlayout/modules/Vtiger/uitypes/StringDetailView.tpl b/layouts/vlayout/modules/Vtiger/uitypes/StringDetailView.tpl
index 89c4de2c2b213a5fb06604edba4910654ee3bea3..49933b27df4dee36a8b65e1cef794c1b61df3238 100644
--- a/layouts/vlayout/modules/Vtiger/uitypes/StringDetailView.tpl
+++ b/layouts/vlayout/modules/Vtiger/uitypes/StringDetailView.tpl
@@ -12,4 +12,4 @@
 
 {* TODO: Review the order of parameters - good to eliminate $RECORD->getId, $RECORD should be used *}
 
-{$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD)}
\ No newline at end of file
+{vtranslate($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD), $MODULE_NAME)}
\ No newline at end of file