From 924a9bb2c98e6931ac4638ae42d79edbf2136756 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <remyabel@gmail.com>
Date: Tue, 21 Aug 2018 10:55:33 -0400
Subject: [PATCH 1/3] Fix typos causing tests to fail

---
 pkg/i18n/dutch.go     | 2 +-
 pkg/i18n/i18n_test.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index a5bf897b5..68e7c82bd 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -134,7 +134,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			ID:    "DeleteBranchMessage",
 			Other: "Weet je zeker dat je branch {{.selectedBranchName}} wil verwijderen?",
 		}, &i18n.Message{
-			ID:    "DeleteBranchMessage",
+			ID:    "ForceDeleteBranchMessage",
 			Other: "Weet je zeker dat je branch {{.selectedBranchName}} geforceerd wil verwijderen?",
 		}, &i18n.Message{
 			ID:    "CantMergeBranchIntoItself",
diff --git a/pkg/i18n/i18n_test.go b/pkg/i18n/i18n_test.go
index 481a40863..549b58077 100644
--- a/pkg/i18n/i18n_test.go
+++ b/pkg/i18n/i18n_test.go
@@ -57,7 +57,7 @@ func TestLocalizer(t *testing.T) {
 					},
 				}))
 				assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
-				assert.Equal(t, "Are you sure you want delete the branch test ?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
+				assert.Equal(t, "Are you sure you want to delete the branch test ?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
 			},
 		},
 		{
@@ -70,7 +70,7 @@ func TestLocalizer(t *testing.T) {
 					},
 				}))
 				assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
-				assert.Equal(t, "Weet je zeker dat je test branch wil verwijderen?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
+				assert.Equal(t, "Weet je zeker dat je branch test wil verwijderen?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
 			},
 		},
 	}

From bee4d98f5248ca5bb8319c22ec6f04fc752d79d0 Mon Sep 17 00:00:00 2001
From: remyabel <41764622+remyabel@users.noreply.github.com>
Date: Tue, 21 Aug 2018 21:27:20 -0400
Subject: [PATCH 2/3] Remove space before punctuation

---
 pkg/i18n/i18n_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/i18n/i18n_test.go b/pkg/i18n/i18n_test.go
index 549b58077..5c2ca6419 100644
--- a/pkg/i18n/i18n_test.go
+++ b/pkg/i18n/i18n_test.go
@@ -57,7 +57,7 @@ func TestLocalizer(t *testing.T) {
 					},
 				}))
 				assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
-				assert.Equal(t, "Are you sure you want to delete the branch test ?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
+				assert.Equal(t, "Are you sure you want to delete the branch test?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
 			},
 		},
 		{

From 3e8ef0d12d394bdd2437ecb0084cea2985de01be Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <remyabel@gmail.com>
Date: Wed, 22 Aug 2018 11:27:45 -0400
Subject: [PATCH 3/3] Remove space before punctuation

---
 pkg/i18n/english.go   | 4 ++--
 pkg/i18n/i18n_test.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 2269ffb9f..38fbac4cb 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -140,10 +140,10 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			Other: "Delete Branch",
 		}, &i18n.Message{
 			ID:    "DeleteBranchMessage",
-			Other: "Are you sure you want to delete the branch {{.selectedBranchName}} ?",
+			Other: "Are you sure you want to delete the branch {{.selectedBranchName}}?",
 		}, &i18n.Message{
 			ID:    "ForceDeleteBranchMessage",
-			Other: "Are you sure you want to force delete the branch {{.selectedBranchName}} ?",
+			Other: "Are you sure you want to force delete the branch {{.selectedBranchName}}?",
 		}, &i18n.Message{
 			ID:    "CantMergeBranchIntoItself",
 			Other: "You cannot merge a branch into itself",
diff --git a/pkg/i18n/i18n_test.go b/pkg/i18n/i18n_test.go
index 549b58077..5c2ca6419 100644
--- a/pkg/i18n/i18n_test.go
+++ b/pkg/i18n/i18n_test.go
@@ -57,7 +57,7 @@ func TestLocalizer(t *testing.T) {
 					},
 				}))
 				assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
-				assert.Equal(t, "Are you sure you want to delete the branch test ?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
+				assert.Equal(t, "Are you sure you want to delete the branch test?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
 			},
 		},
 		{