Shorten the waiting status for fast-forwarding a branch

Now that we no longer show it in a loader panel, but in the app status view,
it's awkwardly long (the loading animation is much further to the right than for
other waiting status texts). Hopefully seeing just "Fast-forwarding <branch>" is
enough to be able to tell what's happening.

pkg/gui/controllers/branches_controller.go

@@ -537,10 +537,9 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
 	action := self.c.Tr.Actions.FastForwardBranch
 
 	message := utils.ResolvePlaceholderString(
-		self.c.Tr.Fetching,
+		self.c.Tr.FastForwarding,
 		map[string]string{
-			"from": fmt.Sprintf("%s/%s", branch.UpstreamRemote, branch.UpstreamBranch),
+			"branch": branch.Name,
-			"to":   branch.Name,
 		},
 	)
 

pkg/i18n/chinese.go

@@ -169,7 +169,7 @@ func chineseTranslationSet() TranslationSet {
 		ToggleStagingPanel:                  `切换到其他面板`,
 		ReturnToFilesPanel:                  `返回文件面板`,
 		FastForward:                         `从上游快进此分支`,
-		Fetching:                            "抓取并快进 {{.from}} -> {{.to}} ...",
+		FastForwarding:                      "抓取并快进 {{.branch}} ...",
 		FoundConflictsTitle:                 "自动合并失败",
 		ViewMergeRebaseOptions:              "查看 合并/变基 选项",
 		NotMergingOrRebasing:                "您目前既不进行变基也不进行合并",

pkg/i18n/dutch.go

@@ -134,7 +134,7 @@ func dutchTranslationSet() TranslationSet {
 		ToggleStagingPanel:                  `Ga naar een ander paneel`,
 		ReturnToFilesPanel:                  `Ga terug naar het bestanden paneel`,
 		FastForward:                         `Fast-forward deze branch vanaf zijn upstream`,
-		Fetching:                            "Fetching en fast-forwarding {{.from}} -> {{.to}} ...",
+		FastForwarding:                      "Fast-forwarding {{.branch}} ...",
 		FoundConflictsTitle:                 "Conflicten!",
 		ViewMergeRebaseOptions:              "Bekijk merge/rebase opties",
 		NotMergingOrRebasing:                "Je bent momenteel niet aan het rebasen of mergen",

pkg/i18n/english.go

@@ -184,7 +184,7 @@ type TranslationSet struct {
 	ToggleStagingPanel                  string
 	ReturnToFilesPanel                  string
 	FastForward                         string
-	Fetching                            string
+	FastForwarding                      string
 	FoundConflictsTitle                 string
 	ViewConflictsMenuItem               string
 	AbortMenuItem                       string
@@ -977,7 +977,7 @@ func EnglishTranslationSet() TranslationSet {
 		ToggleStagingPanel:                  `Switch to other panel (staged/unstaged changes)`,
 		ReturnToFilesPanel:                  `Return to files panel`,
 		FastForward:                         `Fast-forward this branch from its upstream`,
-		Fetching:                            "Fetching and fast-forwarding {{.from}} -> {{.to}} ...",
+		FastForwarding:                      "Fast-forwarding {{.branch}}",
 		FoundConflictsTitle:                 "Conflicts!",
 		ViewConflictsMenuItem:               "View conflicts",
 		AbortMenuItem:                       "Abort the %s",

pkg/i18n/korean.go

@@ -170,7 +170,7 @@ func koreanTranslationSet() TranslationSet {
 		ToggleStagingPanel:                  `패널 전환`,
 		ReturnToFilesPanel:                  `파일 목록으로 돌아가기`,
 		FastForward:                         `Fast-forward this branch from its upstream`,
-		Fetching:                            "Fetching and fast-forwarding {{.from}} -> {{.to}} ...",
+		FastForwarding:                      "Fast-forwarding {{.branch}} ...",
 		FoundConflictsTitle:                 "Auto-merge failed",
 		ViewMergeRebaseOptions:              "View merge/rebase options",
 		NotMergingOrRebasing:                "You are currently neither rebasing nor merging",

pkg/i18n/russian.go

@@ -201,7 +201,7 @@ func RussianTranslationSet() TranslationSet {
 		ToggleStagingPanel:                  `Переключиться на другую панель (проиндексированные/непроиндексированные изменения)`,
 		ReturnToFilesPanel:                  `Вернуться к панели файлов`,
 		FastForward:                         `Перемотать эту ветку вперёд из её upstream-ветки`,
-		Fetching:                            "Получить изменения и перемотать вперёд {{.from}} -> {{.to}} ...",
+		FastForwarding:                      "Получить изменения и перемотать вперёд {{.branch}} ...",
 		FoundConflictsTitle:                 "Конфликты!",
 		ViewConflictsMenuItem:               "Просмотр конфликтов",
 		AbortMenuItem:                       "Прервать %s",

pkg/i18n/traditional_chinese.go

@@ -234,7 +234,7 @@ func traditionalChineseTranslationSet() TranslationSet {
 		ToggleStagingPanel:                  `切換至另一個面板 (已預存/未預存更改)`,
 		ReturnToFilesPanel:                  `返回檔案面板`,
 		FastForward:                         `從上游快進此分支`,
-		Fetching:                            "{{.from}} -> {{.to}} 的擷取和快進中...",
+		FastForwarding:                      "{{.branch}} 的擷取和快進中...",
 		FoundConflictsTitle:                 "自動合併失敗",
 		ViewMergeRebaseOptions:              "查看合併/變基選項",
 		NotMergingOrRebasing:                "你當前既不在變基也不在合併中",