summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorChris Burgin <chris.burgin@agilebits.com>2021-12-02 19:08:53 -0500
committerJesse Duffield <jessedduffield@gmail.com>2021-12-25 11:50:06 +1100
commit4f627e5d27ed0b1f5767bd5b629616b30a9fa011 (patch)
tree17eed66735a7a23e507a099328a804b1f80f78b3 /pkg
parent089e3bf4feab523794d84b9b4051b4d8a3de1e2d (diff)
wrap branch names in quotes
Diffstat (limited to 'pkg')
-rw-r--r--pkg/i18n/dutch.go12
-rw-r--r--pkg/i18n/english.go10
-rw-r--r--pkg/i18n/polish.go10
3 files changed, 16 insertions, 16 deletions
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index fff0f7b31..409ffeda9 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -50,11 +50,11 @@ func dutchTranslationSet() TranslationSet {
SureForceCheckout: "Weet je zeker dat je het uitchecken wil forceren? Al je lokale verandering zullen worden verwijdert",
ForceCheckoutBranch: "Forceer uitchecken op deze branch",
BranchName: "Branch naam",
- NewBranchNameBranchOff: "Nieuw branch naam (Branch is afgeleid van {{.branchName}})",
+ NewBranchNameBranchOff: "Nieuw branch naam (Branch is afgeleid van '{{.branchName}}')",
CantDeleteCheckOutBranch: "Je kan een uitgecheckte branch niet verwijderen!",
DeleteBranch: "Verwijder branch",
- DeleteBranchMessage: "Weet je zeker dat je branch {{.selectedBranchName}} wilt verwijderen?",
- ForceDeleteBranchMessage: "Weet je zeker dat je branch {{.selectedBranchName}} geforceerd wil verwijderen?",
+ DeleteBranchMessage: "Weet je zeker dat je branch '{{.selectedBranchName}}' wilt verwijderen?",
+ ForceDeleteBranchMessage: "Weet je zeker dat je branch '{{.selectedBranchName}}' geforceerd wil verwijderen?",
LcRebaseBranch: "rebase branch",
CantRebaseOntoSelf: "Je kan niet een branch rebasen op zichzelf",
CantMergeBranchIntoItself: "Je kan niet een branch in zichzelf mergen",
@@ -175,8 +175,8 @@ func dutchTranslationSet() TranslationSet {
ConflictsResolved: "alle merge conflicten zijn opgelost. Wilt je verder gaan?",
RebasingTitle: "Rebasen",
MergingTitle: "Mergen",
- ConfirmRebase: "Weet je zeker dat je {{.checkedOutBranch}} op {{.selectedBranch}} wil rebasen?",
- ConfirmMerge: "Weet je zeker dat je {{.selectedBranch}} in {{.checkedOutBranch}} wil mergen?",
+ ConfirmRebase: "Weet je zeker dat je '{{.checkedOutBranch}}' op '{{.selectedBranch}}' wil rebasen?",
+ ConfirmMerge: "Weet je zeker dat je '{{.selectedBranch}}' in '{{.checkedOutBranch}}' wil mergen?",
FwdNoUpstream: "Kan niet de branch vooruitspoelen zonder upstream",
FwdCommitsToPush: "Je kan niet vooruitspoelen als de branch geen nieuwe commits heeft",
ErrorOccurred: "Er is iets fout gegaan! Zou je hier een issue aan willen maken",
@@ -295,7 +295,7 @@ func dutchTranslationSet() TranslationSet {
SureCheckoutThisCommit: "Weet je zeker dat je deze commit wil uitchecken?",
LcGitFlowOptions: "laat git-flow opties zien",
NotAGitFlowBranch: "Dit lijkt geen git flow branch te zijn",
- NewGitFlowBranchPrompt: "nieuwe {{.branchType}} naam:",
+ NewGitFlowBranchPrompt: "nieuwe '{{.branchType}}' naam:",
IgnoreTracked: "Negeer tracked bestand",
IgnoreTrackedPrompt: "weet je zeker dat je een getracked bestand wil negeren?",
LcViewResetToUpstreamOptions: "bekijk upstream reset opties",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 0a83076ca..be81da05c 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -606,11 +606,11 @@ func englishTranslationSet() TranslationSet {
SureForceCheckout: "Are you sure you want force checkout? You will lose all local changes",
ForceCheckoutBranch: "Force Checkout Branch",
BranchName: "Branch name",
- NewBranchNameBranchOff: "New Branch Name (Branch is off of {{.branchName}})",
+ NewBranchNameBranchOff: "New Branch Name (Branch is off of '{{.branchName}}')",
CantDeleteCheckOutBranch: "You cannot delete the checked out branch!",
DeleteBranch: "Delete Branch",
- DeleteBranchMessage: "Are you sure you want to delete the branch {{.selectedBranchName}}?",
- ForceDeleteBranchMessage: "{{.selectedBranchName}} is not fully merged. Are you sure you want to delete it?",
+ DeleteBranchMessage: "Are you sure you want to delete the branch '{{.selectedBranchName}}'?",
+ ForceDeleteBranchMessage: "'{{.selectedBranchName}}' is not fully merged. Are you sure you want to delete it?",
LcRebaseBranch: "rebase checked-out branch onto this branch",
CantRebaseOntoSelf: "You cannot rebase a branch onto itself",
CantMergeBranchIntoItself: "You cannot merge a branch into itself",
@@ -731,8 +731,8 @@ func englishTranslationSet() TranslationSet {
GlobalTitle: "Global Keybindings",
ConflictsResolved: "all merge conflicts resolved. Continue?",
RebasingTitle: "Rebasing",
- ConfirmRebase: "Are you sure you want to rebase {{.checkedOutBranch}} onto {{.selectedBranch}}?",
- ConfirmMerge: "Are you sure you want to merge {{.selectedBranch}} into {{.checkedOutBranch}}?",
+ ConfirmRebase: "Are you sure you want to rebase '{{.checkedOutBranch}}' onto '{{.selectedBranch}}'?",
+ ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?",
FwdNoUpstream: "Cannot fast-forward a branch with no upstream",
FwdCommitsToPush: "Cannot fast-forward a branch with commits to push",
ErrorOccurred: "An error occurred! Please create an issue at",
diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go
index 9baaeafcb..7a63f5d60 100644
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -44,11 +44,11 @@ func polishTranslationSet() TranslationSet {
SureForceCheckout: "Jesteś pewny, że chcesz wymusić przełączenie? Stracisz wszystkie lokalne zmiany",
ForceCheckoutBranch: "Wymuś przełączenie gałęzi",
BranchName: "Nazwa gałęzi",
- NewBranchNameBranchOff: "Nazwa nowej gałęzi (gałąź na bazie {{.branchName}})",
+ NewBranchNameBranchOff: "Nazwa nowej gałęzi (gałąź na bazie '{{.branchName}}')",
CantDeleteCheckOutBranch: "Nie możesz usunąć obecnie przełączonej gałęzi!",
DeleteBranch: "Usuń gałąź",
- DeleteBranchMessage: "Jesteś pewien, że chcesz usunąć gałąź {{.selectedBranchName}} ?",
- ForceDeleteBranchMessage: "Na pewno wymusić usunięcie gałęzi {{.selectedBranchName}}?",
+ DeleteBranchMessage: "Jesteś pewien, że chcesz usunąć gałąź '{{.selectedBranchName}}' ?",
+ ForceDeleteBranchMessage: "Na pewno wymusić usunięcie gałęzi '{{.selectedBranchName}}'?",
LcRebaseBranch: "zmiana bazy gałęzi",
CantRebaseOntoSelf: "Nie możesz zmienić bazy gałęzi na nią samą",
CantMergeBranchIntoItself: "Nie możesz scalić gałęzi do samej siebie",
@@ -119,8 +119,8 @@ func polishTranslationSet() TranslationSet {
ReturnToFilesPanel: "wróć do panelu plików",
RebasingTitle: "Zmiana bazy",
MergingTitle: "Scalanie",
- ConfirmRebase: "Czy napewno chcesz zmienić bazę {{.checkedOutBranch}} na {{.selectedBranch}}?",
- ConfirmMerge: "Czy na pewno chcesz scalić {{.selectedBranch}} do {{.checkedOutBranch}}?",
+ ConfirmRebase: "Czy napewno chcesz zmienić bazę '{{.checkedOutBranch}}' na '{{.selectedBranch}}'?",
+ ConfirmMerge: "Czy na pewno chcesz scalić '{{.selectedBranch}}' do '{{.checkedOutBranch}}'?",
FwdNoUpstream: "Nie można przewinąć gałęzi bez gałęzi nadrzędnej",
FwdCommitsToPush: "Nie można przewinąć gałęzi z commitami do wysłania",
ErrorOccurred: "Wystąpił błąd! Zgłoś problem na",