Merge branch 'hotfix/cursor-positioning' into feature/recent-repos

3 files changed, 208 insertions, 10 deletions

diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index 0ce156cd5..cd1282de2 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -35,12 +35,24 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			ID:    "CommitChanges",
 			Other: "Commit Veranderingen",
 		}, &i18n.Message{
+			ID:    "CommitChangesWithEditor",
+			Other: "commit Veranderingen met de git editor",
+		}, &i18n.Message{
 			ID:    "StatusTitle",
 			Other: "Status",
 		}, &i18n.Message{
+			ID:    "GlobalTitle",
+			Other: "Global",
+		}, &i18n.Message{
 			ID:    "navigate",
 			Other: "navigeer",
 		}, &i18n.Message{
+			ID:    "menu",
+			Other: "menu",
+		}, &i18n.Message{
+			ID:    "execute",
+			Other: "uitvoeren",
+		}, &i18n.Message{
 			ID:    "stashFiles",
 			Other: "stash-bestanden",
 		}, &i18n.Message{
@@ -66,7 +78,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			Other: "verandering toevoegen",
 		}, &i18n.Message{
 			ID:    "edit",
-			Other: "veranderen",
+			Other: "verander",
 		}, &i18n.Message{
 			ID:    "scroll",
 			Other: "scroll",
@@ -173,6 +185,9 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			ID:    "CloseConfirm",
 			Other: "{{.keyBindClose}}: Sluiten, {{.keyBindConfirm}}: Bevestigen",
 		}, &i18n.Message{
+			ID:    "close",
+			Other: "sluiten",
+		}, &i18n.Message{
 			ID:    "SureResetThisCommit",
 			Other: "Weet je het zeker dat je wil resetten naar deze commit?",
 		}, &i18n.Message{
@@ -212,8 +227,11 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			ID:    "OnlyRenameTopCommit",
 			Other: "Je kan alleen de bovenste commit hernoemen",
 		}, &i18n.Message{
-			ID:    "RenameCommit",
-			Other: "Hernoem Commit",
+			ID:    "renameCommit",
+			Other: "hernoem commit",
+		}, &i18n.Message{
+			ID:    "renameCommitEditor",
+			Other: "rename commit with editor",
 		}, &i18n.Message{
 			ID:    "PotentialErrInGetselectedCommit",
 			Other: "Er is mogelijk een error in getSelected Commit (geen match tussen ui en state)",
@@ -296,8 +314,62 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			ID:    "MergeAborted",
 			Other: "Merge afgebroken",
 		}, &i18n.Message{
+			ID:    "OpenConfig",
+			Other: "open config file",
+		}, &i18n.Message{
+			ID:    "EditConfig",
+			Other: "verander config file",
+		}, &i18n.Message{
+			ID:    "ForcePush",
+			Other: "Forceer push",
+		}, &i18n.Message{
+			ID:    "ForcePushPrompt",
+			Other: "Jou branch is afgeweken van de remote branch. Druk 'esc' om te anuleren, of 'enter' om geforceert te pushen.",
+		}, &i18n.Message{
+			ID:    "checkForUpdate",
+			Other: "check voor updates",
+		}, &i18n.Message{
+			ID:    "CheckingForUpdates",
+			Other: "checken voor updates...",
+		}, &i18n.Message{
+			ID:    "OnLatestVersionErr",
+			Other: "Je hebt al de laatste versie",
+		}, &i18n.Message{
+			ID:    "MajorVersionErr",
+			Other: "Nieuwe versie ({{.newVersion}}) is niet teruggaand compatibele vergeleken met de huidige versie ({{.currentVersion}})",
+		}, &i18n.Message{
+			ID:    "CouldNotFindBinaryErr",
+			Other: "Kon geen binary vinden op {{.url}}",
+		}, &i18n.Message{
+			ID:    "AnonymousReportingTitle",
+			Other: "Help maak lazygit beter",
+		}, &i18n.Message{
+			ID:    "AnonymousReportingPrompt",
+			Other: "Zou je anonieme data rapportage willen aanzetten om lazygit beter te kunnen maken? (enter/esc)",
+		}, &i18n.Message{
+			ID:    "removeFile",
+			Other: `Verwijder als untracked / uitchecken wordt gevolgd (ga weg)`,
+		}, &i18n.Message{
+			ID:    "editFile",
+			Other: `verander bestand`,
+		}, &i18n.Message{
+			ID:    "openFile",
+			Other: `open bestand`,
+		}, &i18n.Message{
+			ID:    "ignoreFile",
+			Other: `voeg toe aan .gitignore`,
+		}, &i18n.Message{
+			ID:    "refreshFiles",
+			Other: `refresh bestanden`,
+		}, &i18n.Message{
+			ID:    "resetHard",
+			Other: `harde reset`,
+		}, &i18n.Message{
+			ID:    "mergeIntoCurrentBranch",
+			Other: `merge in met huidige checked out branch`,
+		}, &i18n.Message{
 			ID:    "ConfirmQuit",
-			Other: `Are you sure you want to quit?`,
+			Other: `Weet je zeker dat je dit programma wil sluiten?`,
 		},
 	)
 }
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index f9707ced6..5843b5760 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -43,12 +43,24 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "CommitChanges",
 			Other: "commit changes",
 		}, &i18n.Message{
+			ID:    "CommitChangesWithEditor",
+			Other: "commit changes using git editor",
+		}, &i18n.Message{
 			ID:    "StatusTitle",
 			Other: "Status",
 		}, &i18n.Message{
+			ID:    "GlobalTitle",
+			Other: "Global",
+		}, &i18n.Message{
 			ID:    "navigate",
 			Other: "navigate",
 		}, &i18n.Message{
+			ID:    "menu",
+			Other: "menu",
+		}, &i18n.Message{
+			ID:    "execute",
+			Other: "execute",
+		}, &i18n.Message{
 			ID:    "stashFiles",
 			Other: "stash files",
 		}, &i18n.Message{
@@ -70,6 +82,12 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "refresh",
 			Other: "refresh",
 		}, &i18n.Message{
+			ID:    "push",
+			Other: "push",
+		}, &i18n.Message{
+			ID:    "pull",
+			Other: "pull",
+		}, &i18n.Message{
 			ID:    "addPatch",
 			Other: "add patch",
 		}, &i18n.Message{
@@ -184,6 +202,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "CloseConfirm",
 			Other: "{{.keyBindClose}}: close, {{.keyBindConfirm}}: confirm",
 		}, &i18n.Message{
+			ID:    "close",
+			Other: "close",
+		}, &i18n.Message{
 			ID:    "SureResetThisCommit",
 			Other: "Are you sure you want to reset to this commit?",
 		}, &i18n.Message{
@@ -223,8 +244,11 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "OnlyRenameTopCommit",
 			Other: "Can only rename topmost commit",
 		}, &i18n.Message{
-			ID:    "RenameCommit",
-			Other: "Rename Commit",
+			ID:    "renameCommit",
+			Other: "rename commit",
+		}, &i18n.Message{
+			ID:    "renameCommitEditor",
+			Other: "rename commit with editor",
 		}, &i18n.Message{
 			ID:    "PotentialErrInGetselectedCommit",
 			Other: "potential error in getSelected Commit (mismatched ui and state)",
@@ -319,8 +343,8 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "ForcePushPrompt",
 			Other: "Your branch has diverged from the remote branch. Press 'esc' to cancel, or 'enter' to force push.",
 		}, &i18n.Message{
-			ID:    "CheckForUpdate",
-			Other: "Check for update",
+			ID:    "checkForUpdate",
+			Other: "check for update",
 		}, &i18n.Message{
 			ID:    "CheckingForUpdates",
 			Other: "Checking for updates...",
@@ -343,8 +367,32 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "GitconfigParseErr",
 			Other: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`,
 		}, &i18n.Message{
+			ID:    "removeFile",
+			Other: `delete if untracked / checkout if tracked`,
+		}, &i18n.Message{
+			ID:    "editFile",
+			Other: `edit file`,
+		}, &i18n.Message{
+			ID:    "openFile",
+			Other: `open file`,
+		}, &i18n.Message{
+			ID:    "ignoreFile",
+			Other: `add to .gitignore`,
+		}, &i18n.Message{
+			ID:    "refreshFiles",
+			Other: `refresh files`,
+		}, &i18n.Message{
+			ID:    "resetHard",
+			Other: `reset hard`,
+		}, &i18n.Message{
+			ID:    "mergeIntoCurrentBranch",
+			Other: `merge into currently checked out branch`,
+		}, &i18n.Message{
 			ID:    "ConfirmQuit",
 			Other: `Are you sure you want to quit?`,
+		}, &i18n.Message{
+			ID:    "SwitchRepo",
+			Other: `Switch to a recent repo`,
 		},
 	)
 }
diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go
index 1de545274..c64ab87b8 100644
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -33,12 +33,24 @@ func addPolish(i18nObject *i18n.Bundle) error {
 			ID:    "CommitChanges",
 			Other: "commituj zmiany",
 		}, &i18n.Message{
+			ID:    "CommitChangesWithEditor",
+			Other: "commituj zmiany używając edytora z gita",
+		}, &i18n.Message{
 			ID:    "StatusTitle",
 			Other: "Status",
 		}, &i18n.Message{
+			ID:    "GlobalTitle",
+			Other: "Globalne",
+		}, &i18n.Message{
 			ID:    "navigate",
 			Other: "nawiguj",
 		}, &i18n.Message{
+			ID:    "menu",
+			Other: "menu",
+		}, &i18n.Message{
+			ID:    "execute",
+			Other: "wykonaj",
+		}, &i18n.Message{
 			ID:    "stashFiles",
 			Other: "przechowaj pliki",
 		}, &i18n.Message{
@@ -135,6 +147,9 @@ func addPolish(i18nObject *i18n.Bundle) error {
 			ID:    "DeleteBranchMessage",
 			Other: "Jesteś pewien, że chcesz usunąć gałąź {{.selectedBranchName}} ?",
 		}, &i18n.Message{
+			ID:    "ForceDeleteBranchMessage",
+			Other: "Na pewno wymusić usunięcie gałęzi {{.selectedBranchName}}?",
+		}, &i18n.Message{
 			ID:    "CantMergeBranchIntoItself",
 			Other: "Nie możesz scalić gałęzi do samej siebie",
 		}, &i18n.Message{
@@ -153,6 +168,9 @@ func addPolish(i18nObject *i18n.Bundle) error {
 			ID:    "deleteBranch",
 			Other: "usuń gałąź",
 		}, &i18n.Message{
+			ID:    "forceDeleteBranch",
+			Other: "usuń gałąź (wymuś)",
+		}, &i18n.Message{
 			ID:    "NoBranchesThisRepo",
 			Other: "Brak gałęzi dla tego repozytorium",
 		}, &i18n.Message{
@@ -165,6 +183,9 @@ func addPolish(i18nObject *i18n.Bundle) error {
 			ID:    "CloseConfirm",
 			Other: "{{.keyBindClose}}: zamknij, {{.keyBindConfirm}}: potwierdź",
 		}, &i18n.Message{
+			ID:    "close",
+			Other: "zamknij",
+		}, &i18n.Message{
 			ID:    "SureResetThisCommit",
 			Other: "Jesteś pewny, że chcesz zresetować ten commit?",
 		}, &i18n.Message{
@@ -204,8 +225,11 @@ func addPolish(i18nObject *i18n.Bundle) error {
 			ID:    "OnlyRenameTopCommit",
 			Other: "Można przmianować tylko najwyższy commit",
 		}, &i18n.Message{
-			ID:    "RenameCommit",
-			Other: "Przemianuj commit",
+			ID:    "renameCommit",
+			Other: "przemianuj commit",
+		}, &i18n.Message{
+			ID:    "renameCommitEditor",
+			Other: "przemianuj commit w edytorze",
 		}, &i18n.Message{
 			ID:    "PotentialErrInGetselectedCommit",
 			Other: "potencjalny błąd w getSelected Commit (niedopasowane ui i stan)",
@@ -288,6 +312,60 @@ func addPolish(i18nObject *i18n.Bundle) error {
 			ID:    "MergeAborted",
 			Other: "Scalanie anulowane",
 		}, &i18n.Message{
+			ID:    "OpenConfig",
+			Other: "otwórz plik konfiguracyjny",
+		}, &i18n.Message{
+			ID:    "EditConfig",
+			Other: "edytuj plik konfiguracyjny",
+		}, &i18n.Message{
+			ID:    "ForcePush",
+			Other: "Wymuś wypchnięcie",
+		}, &i18n.Message{
+			ID:    "ForcePushPrompt",
+			Other: "Twoja gałąź rozeszła się z gałęzią zdalną. Wciśnij 'esc' aby anulować lub 'enter' aby wymusić wypchnięcie.",
+		}, &i18n.Message{
+			ID:    "checkForUpdate",
+			Other: "sprawdź aktualizacje",
+		}, &i18n.Message{
+			ID:    "CheckingForUpdates",
+			Other: "Sprawdzanie aktualizacji...",
+		}, &i18n.Message{
+			ID:    "OnLatestVersionErr",
+			Other: "Już posiadasz najnowszą wersję",
+		}, &i18n.Message{
+			ID:    "MajorVersionErr",
+			Other: "Nowa wersja ({{.newVersion}}) posiada niekompatybilne zmiany w porównaniu do obecnej wersji ({{.currentVersion}})",
+		}, &i18n.Message{
+			ID:    "CouldNotFindBinaryErr",
+			Other: "Nie można znaleźć pliku binarnego w {{.url}}",
+		}, &i18n.Message{
+			ID:    "AnonymousReportingTitle",
+			Other: "Help make lazygit better",
+		}, &i18n.Message{
+			ID:    "AnonymousReportingPrompt",
+			Other: "Włączyć anonimowe raportowanie błędów w celu pomocy w usprawnianiu lazygita (enter/esc)?",
+		}, &i18n.Message{
+			ID:    "removeFile",
+			Other: `usuń jeśli nie śledzony / przełącz jeśli śledzony`,
+		}, &i18n.Message{
+			ID:    "editFile",
+			Other: `edytuj plik`,
+		}, &i18n.Message{
+			ID:    "openFile",
+			Other: `otwórz plik`,
+		}, &i18n.Message{
+			ID:    "ignoreFile",
+			Other: `dodaj do .gitignore`,
+		}, &i18n.Message{
+			ID:    "refreshFiles",
+			Other: `odśwież pliki`,
+		}, &i18n.Message{
+			ID:    "resetHard",
+			Other: `zresetuj twardo`,
+		}, &i18n.Message{
+			ID:    "mergeIntoCurrentBranch",
+			Other: `scal do obecnej gałęzi`,
+		}, &i18n.Message{
 			ID:    "ConfirmQuit",
 			Other: `Na pewno chcesz wyjść z programu?`,
 		},