From 697ed89155eea62f22b62ff3d6242bd32e6bac1b Mon Sep 17 00:00:00 2001
From: Akshay Tiwari <akshaytiwari.003@gmail.com>
Date: Sun, 17 Aug 2014 15:06:24 +0530
Subject: [PATCH 1/5] English(United States*)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I've corrected the error from “English (United State)” to “English (United States)”
---
 app/_js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/_js/directives.js b/app/_js/directives.js
index 8358bd0..3b0d9f4 100644
--- a/app/_js/directives.js
+++ b/app/_js/directives.js
@@ -51,7 +51,7 @@ angular.module('wmProfile.directives', [])
           // var title = config.langmap[config.supported_languages[i]] ? config.langmap[config.supported_languages[i]].nativeName : 'unknown';
           options.push({
             id: 'en-US',
-            title: 'English (United State)'
+            title: 'English (United States)'
           });
         }
 

From 6fe36338b2e354c3363a650c6d3987753dcd4579 Mon Sep 17 00:00:00 2001
From: Akshay Tiwari <akshaytiwari.003@gmail.com>
Date: Sun, 17 Aug 2014 15:10:36 +0530
Subject: [PATCH 2/5] Regarding bug 1053302

---
 app/_partials/create-user-form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/_partials/create-user-form.html b/app/_partials/create-user-form.html
index 8b3fdb8..64957b5 100644
--- a/app/_partials/create-user-form.html
+++ b/app/_partials/create-user-form.html
@@ -25,7 +25,7 @@ <h3 class="modal-title">Welcome to Webmaker!</h3>
       <label>
         <input ng-model="form.agree" name="agree" type="checkbox">I agree to your
         <a href="/{{lang}}/terms">terms</a>and
-        <a href="/{{lang}}/privacy">conditions</a>
+        <a href="/{{lang}}/privacy">&nbsp; conditions</a>
         <span class="help-block" ng-show="submit && !form.agree">You must agree to our terms and conditions</span>
       </label>
     </div>

From f98444b19ab9a293b9f041935f59b0bd4a03962a Mon Sep 17 00:00:00 2001
From: Akshay Tiwari <akshaytiwari.003@gmail.com>
Date: Mon, 18 Aug 2014 17:33:15 +0530
Subject: [PATCH 3/5] Regarding bug 1053302

---
 app/_partials/create-user-form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/_partials/create-user-form.html b/app/_partials/create-user-form.html
index 64957b5..8f2de48 100644
--- a/app/_partials/create-user-form.html
+++ b/app/_partials/create-user-form.html
@@ -24,7 +24,7 @@ <h3 class="modal-title">Welcome to Webmaker!</h3>
     <div class="checkbox" ng-class="{'has-error': submit && !form.agree }">
       <label>
         <input ng-model="form.agree" name="agree" type="checkbox">I agree to your
-        <a href="/{{lang}}/terms">terms</a>and
+        <a href="/{{lang}}/terms">terms</a>&nbsp; and
         <a href="/{{lang}}/privacy">&nbsp; conditions</a>
         <span class="help-block" ng-show="submit && !form.agree">You must agree to our terms and conditions</span>
       </label>

From c6312f4e120ef4de55022b1f44e480dbcbe323e0 Mon Sep 17 00:00:00 2001
From: Akshay Tiwari <akshaytiwari.003@gmail.com>
Date: Mon, 18 Aug 2014 19:54:18 +0530
Subject: [PATCH 4/5] Update create-user-form.html

---
 app/_partials/create-user-form.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/_partials/create-user-form.html b/app/_partials/create-user-form.html
index 8f2de48..fc17856 100644
--- a/app/_partials/create-user-form.html
+++ b/app/_partials/create-user-form.html
@@ -24,8 +24,8 @@ <h3 class="modal-title">Welcome to Webmaker!</h3>
     <div class="checkbox" ng-class="{'has-error': submit && !form.agree }">
       <label>
         <input ng-model="form.agree" name="agree" type="checkbox">I agree to your
-        <a href="/{{lang}}/terms">terms</a>&nbsp; and
-        <a href="/{{lang}}/privacy">&nbsp; conditions</a>
+        <a href="/{{lang}}/terms">terms</a> and
+        <a href="/{{lang}}/privacy"> conditions</a>
         <span class="help-block" ng-show="submit && !form.agree">You must agree to our terms and conditions</span>
       </label>
     </div>

From 46a6d8f859874c1f8344cac14e92a8072150f0dd Mon Sep 17 00:00:00 2001
From: Akshay Tiwari <akshaytiwari.003@gmail.com>
Date: Thu, 21 Aug 2014 18:21:41 +0530
Subject: [PATCH 5/5] Update create-user-form.html

---
 app/_partials/create-user-form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/_partials/create-user-form.html b/app/_partials/create-user-form.html
index fc17856..0dc0372 100644
--- a/app/_partials/create-user-form.html
+++ b/app/_partials/create-user-form.html
@@ -25,7 +25,7 @@ <h3 class="modal-title">Welcome to Webmaker!</h3>
       <label>
         <input ng-model="form.agree" name="agree" type="checkbox">I agree to your
         <a href="/{{lang}}/terms">terms</a> and
-        <a href="/{{lang}}/privacy"> conditions</a>
+        <a href="/{{lang}}/privacy">conditions</a>
         <span class="help-block" ng-show="submit && !form.agree">You must agree to our terms and conditions</span>
       </label>
     </div>