diff options
| author | Mark Kopenga <mkopenga@gmail.com> | 2018-12-08 16:41:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-08 16:41:39 +0100 |
| commit | 19a6a32625d59c61ecfe91ef8626390eb34a922a (patch) | |
| tree | b02d1a9c8477d2614f99cc80b40b54accf28c127 /pkg/i18n | |
| parent | 270658fc009dc254a80501fc1c9f5f82acd27239 (diff) | |
| parent | ff856b763033a241370bfde98d7386b43b7d0893 (diff) | |
Merge branch 'master' into https-ask-for-username-password
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/dutch.go | 4 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 10 | ||||
| -rw-r--r-- | pkg/i18n/polish.go | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index f62b60b90..bd5a30e6e 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -150,7 +150,7 @@ func addDutch(i18nObject *i18n.Bundle) error { Other: "Dit bestand heeft geen merge conflicten", }, &i18n.Message{ ID: "SureResetHardHead", - Other: "Weet je het zeker dat je `reset --hard HEAD` wil uitvoeren? Het kan dat je hierdoor bestanden verliest", + 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)", @@ -396,7 +396,7 @@ func addDutch(i18nObject *i18n.Bundle) error { Other: `refresh bestanden`, }, &i18n.Message{ ID: "resetHard", - Other: `harde reset`, + Other: `harde reset and verwijderen ongevolgde bestanden`, }, &i18n.Message{ ID: "mergeIntoCurrentBranch", Other: `merge in met huidige checked out branch`, diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 451b7bc0e..5806c8c03 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -158,7 +158,7 @@ func addEnglish(i18nObject *i18n.Bundle) error { Other: "This file has no merge conflicts", }, &i18n.Message{ ID: "SureResetHardHead", - Other: "Are you sure you want `reset --hard HEAD`? You may lose changes", + Other: "Are you sure you want `reset --hard HEAD` and `clean -fd`? You may lose changes", }, &i18n.Message{ ID: "SureTo", Other: "Are you sure you want to {{.deleteVerb}} {{.fileName}} (you will lose your changes)?", @@ -404,7 +404,7 @@ func addEnglish(i18nObject *i18n.Bundle) error { Other: `refresh files`, }, &i18n.Message{ ID: "resetHard", - Other: `reset hard`, + Other: `reset hard and remove untracked files`, }, &i18n.Message{ ID: "mergeIntoCurrentBranch", Other: `merge into currently checked out branch`, @@ -456,6 +456,12 @@ func addEnglish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "CantFindHunk", Other: `Could not find hunk`, + }, &i18n.Message{ + ID: "FastForward", + Other: `fast-forward this branch from its upstream`, + }, &i18n.Message{ + ID: "Fetching", + Other: "fetching and fast-forwarding {{.from}} -> {{.to}} ...", }, ) } diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 8470045e0..c8ff0c186 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -139,7 +139,7 @@ func addPolish(i18nObject *i18n.Bundle) error { Other: "Ten plik nie powoduje konfliktów scalania", }, &i18n.Message{ ID: "SureResetHardHead", - Other: "Jesteś pewny, że chcesz wykonać `reset --hard HEAD`? Możesz stracić wprowadzone zmiany", + 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)?", @@ -382,7 +382,7 @@ func addPolish(i18nObject *i18n.Bundle) error { Other: `odśwież pliki`, }, &i18n.Message{ ID: "resetHard", - Other: `zresetuj twardo`, + Other: `zresetuj twardo i usuń niepotwierdzone pliki`, }, &i18n.Message{ ID: "mergeIntoCurrentBranch", Other: `scal do obecnej gałęzi`, |