summaryrefslogtreecommitdiffstats
path: root/pkg/i18n
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2019-03-18 21:19:07 +1100
committerJesse Duffield <jessedduffield@gmail.com>2019-03-23 13:26:17 +1100
commitf502f75e1f56bf8f34d3fdf42e934919cd045d85 (patch)
tree27236dda4b1bd011d43e0bc1efb2e642371c6c6d /pkg/i18n
parentff97ef7b94b5ccfda1d8b98b0a7e21a779309fcc (diff)
add more options for resetting files in the working tree
Diffstat (limited to 'pkg/i18n')
-rw-r--r--pkg/i18n/dutch.go18
-rw-r--r--pkg/i18n/english.go18
-rw-r--r--pkg/i18n/polish.go18
3 files changed, 36 insertions, 18 deletions
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index add38dd59..662c7cce6 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -158,9 +158,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
ID: "FileNoMergeCons",
Other: "Dit bestand heeft geen merge conflicten",
}, &i18n.Message{
- ID: "SureResetHardHead",
- Other: "Weet je het zeker dat je `reset --hard HEAD` en `clean -fd` wil uitvoeren? Het kan dat je hierdoor bestanden verliest",
- }, &i18n.Message{
ID: "SureTo",
Other: "Weet je het zeker dat je {{.fileName}} wilt {{.deleteVerb}} (je veranderingen zullen worden verwijderd)",
}, &i18n.Message{
@@ -341,9 +338,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
ID: "CantCloseConfirmationPrompt",
Other: "Kon de bevestiging prompt niet sluiten: {{.error}}",
}, &i18n.Message{
- ID: "ClearFilePanel",
- Other: "maak bestandsvenster leeg",
- }, &i18n.Message{
ID: "MergeAborted",
Other: "Merge afgebroken",
}, &i18n.Message{
@@ -694,6 +688,18 @@ func addDutch(i18nObject *i18n.Bundle) error {
}, &i18n.Message{
ID: "discardUnstagedChanges",
Other: "discard unstaged changes",
+ }, &i18n.Message{
+ ID: "discardAllChangesToAllFiles",
+ Other: "nuke working tree",
+ }, &i18n.Message{
+ ID: "discardAnyUnstagedChanges",
+ Other: "discard unstaged changes",
+ }, &i18n.Message{
+ ID: "discardUntrackedFiles",
+ Other: "discard untracked files",
+ }, &i18n.Message{
+ ID: "hardReset",
+ Other: "hard reset",
},
)
}
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 7f22e82bd..4e2a6a094 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -181,9 +181,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "FileNoMergeCons",
Other: "This file has no inline merge conflicts",
}, &i18n.Message{
- ID: "SureResetHardHead",
- Other: "Are you sure you want to `reset --hard HEAD` and `clean -fd`? You may lose changes",
- }, &i18n.Message{
ID: "SoftReset",
Other: "Soft reset",
}, &i18n.Message{
@@ -406,9 +403,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "NoChangedFiles",
Other: "No changed files",
}, &i18n.Message{
- ID: "ClearFilePanel",
- Other: "Clear file panel",
- }, &i18n.Message{
ID: "MergeAborted",
Other: "Merge aborted",
}, &i18n.Message{
@@ -717,6 +711,18 @@ func addEnglish(i18nObject *i18n.Bundle) error {
}, &i18n.Message{
ID: "discardUnstagedChanges",
Other: "discard unstaged changes",
+ }, &i18n.Message{
+ ID: "discardAllChangesToAllFiles",
+ Other: "nuke working tree",
+ }, &i18n.Message{
+ ID: "discardAnyUnstagedChanges",
+ Other: "discard unstaged changes",
+ }, &i18n.Message{
+ ID: "discardUntrackedFiles",
+ Other: "discard untracked files",
+ }, &i18n.Message{
+ ID: "hardReset",
+ Other: "hard reset",
},
)
}
diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go
index b8e43059f..049c7cefa 100644
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -147,9 +147,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
ID: "FileNoMergeCons",
Other: "Ten plik nie powoduje konfliktów scalania",
}, &i18n.Message{
- ID: "SureResetHardHead",
- Other: "Jesteś pewny, że chcesz wykonać `reset --hard HEAD` i `clean -fd`? Możesz stracić wprowadzone zmiany",
- }, &i18n.Message{
ID: "SureTo",
Other: "Jesteś pewny, że chcesz {{.deleteVerb}} {{.fileName}} (stracisz swoje wprowadzone zmiany)?",
}, &i18n.Message{
@@ -333,9 +330,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
ID: "CantCloseConfirmationPrompt",
Other: "Nie można zamknąć monitu potwierdzenia: {{.error}}",
}, &i18n.Message{
- ID: "ClearFilePanel",
- Other: "Wyczyść panel plików",
- }, &i18n.Message{
ID: "MergeAborted",
Other: "Scalanie anulowane",
}, &i18n.Message{
@@ -677,6 +671,18 @@ func addPolish(i18nObject *i18n.Bundle) error {
}, &i18n.Message{
ID: "discardUnstagedChanges",
Other: "discard unstaged changes",
+ }, &i18n.Message{
+ ID: "discardAllChangesToAllFiles",
+ Other: "nuke working tree",
+ }, &i18n.Message{
+ ID: "discardAnyUnstagedChanges",
+ Other: "discard unstaged changes",
+ }, &i18n.Message{
+ ID: "discardUntrackedFiles",
+ Other: "discard untracked files",
+ }, &i18n.Message{
+ ID: "hardReset",
+ Other: "hard reset",
},
)
}