type i18n

1 files changed, 161 insertions, 161 deletions

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index f6d0363b6..a92434561 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -230,14 +230,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Key:         gui.getKey(config.Universal.ScrollUpMain),
 			Handler:     gui.scrollUpMain,
 			Alternative: "fn+up",
-			Description: gui.Tr.SLocalize("scrollUpMainPanel"),
+			Description: gui.Tr.LcScrollUpMainPanel,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.ScrollDownMain),
 			Handler:     gui.scrollDownMain,
 			Alternative: "fn+down",
-			Description: gui.Tr.SLocalize("scrollDownMainPanel"),
+			Description: gui.Tr.LcScrollDownMainPanel,
 		},
 		{
 			ViewName: "",
@@ -267,37 +267,37 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.CreateRebaseOptionsMenu),
 			Handler:     gui.wrappedHandler(gui.handleCreateRebaseOptionsMenu),
-			Description: gui.Tr.SLocalize("ViewMergeRebaseOptions"),
+			Description: gui.Tr.ViewMergeRebaseOptions,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.CreatePatchOptionsMenu),
 			Handler:     gui.handleCreatePatchOptionsMenu,
-			Description: gui.Tr.SLocalize("ViewPatchOptions"),
+			Description: gui.Tr.ViewPatchOptions,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.PushFiles),
 			Handler:     gui.pushFiles,
-			Description: gui.Tr.SLocalize("push"),
+			Description: gui.Tr.LcPush,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.PullFiles),
 			Handler:     gui.handlePullFiles,
-			Description: gui.Tr.SLocalize("pull"),
+			Description: gui.Tr.LcPull,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.Refresh),
 			Handler:     gui.handleRefresh,
-			Description: gui.Tr.SLocalize("refresh"),
+			Description: gui.Tr.LcRefresh,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.OptionMenu),
 			Handler:     gui.handleCreateOptionsMenu,
-			Description: gui.Tr.SLocalize("openMenu"),
+			Description: gui.Tr.LcOpenMenu,
 		},
 		{
 			ViewName: "",
@@ -315,489 +315,489 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.Undo),
 			Handler:     gui.reflogUndo,
-			Description: gui.Tr.SLocalize("undoReflog"),
+			Description: gui.Tr.LcUndoReflog,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.Redo),
 			Handler:     gui.reflogRedo,
-			Description: gui.Tr.SLocalize("redoReflog"),
+			Description: gui.Tr.LcRedoReflog,
 		},
 		{
 			ViewName:    "status",
 			Key:         gui.getKey(config.Universal.Edit),
 			Handler:     gui.handleEditConfig,
-			Description: gui.Tr.SLocalize("EditConfig"),
+			Description: gui.Tr.EditConfig,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.NextScreenMode),
 			Handler:     gui.nextScreenMode,
-			Description: gui.Tr.SLocalize("nextScreenMode"),
+			Description: gui.Tr.LcNextScreenMode,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.PrevScreenMode),
 			Handler:     gui.prevScreenMode,
-			Description: gui.Tr.SLocalize("prevScreenMode"),
+			Description: gui.Tr.LcPrevScreenMode,
 		},
 		{
 			ViewName:    "status",
 			Key:         gui.getKey(config.Universal.OpenFile),
 			Handler:     gui.handleOpenConfig,
-			Description: gui.Tr.SLocalize("OpenConfig"),
+			Description: gui.Tr.OpenConfig,
 		},
 		{
 			ViewName:    "status",
 			Key:         gui.getKey(config.Status.CheckForUpdate),
 			Handler:     gui.handleCheckForUpdate,
-			Description: gui.Tr.SLocalize("checkForUpdate"),
+			Description: gui.Tr.LcCheckForUpdate,
 		},
 		{
 			ViewName:    "status",
 			Key:         gui.getKey(config.Status.RecentRepos),
 			Handler:     gui.wrappedHandler(gui.handleCreateRecentReposMenu),
-			Description: gui.Tr.SLocalize("SwitchRepo"),
+			Description: gui.Tr.SwitchRepo,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.CommitChanges),
 			Handler:     gui.wrappedHandler(gui.handleCommitPress),
-			Description: gui.Tr.SLocalize("CommitChanges"),
+			Description: gui.Tr.CommitChanges,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.CommitChangesWithoutHook),
 			Handler:     gui.handleWIPCommitPress,
-			Description: gui.Tr.SLocalize("commitChangesWithoutHook"),
+			Description: gui.Tr.LcCommitChangesWithoutHook,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.AmendLastCommit),
 			Handler:     gui.wrappedHandler(gui.handleAmendCommitPress),
-			Description: gui.Tr.SLocalize("AmendLastCommit"),
+			Description: gui.Tr.AmendLastCommit,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.CommitChangesWithEditor),
 			Handler:     gui.wrappedHandler(gui.handleCommitEditorPress),
-			Description: gui.Tr.SLocalize("CommitChangesWithEditor"),
+			Description: gui.Tr.CommitChangesWithEditor,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.wrappedHandler(gui.handleFilePress),
-			Description: gui.Tr.SLocalize("toggleStaged"),
+			Description: gui.Tr.LcToggleStaged,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleCreateDiscardMenu,
-			Description: gui.Tr.SLocalize("viewDiscardOptions"),
+			Description: gui.Tr.LcViewDiscardOptions,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Edit),
 			Handler:     gui.handleFileEdit,
-			Description: gui.Tr.SLocalize("editFile"),
+			Description: gui.Tr.LcEditFile,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.OpenFile),
 			Handler:     gui.handleFileOpen,
-			Description: gui.Tr.SLocalize("openFile"),
+			Description: gui.Tr.LcOpenFile,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.IgnoreFile),
 			Handler:     gui.handleIgnoreFile,
-			Description: gui.Tr.SLocalize("ignoreFile"),
+			Description: gui.Tr.LcIgnoreFile,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.RefreshFiles),
 			Handler:     gui.handleRefreshFiles,
-			Description: gui.Tr.SLocalize("refreshFiles"),
+			Description: gui.Tr.LcRefreshFiles,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.StashAllChanges),
 			Handler:     gui.handleStashChanges,
-			Description: gui.Tr.SLocalize("stashAllChanges"),
+			Description: gui.Tr.LcStashAllChanges,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.ViewStashOptions),
 			Handler:     gui.handleCreateStashMenu,
-			Description: gui.Tr.SLocalize("viewStashOptions"),
+			Description: gui.Tr.LcViewStashOptions,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.ToggleStagedAll),
 			Handler:     gui.handleStageAll,
-			Description: gui.Tr.SLocalize("toggleStagedAll"),
+			Description: gui.Tr.LcToggleStagedAll,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.ViewResetOptions),
 			Handler:     gui.handleCreateResetMenu,
-			Description: gui.Tr.SLocalize("viewResetOptions"),
+			Description: gui.Tr.LcViewResetOptions,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.handleEnterFile,
-			Description: gui.Tr.SLocalize("StageLines"),
+			Description: gui.Tr.StageLines,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Files.Fetch),
 			Handler:     gui.handleGitFetch,
-			Description: gui.Tr.SLocalize("fetch"),
+			Description: gui.Tr.LcFetch,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.wrappedHandler(gui.handleCopySelectedSideContextItemToClipboard),
-			Description: gui.Tr.SLocalize("copyFileNameToClipboard"),
+			Description: gui.Tr.LcCopyFileNameToClipboard,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.ExecuteCustomCommand),
 			Handler:     gui.handleCustomCommand,
-			Description: gui.Tr.SLocalize("executeCustomCommand"),
+			Description: gui.Tr.LcExecuteCustomCommand,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{FILES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateResetToUpstreamMenu,
-			Description: gui.Tr.SLocalize("viewResetToUpstreamOptions"),
+			Description: gui.Tr.LcViewResetToUpstreamOptions,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleBranchPress,
-			Description: gui.Tr.SLocalize("checkout"),
+			Description: gui.Tr.LcCheckout,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.CreatePullRequest),
 			Handler:     gui.handleCreatePullRequestPress,
-			Description: gui.Tr.SLocalize("createPullRequest"),
+			Description: gui.Tr.LcCreatePullRequest,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.CheckoutBranchByName),
 			Handler:     gui.handleCheckoutByName,
-			Description: gui.Tr.SLocalize("checkoutByName"),
+			Description: gui.Tr.LcCheckoutByName,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.ForceCheckoutBranch),
 			Handler:     gui.handleForceCheckout,
-			Description: gui.Tr.SLocalize("forceCheckout"),
+			Description: gui.Tr.LcForceCheckout,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.New),
 			Handler:     gui.wrappedHandler(gui.handleNewBranchOffCurrentItem),
-			Description: gui.Tr.SLocalize("newBranch"),
+			Description: gui.Tr.LcNewBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleDeleteBranch,
-			Description: gui.Tr.SLocalize("deleteBranch"),
+			Description: gui.Tr.LcDeleteBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.RebaseBranch),
 			Handler:     gui.handleRebaseOntoLocalBranch,
-			Description: gui.Tr.SLocalize("rebaseBranch"),
+			Description: gui.Tr.LcRebaseBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.MergeIntoCurrentBranch),
 			Handler:     gui.handleMerge,
-			Description: gui.Tr.SLocalize("mergeIntoCurrentBranch"),
+			Description: gui.Tr.LcMergeIntoCurrentBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.ViewGitFlowOptions),
 			Handler:     gui.handleCreateGitFlowMenu,
-			Description: gui.Tr.SLocalize("gitFlowOptions"),
+			Description: gui.Tr.LcGitFlowOptions,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.FastForward),
 			Handler:     gui.handleFastForward,
-			Description: gui.Tr.SLocalize("FastForward"),
+			Description: gui.Tr.FastForward,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateResetToBranchMenu,
-			Description: gui.Tr.SLocalize("viewResetOptions"),
+			Description: gui.Tr.LcViewResetOptions,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.RenameBranch),
 			Handler:     gui.handleRenameBranch,
-			Description: gui.Tr.SLocalize("renameBranch"),
+			Description: gui.Tr.LcRenameBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.wrappedHandler(gui.handleCopySelectedSideContextItemToClipboard),
-			Description: gui.Tr.SLocalize("copyBranchNameToClipboard"),
+			Description: gui.Tr.LcCopyBranchNameToClipboard,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{LOCAL_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.wrappedHandler(gui.handleSwitchToSubCommits),
-			Description: gui.Tr.SLocalize("viewCommits"),
+			Description: gui.Tr.LcViewCommits,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{TAGS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleCheckoutTag,
-			Description: gui.Tr.SLocalize("checkout"),
+			Description: gui.Tr.LcCheckout,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{TAGS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleDeleteTag,
-			Description: gui.Tr.SLocalize("deleteTag"),
+			Description: gui.Tr.LcDeleteTag,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{TAGS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.PushTag),
 			Handler:     gui.handlePushTag,
-			Description: gui.Tr.SLocalize("pushTag"),
+			Description: gui.Tr.LcPushTag,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{TAGS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.New),
 			Handler:     gui.handleCreateTag,
-			Description: gui.Tr.SLocalize("createTag"),
+			Description: gui.Tr.LcCreateTag,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{TAGS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateResetToTagMenu,
-			Description: gui.Tr.SLocalize("viewResetOptions"),
+			Description: gui.Tr.LcViewResetOptions,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{TAGS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.wrappedHandler(gui.handleSwitchToSubCommits),
-			Description: gui.Tr.SLocalize("viewCommits"),
+			Description: gui.Tr.LcViewCommits,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{REMOTE_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Return),
 			Handler:     gui.handleRemoteBranchesEscape,
-			Description: gui.Tr.SLocalize("ReturnToRemotesList"),
+			Description: gui.Tr.ReturnToRemotesList,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{REMOTE_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateResetToRemoteBranchMenu,
-			Description: gui.Tr.SLocalize("viewResetOptions"),
+			Description: gui.Tr.LcViewResetOptions,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{REMOTE_BRANCHES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.wrappedHandler(gui.handleSwitchToSubCommits),
-			Description: gui.Tr.SLocalize("viewCommits"),
+			Description: gui.Tr.LcViewCommits,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{REMOTES_CONTEXT_KEY},
 			Key:         gui.getKey(config.Branches.FetchRemote),
 			Handler:     gui.handleFetchRemote,
-			Description: gui.Tr.SLocalize("fetchRemote"),
+			Description: gui.Tr.LcFetchRemote,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.SquashDown),
 			Handler:     gui.handleCommitSquashDown,
-			Description: gui.Tr.SLocalize("squashDown"),
+			Description: gui.Tr.LcSquashDown,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.RenameCommit),
 			Handler:     gui.handleRenameCommit,
-			Description: gui.Tr.SLocalize("renameCommit"),
+			Description: gui.Tr.LcRenameCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.RenameCommitWithEditor),
 			Handler:     gui.handleRenameCommitEditor,
-			Description: gui.Tr.SLocalize("renameCommitEditor"),
+			Description: gui.Tr.LcRenameCommitEditor,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateCommitResetMenu,
-			Description: gui.Tr.SLocalize("resetToThisCommit"),
+			Description: gui.Tr.LcResetToThisCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.MarkCommitAsFixup),
 			Handler:     gui.handleCommitFixup,
-			Description: gui.Tr.SLocalize("fixupCommit"),
+			Description: gui.Tr.LcFixupCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.CreateFixupCommit),
 			Handler:     gui.handleCreateFixupCommit,
-			Description: gui.Tr.SLocalize("createFixupCommit"),
+			Description: gui.Tr.LcCreateFixupCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.SquashAboveCommits),
 			Handler:     gui.handleSquashAllAboveFixupCommits,
-			Description: gui.Tr.SLocalize("squashAboveCommits"),
+			Description: gui.Tr.LcSquashAboveCommits,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleCommitDelete,
-			Description: gui.Tr.SLocalize("deleteCommit"),
+			Description: gui.Tr.LcDeleteCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.MoveDownCommit),
 			Handler:     gui.handleCommitMoveDown,
-			Description: gui.Tr.SLocalize("moveDownCommit"),
+			Description: gui.Tr.LcMoveDownCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.MoveUpCommit),
 			Handler:     gui.handleCommitMoveUp,
-			Description: gui.Tr.SLocalize("moveUpCommit"),
+			Description: gui.Tr.LcMoveUpCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Edit),
 			Handler:     gui.handleCommitEdit,
-			Description: gui.Tr.SLocalize("editCommit"),
+			Description: gui.Tr.LcEditCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.AmendToCommit),
 			Handler:     gui.handleCommitAmendTo,
-			Description: gui.Tr.SLocalize("amendToCommit"),
+			Description: gui.Tr.LcAmendToCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.PickCommit),
 			Handler:     gui.handleCommitPick,
-			Description: gui.Tr.SLocalize("pickCommit"),
+			Description: gui.Tr.LcPickCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.RevertCommit),
 			Handler:     gui.handleCommitRevert,
-			Description: gui.Tr.SLocalize("revertCommit"),
+			Description: gui.Tr.LcRevertCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.CherryPickCopy),
 			Handler:     gui.wrappedHandler(gui.handleCopyCommit),
-			Description: gui.Tr.SLocalize("cherryPickCopy"),
+			Description: gui.Tr.LcCherryPickCopy,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.wrappedHandler(gui.handleCopySelectedSideContextItemToClipboard),
-			Description: gui.Tr.SLocalize("copyCommitShaToClipboard"),
+			Description: gui.Tr.LcCopyCommitShaToClipboard,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.CherryPickCopyRange),
 			Handler:     gui.wrappedHandler(gui.handleCopyCommitRange),
-			Description: gui.Tr.SLocalize("cherryPickCopyRange"),
+			Description: gui.Tr.LcCherryPickCopyRange,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.PasteCommits),
 			Handler:     gui.wrappedHandler(gui.HandlePasteCommits),
-			Description: gui.Tr.SLocalize("pasteCommits"),
+			Description: gui.Tr.LcPasteCommits,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.wrappedHandler(gui.handleViewCommitFiles),
-			Description: gui.Tr.SLocalize("viewCommitFiles"),
+			Description: gui.Tr.LcViewCommitFiles,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.CheckoutCommit),
 			Handler:     gui.handleCheckoutCommit,
-			Description: gui.Tr.SLocalize("checkoutCommit"),
+			Description: gui.Tr.LcCheckoutCommit,
 		},
 		{
 			ViewName:    "commits",
@@ -805,162 +805,162 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Key:         gui.getKey(config.Universal.New),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.wrappedHandler(gui.handleNewBranchOffCurrentItem),
-			Description: gui.Tr.SLocalize("createNewBranchFromCommit"),
+			Description: gui.Tr.LcCreateNewBranchFromCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.TagCommit),
 			Handler:     gui.handleTagCommit,
-			Description: gui.Tr.SLocalize("tagCommit"),
+			Description: gui.Tr.LcTagCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ResetCherryPick),
 			Handler:     gui.wrappedHandler(gui.exitCherryPickingMode),
-			Description: gui.Tr.SLocalize("resetCherryPick"),
+			Description: gui.Tr.LcResetCherryPick,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{REFLOG_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.wrappedHandler(gui.handleViewReflogCommitFiles),
-			Description: gui.Tr.SLocalize("viewCommitFiles"),
+			Description: gui.Tr.LcViewCommitFiles,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{REFLOG_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleCheckoutReflogCommit,
-			Description: gui.Tr.SLocalize("checkoutCommit"),
+			Description: gui.Tr.LcCheckoutCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{REFLOG_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateReflogResetMenu,
-			Description: gui.Tr.SLocalize("viewResetOptions"),
+			Description: gui.Tr.LcViewResetOptions,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{REFLOG_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.CherryPickCopy),
 			Handler:     gui.wrappedHandler(gui.handleCopyCommit),
-			Description: gui.Tr.SLocalize("cherryPickCopy"),
+			Description: gui.Tr.LcCherryPickCopy,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{REFLOG_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.CherryPickCopyRange),
 			Handler:     gui.wrappedHandler(gui.handleCopyCommitRange),
-			Description: gui.Tr.SLocalize("cherryPickCopyRange"),
+			Description: gui.Tr.LcCherryPickCopyRange,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{REFLOG_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ResetCherryPick),
 			Handler:     gui.wrappedHandler(gui.exitCherryPickingMode),
-			Description: gui.Tr.SLocalize("resetCherryPick"),
+			Description: gui.Tr.LcResetCherryPick,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{REFLOG_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.wrappedHandler(gui.handleCopySelectedSideContextItemToClipboard),
-			Description: gui.Tr.SLocalize("copyCommitShaToClipboard"),
+			Description: gui.Tr.LcCopyCommitShaToClipboard,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.wrappedHandler(gui.handleCopySelectedSideContextItemToClipboard),
-			Description: gui.Tr.SLocalize("copyCommitFileNameToClipboard"),
+			Description: gui.Tr.LcCopyCommitFileNameToClipboard,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{SUB_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.wrappedHandler(gui.handleViewSubCommitFiles),
-			Description: gui.Tr.SLocalize("viewCommitFiles"),
+			Description: gui.Tr.LcViewCommitFiles,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{SUB_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleCheckoutSubCommit,
-			Description: gui.Tr.SLocalize("checkoutCommit"),
+			Description: gui.Tr.LcCheckoutCommit,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{SUB_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.wrappedHandler(gui.handleCreateSubCommitResetMenu),
-			Description: gui.Tr.SLocalize("viewResetOptions"),
+			Description: gui.Tr.LcViewResetOptions,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{SUB_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.New),
 			Handler:     gui.wrappedHandler(gui.handleNewBranchOffCurrentItem),
-			Description: gui.Tr.SLocalize("newBranch"),
+			Description: gui.Tr.LcNewBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{SUB_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.CherryPickCopy),
 			Handler:     gui.wrappedHandler(gui.handleCopyCommit),
-			Description: gui.Tr.SLocalize("cherryPickCopy"),
+			Description: gui.Tr.LcCherryPickCopy,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{SUB_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.CherryPickCopyRange),
 			Handler:     gui.wrappedHandler(gui.handleCopyCommitRange),
-			Description: gui.Tr.SLocalize("cherryPickCopyRange"),
+			Description: gui.Tr.LcCherryPickCopyRange,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{SUB_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Commits.ResetCherryPick),
 			Handler:     gui.wrappedHandler(gui.exitCherryPickingMode),
-			Description: gui.Tr.SLocalize("resetCherryPick"),
+			Description: gui.Tr.LcResetCherryPick,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{SUB_COMMITS_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.wrappedHandler(gui.handleCopySelectedSideContextItemToClipboard),
-			Description: gui.Tr.SLocalize("copyCommitShaToClipboard"),
+			Description: gui.Tr.LcCopyCommitShaToClipboard,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.wrappedHandler(gui.handleViewStashFiles),
-			Description: gui.Tr.SLocalize("viewStashFiles"),
+			Description: gui.Tr.LcViewStashFiles,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleStashApply,
-			Description: gui.Tr.SLocalize("apply"),
+			Description: gui.Tr.LcApply,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Stash.PopStash),
 			Handler:     gui.handleStashPop,
-			Description: gui.Tr.SLocalize("pop"),
+			Description: gui.Tr.LcPop,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleStashDrop,
-			Description: gui.Tr.SLocalize("drop"),
+			Description: gui.Tr.LcDrop,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Universal.New),
 			Handler:     gui.wrappedHandler(gui.handleNewBranchOffCurrentItem),
-			Description: gui.Tr.SLocalize("newBranch"),
+			Description: gui.Tr.LcNewBranch,
 		},
 		{
 			ViewName: "commitMessage",
@@ -990,7 +990,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			ViewName:    "menu",
 			Key:         gui.getKey(config.Universal.Return),
 			Handler:     gui.handleMenuClose,
-			Description: gui.Tr.SLocalize("closeMenu"),
+			Description: gui.Tr.LcCloseMenu,
 		},
 		{
 			ViewName: "information",
@@ -1002,55 +1002,55 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.CommitFiles.CheckoutCommitFile),
 			Handler:     gui.handleCheckoutCommitFile,
-			Description: gui.Tr.SLocalize("checkoutCommitFile"),
+			Description: gui.Tr.LcCheckoutCommitFile,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleDiscardOldFileChange,
-			Description: gui.Tr.SLocalize("discardOldFileChange"),
+			Description: gui.Tr.LcDiscardOldFileChange,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.OpenFile),
 			Handler:     gui.handleOpenOldCommitFile,
-			Description: gui.Tr.SLocalize("openFile"),
+			Description: gui.Tr.LcOpenFile,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.Edit),
 			Handler:     gui.handleEditCommitFile,
-			Description: gui.Tr.SLocalize("editFile"),
+			Description: gui.Tr.LcEditFile,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleToggleFileForPatch,
-			Description: gui.Tr.SLocalize("toggleAddToPatch"),
+			Description: gui.Tr.LcToggleAddToPatch,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.handleEnterCommitFile,
-			Description: gui.Tr.SLocalize("enterFile"),
+			Description: gui.Tr.LcEnterFile,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.FilteringMenu),
 			Handler:     gui.handleCreateFilteringMenuPanel,
-			Description: gui.Tr.SLocalize("openScopingMenu"),
+			Description: gui.Tr.LcOpenScopingMenu,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.DiffingMenu),
 			Handler:     gui.handleCreateDiffingMenuPanel,
-			Description: gui.Tr.SLocalize("openDiffingMenu"),
+			Description: gui.Tr.LcOpenDiffingMenu,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.DiffingMenuAlt),
 			Handler:     gui.handleCreateDiffingMenuPanel,
-			Description: gui.Tr.SLocalize("openDiffingMenu"),
+			Description: gui.Tr.LcOpenDiffingMenu,
 		},
 		{
 			ViewName: "secondary",
@@ -1076,7 +1076,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Contexts:    []string{MAIN_NORMAL_CONTEXT_KEY},
 			Key:         gocui.MouseWheelDown,
 			Handler:     gui.scrollDownMain,
-			Description: gui.Tr.SLocalize("ScrollDown"),
+			Description: gui.Tr.ScrollDown,
 			Alternative: "fn+up",
 		},
 		{
@@ -1084,7 +1084,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Contexts:    []string{MAIN_NORMAL_CONTEXT_KEY},
 			Key:         gocui.MouseWheelUp,
 			Handler:     gui.scrollUpMain,
-			Description: gui.Tr.SLocalize("ScrollUp"),
+			Description: gui.Tr.ScrollUp,
 			Alternative: "fn+down",
 		},
 		{
@@ -1106,56 +1106,56 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Contexts:    []string{MAIN_STAGING_CONTEXT_KEY},
 			Key:         gui.getKey(config.Universal.Return),
 			Handler:     gui.wrappedHandler(gui.handleS