diff --git a/public/modules/forms/admin/config/i18n/english.js b/public/modules/forms/admin/config/i18n/english.js
index 0f929720..fa778cd2 100644
--- a/public/modules/forms/admin/config/i18n/english.js
+++ b/public/modules/forms/admin/config/i18n/english.js
@@ -21,6 +21,10 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		CREATE_A_NEW_FORM: 'Create a new form',
 		CREATE_FORM: 'Create form',
 		CREATED_ON: 'Created on',
+		MY_FORMS: 'My forms',
+		NAME: 'Name',
+		LANGUAGE: 'Language',
+		FORM_PAUSED: 'Form paused',
 
 		//Edit Field Modal
 		EDIT_FIELD: 'Edit this Field',
@@ -46,6 +50,11 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		VIEW: 'View',
 		LIVE: 'Live',
 		PREVIEW: 'Preview',
+		COPY: 'Copy',
+		COPY_AND_PASTE: 'Copy and Paste this to add your TellForm to your website',
+		CHANGE_WIDTH_AND_HEIGHT: 'Change the width and height values to suit you best',
+		POWERED_BY: 'Powered by',
+		TELLFORM_URL: 'Your TellForm is permanently at this URL',
 
 		//Edit Form View
 		DISABLED: 'Disabled',
@@ -76,6 +85,21 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		ADD_OPTION: 'Add Option',
 		NUM_OF_STEPS: 'Number of Steps',
 		CLICK_FIELDS_FOOTER: 'Click on fields to add them here',
+		SHAPE: 'Shape',
+		IF_THIS_FIELD: 'If this field',
+		IS_EQUAL_TO: 'is equal to',
+		IS_NOT_EQUAL_TO: 'is not equal to',
+		IS_GREATER_THAN: 'is greater than',
+		IS_GREATER_OR_EQUAL_THAN: 'is greater or equal than',
+		IS_SMALLER_THAN: 'is_smaller_than',
+		IS_SMALLER_OR_EQUAL_THAN: 'is smaller or equal than',
+		CONTAINS: 'contains',
+		DOES_NOT_CONTAINS: 'does not contain',
+		ENDS_WITH: 'ends with',
+		DOES_NOT_END_WITH: 'does not end with',
+		STARTS_WITH: 'starts with',
+		DOES_NOT_START_WITH: 'does not start with',
+		THEN_JUMP_TO: 'then jump to',
 
 		//Edit Submissions View
 		TOTAL_VIEWS: 'total unique visits',
diff --git a/public/modules/forms/admin/config/i18n/spanish.js b/public/modules/forms/admin/config/i18n/spanish.js
index a3bd2462..06dbd9ea 100644
--- a/public/modules/forms/admin/config/i18n/spanish.js
+++ b/public/modules/forms/admin/config/i18n/spanish.js
@@ -8,7 +8,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		ADVANCED_SETTINGS: 'Configuraciones avanzadas',
 		FORM_NAME: 'Nombre del formulario',
 		FORM_STATUS: 'Estado del formulario',
-		PUBLIC: 'Publico',
+		PUBLIC: 'Público',
 		PRIVATE: 'Privado',
 		GA_TRACKING_CODE: 'Código de Google Analytics',
 		DISPLAY_FOOTER: '¿Mostrar pie de página?',
@@ -18,9 +18,13 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		DISPLAY_END_PAGE: '¿Mostrar paǵina de fin?',
 
 		//List Forms View
-		CREATE_A_NEW_FORM: 'Crear un formulario nuevo',
+		CREATE_A_NEW_FORM: 'Crear formulario',
 		CREATE_FORM: 'Crear formulario',
 		CREATED_ON: 'Creado en',
+		MY_FORMS: 'Mis formularios',
+		NAME: 'Nombre',
+		LANGUAGE: 'Idioma',
+		FORM_PAUSED: 'Formulario pausado',
 
 		//Edit Field Modal
 		EDIT_FIELD: 'Editar este campo',
@@ -33,11 +37,11 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		SAVE_START_PAGE: 'Grabar',
 
 		//Admin Form View
-		ARE_YOU_SURE: '¿Estas absolutamente seguro?',
-		READ_WARNING: '¡Algo malo ocurrira si no lees esto!',
-		DELETE_WARNING1: 'Esta acción no tiene vuelta atrás. Esto borrara permanentemente el "',
+		ARE_YOU_SURE: '¿Estás absolutamente seguro?',
+		READ_WARNING: '¡Algo malo ocurrirá si no lees esto!',
+		DELETE_WARNING1: 'Esta acción no tiene vuelta atrás. Esto borrará permanentemente el "',
 		DELETE_WARNING2: '" formulario y todos los datos asociados.',
-		DELETE_CONFIRM: 'Por favor escribi el bonbre del formulario para confirmar.',
+		DELETE_CONFIRM: 'Por favor escribí el nombre del formulario para confirmar.',
 		I_UNDERSTAND: 'Entiendo las consecuencias y quiero borrarlo.',
 		DELETE_FORM_SM: 'Borrar',
 		DELETE_FORM_MD: 'Borrar formulario',
@@ -46,6 +50,11 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		VIEW: 'Vista',
 		LIVE: 'Online',
 		PREVIEW: 'Vista previa',
+		COPY: 'Copiar',
+		COPY_AND_PASTE: 'Copiar y pegar esto para agregar su TellForm a su sitio web',
+		CHANGE_WIDTH_AND_HEIGHT: 'Cambie los valores de ancho y altura para adaptar el formulario a sus necesidades',
+		POWERED_BY: 'Con la tecnlogía de',
+		TELLFORM_URL: 'Tu TellForm está en esta URL permanente',
 
 		//Edit Form View
 		DISABLED: 'Deshabilitado',
@@ -59,37 +68,52 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		EDIT_END_PAGE: 'Editar página de finalización',
 		WELCOME_SCREEN: 'Comienzo',
 		END_SCREEN: 'Fin',
-		INTRO_TITLE: 'Titulo',
-		INTRO_PARAGRAPH: 'Paragrafo',
+		INTRO_TITLE: 'Título',
+		INTRO_PARAGRAPH: 'Parágrafo',
 		INTRO_BTN: 'Botón de comienzo',
-		TITLE: 'Titulo',
+		TITLE: 'Título',
 		PARAGRAPH: 'Paragrafo',
 		BTN_TEXT: 'Botón para volver atrás',
-		BUTTONS: 'Butones',
+		BUTTONS: 'Botones',
 		BUTTON_TEXT: 'Texto',
 		BUTTON_LINK: 'Link',
 		ADD_BUTTON: 'Agregar Botón',
 		PREVIEW_FIELD: 'Vista previa Pregunta',
-		QUESTION_TITLE: 'Titulo',
+		QUESTION_TITLE: 'Título',
 		QUESTION_DESCRIPTION: 'Descripción',
 		OPTIONS: 'Opciones',
 		ADD_OPTION: 'Agregar Opciones',
 		NUM_OF_STEPS: 'Cantidad de pasos',
 		CLICK_FIELDS_FOOTER: 'Click en los campos para agregar',
+		SHAPE: 'Forma',
+		IF_THIS_FIELD: 'Si este campo',
+		IS_EQUAL_TO: 'es igual a',
+		IS_NOT_EQUAL_TO: 'no es igual a',
+		IS_GREATER_THAN: 'es mayor que',
+		IS_GREATER_OR_EQUAL_THAN: 'es mayor o igual que',
+		IS_SMALLER_THAN: 'es menor que',
+		IS_SMALLER_OR_EQUAL_THAN: 'is menor o igual que',
+		CONTAINS: 'contiene',
+		DOES_NOT_CONTAINS: 'no contiene',
+		ENDS_WITH: 'termina con',
+		DOES_NOT_END_WITH: 'no termina con',
+		STARTS_WITH: 'comienza con',
+		DOES_NOT_START_WITH: 'no comienza con',
+		THEN_JUMP_TO: 'luego salta a',
 
 		//Edit Submissions View
 		TOTAL_VIEWS: 'Total de visitas únicas',
 		RESPONSES: 'respuestas',
 		COMPLETION_RATE: 'Taza de terminación',
-		AVERAGE_TIME_TO_COMPLETE: 'Promedio de tiempo de rellanado',
+		AVERAGE_TIME_TO_COMPLETE: 'Promedio de tiempo de rellenado',
 
 		DESKTOP_AND_LAPTOP: 'Computadora',
 		TABLETS: 'Tablets',
-		PHONES: 'Moviles',
+		PHONES: 'Móviles',
 		OTHER: 'Otros',
 		UNIQUE_VISITS: 'Visitas únicas',
 
-		FIELD_TITLE: 'Titulo de campo',
+		FIELD_TITLE: 'Título de campo',
 		FIELD_VIEWS: 'Vistas de campo',
 		FIELD_DROPOFF: 'Finalización de campo',
 		FIELD_RESPONSES: 'Respuestas de campo',
@@ -117,7 +141,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		CREATE_TAB: 'Crear',
 		DESIGN_TAB: 'Diseño',
 		CONFIGURE_TAB: 'Configuración',
-		ANALYZE_TAB: 'Analisis'
+		ANALYZE_TAB: 'Análisis'
 
 	});
 }]);
diff --git a/public/modules/forms/admin/views/admin-form.client.view.html b/public/modules/forms/admin/views/admin-form.client.view.html
index 5227bbae..184cd32f 100644
--- a/public/modules/forms/admin/views/admin-form.client.view.html
+++ b/public/modules/forms/admin/views/admin-form.client.view.html
@@ -3,7 +3,7 @@
 <div class="container"></div>
 
 <section class="admin-form">
-	
+
 	<!-- Modal Delete Dialog Template -->
     <script type="text/ng-template" id="formDeleteModal.html">
         <div class="modal-header">
@@ -75,14 +75,14 @@
 									<uib-tab index="0" heading="Share your Form">
 										<div class="row">
 											<div class="col-sm-12">
-												Your TellForm is permanently at this URL
+												{{ 'TELLFORM_URL' | translate }}
 											</div>
 											<div class="col-sm-8 form-input">
 												<span ngclipboard data-clipboard-target="#copyURL"> <input id="copyURL" ng-value="actualFormURL" class="form-control ng-pristine ng-untouched ng-valid"> </span>
 											</div>
 											<div class="col-sm-4">
 												<button class="btn btn btn-secondary view-form-btn" ngclipboard data-clipboard-target="#copyURL">
-													Copy <i class="fa fa-clipboard" aria-hidden="true"></i>
+													{{ 'COPY' | translate }} <i class="fa fa-clipboard" aria-hidden="true"></i>
 												</button>
 											</div>
 										</div>
@@ -90,20 +90,20 @@
 									<uib-tab index="1" heading="Embed your Form">
 										<div class="row">
 											<div class="col-sm-12">
-												Copy and Paste this to add your TellForm to your website
+												{{ 'COPY_AND_PASTE' | translate }}
 											</div>
 											<div class="col-sm-8 form-input">
 												<span ngclipboard data-clipboard-target="#copyEmbedded">
 													<textarea id="copyEmbedded" class="form-control ng-pristine ng-untouched ng-valid" style="min-height:200px; width:100%; background-color: #FFFFCC; color: #30313F;">
-														&lt;!-- Change the width and height values to suit you best --&gt;
+														&lt;!-- {{ 'CHANGE_WIDTH_AND_HEIGHT' | translate }} --&gt;
 														<iframe id="iframe" src="{{actualFormURL}}" style="width:100%;height:500px;"></iframe>
-														<div style="font-family: Sans-Serif;font-size: 12px;color: #999;opacity: 0.5; padding-top: 5px;">Powered by <a href="https://www.tellform.com" style="color: #999" target="_blank">TellForm</a></div>
+														<div style="font-family: Sans-Serif;font-size: 12px;color: #999;opacity: 0.5; padding-top: 5px;">{{ 'POWERED_BY' | translate }} <a href="https://www.tellform.com" style="color: #999" target="_blank">TellForm</a></div>
 													</textarea>
 												</span>
 											</div>
 											<div class="col-sm-4">
 												<button class="btn btn btn-secondary view-form-btn" ngclipboard data-clipboard-target="#copyEmbedded">
-													Copy <i class="fa fa-clipboard" aria-hidden="true"></i>
+													{{ 'COPY' | translate }} <i class="fa fa-clipboard" aria-hidden="true"></i>
 												</button>
 											</div>
 										</div>
diff --git a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html
index 7bf2d6d3..67397b66 100644
--- a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html
+++ b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html
@@ -10,7 +10,7 @@
                 <div class="col-sm-12">
                     <input class="form-control"
 					    type="text"
-                        ng-model="myform.title" 
+                        ng-model="myform.title"
                         value="{{myform.title}}"
                         style="width: 100%;"
                         ng-minlength="4"
@@ -37,18 +37,18 @@
 
                 </div>
             </div>
-            
+
             <div class="row field">
-                <div class="col-sm-12 field-title">Language</div>
+                <div class="col-sm-12 field-title">{{ 'LANGUAGE' | translate }}</div>
                 <div class="col-sm-12 field-input">
                     <select ng-model="myform.language">
-                        <option ng-repeat="language in languages" 
+                        <option ng-repeat="language in languages"
                                 ng-selected="language == myform.language"
                                 value="{{language}}">
                             {{language}}
                         </option>
-                    </select>    
-                    <span class="required-error" ng-show="field.required && !field.fieldValue">* required</span>
+                    </select>
+                    <span class="required-error" ng-show="field.required && !field.fieldValue">* {{ 'REQUIRED_FIELD' | translate }}</span>
                 </div>
             </div>
         </div>
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
index ec8be8ee..cc303729 100644
--- a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
+++ b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
@@ -55,7 +55,7 @@
 					</div>
 
 					<div class="row options buttons" ng-if="showButtons">
-						<div class="col-md-3 col-xs-12">Buttons:</div>
+						<div class="col-md-3 col-xs-12">{{ 'BUTTONS' | translate }}:</div>
 						<div class="col-md-9 col-xs-12">
 							<div ng-repeat="button in myform.endPage.buttons track by button._id" class="row" style="padding-bottom:1em;">
 
@@ -208,7 +208,7 @@
 					</div>
 
 					<div class="row options buttons" ng-if="showButtons">
-						<div class="col-md-3 col-xs-12">Buttons:</div>
+						<div class="col-md-3 col-xs-12">{{ 'BUTTONS' | translate }}:</div>
 						<div class="col-md-9 col-xs-12">
 							<div ng-repeat="button in myform.startPage.buttons track by button._id" class="row" style="padding-bottom:1em;">
 
@@ -350,7 +350,7 @@
 								   required>
 						</div>
 						<br>
-						<div class="col-md-5 col-sm-9">Shape:</div>
+						<div class="col-md-5 col-sm-9">{{ 'SHAPE' | translate }}:</div>
 						<div class="col-md-7 col-sm-3">
 							<select style="width:100%" ng-model="field.ratingOptions.shape"
 									value="{{field.ratingOptions.steps}}"
@@ -409,7 +409,7 @@
 					<div class="row question" ng-if="!!showLogicJump">
 						<div class="col-md-4 col-sm-12">
 
-							<b> If this field </b>
+							<b> {{ 'IF_THIS_FIELD' | translate }} </b>
 						</div>
 						<div class="col-md-4 col-sm-12">
 							<select style="width:100%" ng-model="field.logicJump.expressionString"
@@ -417,53 +417,53 @@
 									name="logicjump_expressionString{{field._id}}">
 								<option value="field == static">
 
-									is equal to
+									{{ 'IS_EQUAL_TO' | translate }}
 								</option>
 								<option value="field != static">
 
-									is not equal to
+									{{ 'IS_NOT_EQUAL_TO' | translate }}
 								</option>
 
 								<option value="field > static" ng-if-start="field.fieldType === 'number' || field.fieldType === 'rating' || field.fieldType === 'number'">
 
-									is greater than
+									{{ 'IS_GREATER_THAN' | translate }}
 								</option>
 								<option value="field >= static">
 
-									is greater or equal than
+									{{ 'IS_GREATER_OR_EQUAL_THAN' | translate }}
 								</option>
 								<option value="field < static">
 
-									is smaller than
+									{{ 'IS_SMALLER_THAN' | translate }}
 								</option>
 								<option value="field <= static" ng-if-end>
 
-									is smaller or equal than
+									{{ 'IS_SMALLER_OR_EQUAL_THAN' | translate }}
 								</option>
 
 								<option value="field contains static" ng-if-start="field.fieldType !== 'number' && field.fieldType !== 'rating' && field.fieldType !== 'number'">
 
-									contains
+									{{ 'CONTAINS' | translate }}
 								</option>
 								<option value="field !contains static">
 
-									does not contain
+									{{ 'DOES_NOT_CONTAINS' | translate }}
 								</option>
 								<option value="field ends static">
 
-									ends with
+									{{ 'ENDS_WITH' | translate }}
 								</option>
 								<option value="field !ends static">
 
-									does not end with
+									{{ 'DOES_NOT_END_WITH' | translate }}
 								</option>
 								<option value="field starts static">
 
-									starts with
+									{{ 'STARTS_WITH' | translate }}
 								</option>
 								<option value="field !starts static" ng-if-end>
 
-									does not start with
+									{{ 'DOES_NOT_START_WITH' | translate }}
 								</option>
 							</select>
 						</div>
@@ -472,7 +472,7 @@
 						</div>
 						<div class="col-md-2">
 
-							<b>then jump to </b>
+							<b>{{ 'THEN_JUMP_TO' | translate }}</b>
 						</div>
 						<div class="col-md-10">
 							<select style="width:100%" ng-model="field.logicJump.jumpTo"
@@ -526,7 +526,7 @@
                             <field-icon-directive type-name="{{type.name}}">
                             </field-icon-directive>
                         </span>
-                        
+
                         <span class="hidden-xs" style="padding-left:0.3em;">{{type.value}}</span>
                     </div>
                 </div>
diff --git a/public/modules/forms/admin/views/list-forms.client.view.html b/public/modules/forms/admin/views/list-forms.client.view.html
index 71ab5624..d73f0605 100644
--- a/public/modules/forms/admin/views/list-forms.client.view.html
+++ b/public/modules/forms/admin/views/list-forms.client.view.html
@@ -30,7 +30,7 @@
 	<div class="row">
 		<div class="col-xs-4 col-xs-offset-4">
 			<h3 class="text-center forms-list-title">
-				My Forms
+				{{ 'MY_FORMS' | translate }}
 			</h3>
 		</div>
 	</div>
@@ -40,48 +40,48 @@
 				<h4 class="fa fa-plus fa-6"></h4>
 			</div>
 			<div class="col-xs-12 details-row">
-				
+
 				<small class="list-group-item-text">
 					{{ 'CREATE_A_NEW_FORM' | translate }}
 				</small>
 
-			</div>	
+			</div>
 		</div>
 
 		<form name="forms.createForm" class="col-xs-6 col-xs-offset-3 col-sm-4 col-sm-offset-1 col-md-3 col-md-offset-1 form-item create-new new-form" ng-if="showCreateModal">
 			<div class="title-row row">
-				    <div class="col-xs-5 field-title text-left"> Name </div>
+				    <div class="col-xs-5 field-title text-left"> {{ 'NAME' | translate }} </div>
 				    <div class="col-xs-12 field-input">
 						<input type="text" name="title" required ng-model="formTitle" ng-pattern="languageRegExp" ng-minlength="4" style="color:black;"/>
 				    </div>
 			</div>
-			<div class="details-row row">			
-			    <div class="col-xs-5 field-title text-left"> Language </div>
+			<div class="details-row row">
+			    <div class="col-xs-5 field-title text-left"> {{ 'LANGUAGE' | translate }} </div>
 			    <div class="col-xs-12 field-input">
 				    <div class="button custom-select">
 						<select style="color:black;" name="language" required ng-model="formLanguage" ng-init="formLanguage = user.language">
 							<option ng-repeat="language in languages" value="{{language}}">
 								{{language}}
 							</option>
-				        </select>      
+				        </select>
 				    </div>
 			    </div>
 			</div>
-			<div class="details-row submit row">			
+			<div class="details-row submit row">
 			    <div class="col-xs-12 field-title text-center">
 			    	<button class="btn btn-primary" ng-disabled="forms.createForm.$invalid" ng-click="createNewForm()">
 						{{ 'CREATE_FORM' | translate }}
 			    	</button>
 			    </div>
-			</div>		
+			</div>
 		</form>
 
-		<div data-ng-repeat="form in myforms" 
+		<div data-ng-repeat="form in myforms"
             class="col-xs-6 col-xs-offset-3 col-sm-4 col-sm-offset-1 col-md-3 col-md-offset-1 form-item container"
 			 ng-class="{'paused': !form.isLive}">
 
 			<div class="row">
-				<span class="pull-right"> 
+				<span class="pull-right">
 					<i style="cursor:pointer;" class="fa fa-trash-o" ng-click="openDeleteModal($index)"></i>
 					<i style="cursor:pointer;" class="fa fa-files-o" ng-click="duplicateForm($index)"></i>
 				</span>
@@ -94,12 +94,12 @@
 				</a>
 				<div class="col-xs-12 responses-row">
 					<small class="list-group-item-text">
-						<span> {{ form.submissions.length }} responses </span>
+						<span> {{ form.submissions.length }} {{ 'RESPONSES' | translate }} </span>
 					</small>
 					<br>
 					<br>
 					<small ng-if="!form.isLive" class="list-group-item-text">
-						<span> Form Paused </span>
+						<span> {{ 'FORM_PAUSED' | translate }} </span>
 					</small>
 				</div>
 			</div>
diff --git a/public/modules/forms/base/config/i18n/english.js b/public/modules/forms/base/config/i18n/english.js
index e70363f3..d4852a2f 100644
--- a/public/modules/forms/base/config/i18n/english.js
+++ b/public/modules/forms/base/config/i18n/english.js
@@ -27,7 +27,10 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 	DELETE: 'Delete',
 	CANCEL: 'Cancel',
 	SUBMIT: 'Submit',
-	UPLOAD_FILE: 'Upload your File'
+	UPLOAD_FILE: 'Upload your File',
+  TYPE_OR_SELECT_OPTION: 'Type or select an option',
+  ABORT_UPLOAD: 'Abort ongoing upload',
+  CLEAR_SELECTED_FILES: 'Clear selected files'
   });
-	
+
 }]);
diff --git a/public/modules/forms/base/config/i18n/spanish.js b/public/modules/forms/base/config/i18n/spanish.js
index 6ebe21b1..99188f0f 100644
--- a/public/modules/forms/base/config/i18n/spanish.js
+++ b/public/modules/forms/base/config/i18n/spanish.js
@@ -29,7 +29,10 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 	SUBMIT: 'Registrar',
 	UPLOAD_FILE: 'Cargar el archivo',
 	Y: 'S',
-	N: 'N'
+	N: 'N',
+  TYPE_OR_SELECT_OPTION: 'Escriba o seleccione una opción',
+  ABORT_UPLOAD: 'Cancelar la subida en curso',
+  CLEAR_SELECTED_FILES: 'Borrar los archivos seleccionados'
   });
 
 }]);
diff --git a/public/modules/forms/base/views/directiveViews/field/dropdown.html b/public/modules/forms/base/views/directiveViews/field/dropdown.html
index ec5cba2c..45b2c2a2 100644
--- a/public/modules/forms/base/views/directiveViews/field/dropdown.html
+++ b/public/modules/forms/base/views/directiveViews/field/dropdown.html
@@ -24,7 +24,7 @@
 			    on-tab-and-shift-key="prevField()"
 			    on-tab-key="nextField()"
 				ng-change="$root.nextField()">
-			<ui-select-match placeholder="Type or select an option">
+			<ui-select-match placeholder="{{ 'TYPE_OR_SELECT_OPTION' | translate }}">
 			</ui-select-match>
 			<ui-select-choices repeat="option in field.fieldOptions | filter: $select.search"
 							   ng-class="{'active': option.option_value === field.fieldValue }">
diff --git a/public/modules/forms/base/views/directiveViews/field/file.html b/public/modules/forms/base/views/directiveViews/field/file.html
index 1d6c3d10..1ffad9ad 100644
--- a/public/modules/forms/base/views/directiveViews/field/file.html
+++ b/public/modules/forms/base/views/directiveViews/field/file.html
@@ -18,12 +18,12 @@
                 </div>
             </div>
             <div class="input-group-btn">
-                <button type="button"  ng-if="field.file" ng-click="removeFile(field);" title="Clear selected files" class="btn btn-danger fileinput-remove fileinput-remove-button">
+                <button type="button"  ng-if="field.file" ng-click="removeFile(field);" title="{{ 'CLEAR_SELECTED_FILES' | translate }}" class="btn btn-danger fileinput-remove fileinput-remove-button">
                     <i class="glyphicon glyphicon-trash"  ></i>
                     {{ 'DELETE' | translate }}
                 </button>
 
-                <button type="button" ng-if="field.fileLoading" title="Abort ongoing upload" class="btn btn-default" ng-click="cancelFileUpload(field)">
+                <button type="button" ng-if="field.fileLoading" title="{{ 'ABORT_UPLOAD' | translate }}" class="btn btn-default" ng-click="cancelFileUpload(field)">
                     <i class="glyphicon glyphicon-ban-circle"></i>
                     {{ 'CANCEL' | translate }}
                 </button>
diff --git a/public/modules/forms/base/views/directiveViews/field/textarea.html b/public/modules/forms/base/views/directiveViews/field/textarea.html
index aa169d3a..6a5a7993 100644
--- a/public/modules/forms/base/views/directiveViews/field/textarea.html
+++ b/public/modules/forms/base/views/directiveViews/field/textarea.html
@@ -14,7 +14,7 @@
 		</p>
 	</div>
 	<div class="col-xs-12 field-input">
-		<small style="font-size:0.6em;">Press SHIFT+ENTER to add a newline</small>
+		<small style="font-size:0.6em;">{{ 'NEWLINE' | translate }}</small>
 		<textarea class="textarea focusOn" type="text"
 			ng-model="field.fieldValue"
 			ng-model-options="{ debounce: 250 }"
diff --git a/public/modules/users/config/i18n/english.js b/public/modules/users/config/i18n/english.js
index 8efb4052..390aaf38 100644
--- a/public/modules/users/config/i18n/english.js
+++ b/public/modules/users/config/i18n/english.js
@@ -25,10 +25,14 @@ angular.module('users').config(['$translateProvider', function ($translateProvid
 		ENTER_ACCOUNT_EMAIL: 'Enter your account email.',
 		RESEND_VERIFICATION_EMAIL: 'Resend Verification Email',
 		SAVE_CHANGES: 'Save Changes',
+		CANCEL_BTN: 'Cancel',
 
+		EDIT_PROFILE: 'Edit your profile',
 		UPDATE_PROFILE_BTN: 'Update Profile',
 		PROFILE_SAVE_SUCCESS: 'Profile saved successfully',
 		PROFILE_SAVE_ERROR: 'Could\'t Save Your Profile.',
+		CONNECTED_SOCIAL_ACCOUNTS: 'Connected social accounts',
+		CONNECT_OTHER_SOCIAL_ACCOUNTS: 'Connect other social accounts',
 
 		FORGOT_PASSWORD_LINK: 'Forgot your password?',
 		REVERIFY_ACCOUNT_LINK: 'Resend your verification email',
@@ -39,10 +43,12 @@ angular.module('users').config(['$translateProvider', function ($translateProvid
 
 		SUCCESS_HEADER: 'Signup Successful',
 		SUCCESS_TEXT: 'You’ve successfully registered an account at TellForm.',
-		VERIFICATION_EMAIL_SENT: 'A verification email has been sent to',
+		VERIFICATION_EMAIL_SENT: 'Verification Email has been Sent',
+		VERIFICATION_EMAIL_SENT_TO: 'A verification email has been sent to',
 		NOT_ACTIVATED_YET: 'But your account is not activated yet',
 		BEFORE_YOU_CONTINUE: 'Before you continue, make sure to check your email for our verification. If you don’t receive it within 24h drop us a line at ',
 		CHECK_YOUR_EMAIL: 'Check your email and click on the activation link to activate your account. If you have any questions drop us a line at',
+		CONTINUE: 'Continue',
 
 		PASSWORD_RESTORE_HEADER: 'Restore your password',
 		ENTER_YOUR_EMAIL: 'Enter your account email.',
@@ -52,6 +58,8 @@ angular.module('users').config(['$translateProvider', function ($translateProvid
 		PASSWORD_RESET_INVALID: 'Password reset is invalid',
 		PASSWORD_RESET_SUCCESS: 'Passport successfully reset',
 		PASSWORD_CHANGE_SUCCESS: 'Passport successfully changed',
+		RESET_PASSWORD: 'Reset your password',
+		CHANGE_PASSWORD: 'Change your password',
 
 		CONTINUE_TO_LOGIN: 'Continue to login page',
 
diff --git a/public/modules/users/config/i18n/spanish.js b/public/modules/users/config/i18n/spanish.js
index 6630fe7a..af3a40b8 100644
--- a/public/modules/users/config/i18n/spanish.js
+++ b/public/modules/users/config/i18n/spanish.js
@@ -3,7 +3,7 @@
 angular.module('users').config(['$translateProvider', function ($translateProvider) {
 
 	$translateProvider.translations('es', {
-		ACCESS_DENIED_TEXT: 'Tenes que estar logueado para acceder a esta página',
+		ACCESS_DENIED_TEXT: 'Tenés que estar logueado para acceder a esta página',
 		USERNAME_OR_EMAIL_LABEL: 'Usuario o Email',
 		USERNAME_LABEL: 'Usuario',
 		PASSWORD_LABEL: 'Contraseña',
@@ -16,46 +16,54 @@ angular.module('users').config(['$translateProvider', function ($translateProvid
 		LANGUAGE_LABEL: 'Idioma',
 		EMAIL_LABEL: 'Email',
 
-		SIGNUP_ACCOUNT_LINK: '¿No tenes cuenta? Resgistrate acá',
-		SIGN_IN_ACCOUNT_LINK: '¿Ya tenes cuenta? Entra acá',
+		SIGNUP_ACCOUNT_LINK: '¿No tenés cuenta? Resgistrate acá',
+		SIGN_IN_ACCOUNT_LINK: '¿Ya tenés cuenta? Entra acá',
 		SIGNUP_HEADER_TEXT: 'Registrar',
 		SIGNIN_HEADER_TEXT: 'Entrar',
 
-		SIGNUP_ERROR_TEXT: 'No se pudo terminacr la registración por errores',
-		ENTER_ACCOUNT_EMAIL: 'Ingresa tu correo electrónico.',
+		SIGNUP_ERROR_TEXT: 'No se pudo terminar la registración por errores',
+		ENTER_ACCOUNT_EMAIL: 'Ingresá tu correo electrónico.',
 		RESEND_VERIFICATION_EMAIL: 'Reenviar email de verificación',
 		SAVE_CHANGES: 'Grabar cambios',
+		CANCEL_BTN: 'Cancelar',
 
+		EDIT_PROFILE: 'Editar perfil',
 		UPDATE_PROFILE_BTN: 'Actualizar perfil',
 		PROFILE_SAVE_SUCCESS: 'Perfil actualizado satisfactoriamente',
 		PROFILE_SAVE_ERROR: 'No se pudo grabar el perfil.',
+		CONNECTED_SOCIAL_ACCOUNTS: 'Redes sociales conectadas',
+		CONNECT_OTHER_SOCIAL_ACCOUNTS: 'Conectar otras redes sociales',
 
-		FORGOT_PASSWORD_LINK: '¿Olvista la contraseña?',
-		REVERIFY_ACCOUNT_LINK: 'Reenviar email de verficación',
+		FORGOT_PASSWORD_LINK: '¿Olvidaste la contraseña?',
+		REVERIFY_ACCOUNT_LINK: 'Reenviar email de verificación',
 
 		SIGNIN_BTN: 'Entrar',
-		SIGNUP_BTN: 'Registrar',
+		SIGNUP_BTN: 'Registrarse',
 		SAVE_PASSWORD_BTN: 'Grabar contraseña',
 
 		SUCCESS_HEADER: 'Ingresaste exitosamente',
-		SUCCESS_TEXT: 'Te registraste exitosamente una cuenta en TellForm.',
-		VERIFICATION_EMAIL_SENT: 'Un email de verificación fue enviado',
-		NOT_ACTIVATED_YET: 'Tu cuenta aún no esta activa',
-		BEFORE_YOU_CONTINUE: 'Antes de continuar asegurate de leer el email de verificación que te enviamos. Si no lo recibis en 24hs escribinos a ',
-		CHECK_YOUR_EMAIL: 'Lee el email y hace click en el link de activación para activar la cuenta. Si tenes alguna pregunta escribinos a ',
+		SUCCESS_TEXT: 'Registraste exitosamente una cuenta en TellForm.',
+		VERIFICATION_EMAIL_SENT: 'El email de verificación fue enviado exitosamente',
+		VERIFICATION_EMAIL_SENT_TO: 'Un email de verificación fue enviado a',
+		NOT_ACTIVATED_YET: 'Tu cuenta aún no está activa',
+		BEFORE_YOU_CONTINUE: 'Antes de continuar asegurate de leer el email de verificación que te enviamos. Si no lo recibís en 24hs escribinos a ',
+		CHECK_YOUR_EMAIL: 'Leé el email y hacé click en el link de activación para activar la cuenta. Si tenés alguna pregunta escribinos a ',
+		CONTINUE: 'Continuar',
 
 		PASSWORD_RESTORE_HEADER: 'Restaurar la contraseña',
-		ENTER_YOUR_EMAIL: 'Ingresa el email de tu cuenta.',
+		ENTER_YOUR_EMAIL: 'Ingresá el email de tu cuenta.',
 		SUBMIT_BTN: 'Enviar',
 
-		ASK_FOR_NEW_PASSWORD: 'Pedir reset de contraseña',
-		PASSWORD_RESET_INVALID: 'El reseto de la contraseña es invalida',
+		ASK_FOR_NEW_PASSWORD: 'Pedir reseteo de contraseña',
+		PASSWORD_RESET_INVALID: 'El reseteo de la contraseña es inválido',
 		PASSWORD_RESET_SUCCESS: 'Contraseña exitosamente reseteada',
 		PASSWORD_CHANGE_SUCCESS: 'Contraseña exitosamente cambiada',
+		RESET_PASSWORD: 'Resetear contraseña',
+		CHANGE_PASSWORD: 'Cambiar contraseña',
 
 		CONTINUE_TO_LOGIN: 'Ir a la página de ingreso',
 
-		VERIFY_SUCCESS: 'Cuenta activada existosamente',
-		VERIFY_ERROR: 'El link de verificación es invalido o inexistente'
+		VERIFY_SUCCESS: 'Cuenta activada exitosamente',
+		VERIFY_ERROR: 'El link de verificación es inválido o inexistente'
 	});
 }]);
diff --git a/public/modules/users/views/authentication/signup-success.client.view.html b/public/modules/users/views/authentication/signup-success.client.view.html
index 6dcef334..fe5d0b35 100755
--- a/public/modules/users/views/authentication/signup-success.client.view.html
+++ b/public/modules/users/views/authentication/signup-success.client.view.html
@@ -30,7 +30,7 @@
 			<strong>{{ 'BEFORE_YOU_CONTINUE' | translate }}</strong> <a href="mail:polydaic@gmail.com">polydaic@gmail.com</a></p>
 		<div class="text-center form-group">
 				<button type="submit" class="btn btn-primary btn-rounded">
-					<a href="/#!/" style="color: white; text-decoration: none;">Continue</a>
+					<a href="/#!/" style="color: white; text-decoration: none;">{{ 'CONTINUE' | translate }}</a>
 				</button>
 		</div>
 	</div>
diff --git a/public/modules/users/views/password/reset-password.client.view.html b/public/modules/users/views/password/reset-password.client.view.html
index 24bbb2af..00927206 100755
--- a/public/modules/users/views/password/reset-password.client.view.html
+++ b/public/modules/users/views/password/reset-password.client.view.html
@@ -1,5 +1,5 @@
 <section class="row auth" data-ng-controller="PasswordController">
-	<h3 class="col-md-12 text-center">Reset your password</h3>
+	<h3 class="col-md-12 text-center">{{ 'RESET_PASSWORD' | translate }}</h3>
 	<div class="col-xs-offset-2 col-xs-8 col-md-offset-3 col-md-6">
 		<form data-ng-submit="resetUserPassword()" class="signin form-horizontal" autocomplete="off">
 			<fieldset>
@@ -12,7 +12,7 @@
 					<input type="password" id="verifyPassword" name="verifyPassword" class="form-control" data-ng-model="passwordDetails.verifyPassword" placeholder="Verify Password">
 				</div>
 				<div class="text-center form-group">
-					<button type="submit" class="btn btn-large btn-primary">Update Password</button>
+					<button type="submit" class="btn btn-large btn-primary">{{ 'UPDATE_PASSWORD_LABEL' | translate }}</button>
 				</div>
 				<div data-ng-show="error" class="text-center text-danger">
 					<strong>{{error}}</strong>
diff --git a/public/modules/users/views/settings/change-password.client.view.html b/public/modules/users/views/settings/change-password.client.view.html
index a6144c04..2994b26c 100755
--- a/public/modules/users/views/settings/change-password.client.view.html
+++ b/public/modules/users/views/settings/change-password.client.view.html
@@ -1,12 +1,12 @@
 <header data-ng-include="'/static/modules/core/views/header.client.view.html'"></header>
 
 <section class="row" data-ng-controller="SettingsController">
-	<h3 class="col-md-12 text-center">Change your password</h3>
+	<h3 class="col-md-12 text-center">{{ 'CHANGE_PASSWORD' | translate }}</h3>
 	<div class="col-xs-offset-2 col-xs-8 col-md-offset-3 col-md-6">
 		<form data-ng-submit="changeUserPassword()" class="signin form-horizontal" autocomplete="off">
 			<fieldset>
 				<div class="form-group">
-					<label for="currentPassword">Current Password</label>
+					<label for="currentPassword">{{ 'CURRENT_PASSWORD_LABEL' | translate }}</label>
 					<input type="password" id="currentPassword" name="currentPassword" class="form-control" data-ng-model="passwordDetails.currentPassword" placeholder="Current Password">
 				</div>
 				<hr>
diff --git a/public/modules/users/views/settings/edit-profile.client.view.html b/public/modules/users/views/settings/edit-profile.client.view.html
index 6f01d360..cf157b71 100755
--- a/public/modules/users/views/settings/edit-profile.client.view.html
+++ b/public/modules/users/views/settings/edit-profile.client.view.html
@@ -1,7 +1,7 @@
 <header data-ng-include="'/static/modules/core/views/header.client.view.html'"></header>
 
 <section class="row" data-ng-controller="SettingsController">
-	<h2 class="col-xs-offset-1 col-xs-10 text-center">Edit your profile</h2>
+	<h2 class="col-xs-offset-1 col-xs-10 text-center">{{ 'EDIT_PROFILE' | translate }}</h2>
 	<div class="col-xs-offset-3 col-xs-6">
 		<form name="userForm" data-ng-submit="updateUserProfile(userForm.$valid)" class="signin form-horizontal" autocomplete="off">
 			<fieldset>
@@ -12,7 +12,7 @@
 					{{ 'PROFILE_SAVE_ERROR' | translate }}<br>
 					<strong data-ng-bind="error"></strong>
 				</div>
-				
+
 				<div class="form-group row">
 					<div class="col-xs-7 field-title">
 						{{ 'FIRST_NAME_LABEL' | translate }}
@@ -38,12 +38,12 @@
 				    </div>
 				    <div class="col-xs-12 field-input">
 						<select ng-model="user.language" required>
-							<option ng-repeat="language in languages" 
+							<option ng-repeat="language in languages"
 									ng-selected="language == user.language"
 									value="{{language}}">
 								{{language}}
 							</option>
-				        </select>    
+				        </select>
 				    </div>
 				</div>
 
@@ -70,7 +70,7 @@
 						{{ 'SAVE_CHANGES' | translate }}
 					</button>
 					<button type="none" ng-click="cancel()" class="btn btn-rounded">
-						{{ 'CANCEL' | translate }}
+						{{ 'CANCEL_BTN' | translate }}
 					</button>
 				</div>
 
diff --git a/public/modules/users/views/settings/social-accounts.client.view.html b/public/modules/users/views/settings/social-accounts.client.view.html
index 26c5e941..9588947a 100755
--- a/public/modules/users/views/settings/social-accounts.client.view.html
+++ b/public/modules/users/views/settings/social-accounts.client.view.html
@@ -1,7 +1,7 @@
 <header data-ng-include="'/static/modules/core/views/header.client.view.html'"></header>
 
 <section class="row" data-ng-controller="SettingsController">
-	<h3 class="col-md-12 text-center" data-ng-show="hasConnectedAdditionalSocialAccounts()">Connected social accounts:</h3>
+	<h3 class="col-md-12 text-center" data-ng-show="hasConnectedAdditionalSocialAccounts()">{{ 'CONNECTED_SOCIAL_ACCOUNTS' | translate }}:</h3>
 	<div class="col-md-12 text-center">
 		<div data-ng-repeat="(providerName, providerData) in user.additionalProvidersData" class="remove-account-container">
 			<img ng-src="/modules/users/img/buttons/{{providerName}}.png">
@@ -10,7 +10,7 @@
 			</a>
 		</div>
 	</div>
-	<h3 class="col-md-12 text-center">Connect other social accounts:</h3>
+	<h3 class="col-md-12 text-center">{{ 'CONNECT_OTHER_SOCIAL_ACCOUNTS' | translate }}</h3>
 	<div class="col-md-12 text-center">
 		<a href="/auth/facebook" data-ng-hide="isConnectedSocialAccount('facebook')" class="undecorated-link">
 			<img src="/modules/users/img/buttons/facebook.png">
diff --git a/public/modules/users/views/verify/resend-verify-email.client.view.html b/public/modules/users/views/verify/resend-verify-email.client.view.html
index 4b0b2027..0395ae83 100644
--- a/public/modules/users/views/verify/resend-verify-email.client.view.html
+++ b/public/modules/users/views/verify/resend-verify-email.client.view.html
@@ -28,16 +28,16 @@
 			<div class="col-md-12 text-center" style="padding-bottom: 50px;">
 				<img src="/static/modules/core/img/logo_white.svg" height="100px">
 			</div>
-			<h3 class="col-md-12 text-center">Verification Email has been Sent</h3>
+			<h3 class="col-md-12 text-center">{{ 'VERIFICATION_EMAIL_SENT' | translate }}</h3>
 			<div class="col-md-12">
 				<h2>
-					{{ 'VERIFICATION_EMAIL_SENT' | translate }} {{username}}.
+					{{ 'VERIFICATION_EMAIL_SENT_TO' | translate }} {{username}}.
 					<br> {{ 'NOT_ACTIVATED_YET' | translate }}
 				</h2>
 				<p> {{ 'CHECK_YOUR_EMAIL' | translate }} <a href="mail:polydaic@gmail.com">polydaic@gmail.com</a></p>
 				<div class="text-center form-group">
 					<button type="submit" class="btn btn-large btn-primary btn-rounded">
-						<a href="/#!/" style="color:white;">Continue</a>
+						<a href="/#!/" style="color:white;">{{ 'CONTINUE' | translate }}</a>
 					</button>
 				</div>
 			</div>