1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-09 13:47:11 +02:00

Translated missing sentences

This commit is contained in:
mjarkk 2019-04-14 17:21:21 +02:00 committed by Jesse Duffield
parent 471733fe03
commit e9fbb608a8
4 changed files with 114 additions and 114 deletions

View File

@ -25,7 +25,7 @@
<kbd>A</kbd>: wijzig laatste commit <kbd>A</kbd>: wijzig laatste commit
<kbd>C</kbd>: commit veranderingen met de git editor <kbd>C</kbd>: commit veranderingen met de git editor
<kbd>space</kbd>: toggle staged <kbd>space</kbd>: toggle staged
<kbd>d</kbd>: view 'discard changes' options <kbd>d</kbd>: bekijk 'ongedaan maken' opties
<kbd>e</kbd>: verander bestand <kbd>e</kbd>: verander bestand
<kbd>o</kbd>: open bestand <kbd>o</kbd>: open bestand
<kbd>i</kbd>: voeg toe aan .gitignore <kbd>i</kbd>: voeg toe aan .gitignore
@ -57,55 +57,55 @@
<pre> <pre>
<kbd>s</kbd>: squash beneden <kbd>s</kbd>: squash beneden
<kbd>r</kbd>: hernoem commit <kbd>r</kbd>: hernoem commit
<kbd>R</kbd>: rename commit with editor <kbd>R</kbd>: hernoem commit met editor
<kbd>g</kbd>: reset naar deze commit <kbd>g</kbd>: reset naar deze commit
<kbd>f</kbd>: Fixup commit <kbd>f</kbd>: Fixup commit
<kbd>d</kbd>: delete commit <kbd>d</kbd>: verwijder commit
<kbd>J</kbd>: move commit down one <kbd>J</kbd>: verplaats commit 1 omlaag
<kbd>K</kbd>: move commit up one <kbd>K</kbd>: verplaats commit 1 omhoog
<kbd>e</kbd>: edit commit <kbd>e</kbd>: wijzig commit
<kbd>A</kbd>: amend commit with staged changes <kbd>A</kbd>: wijzig commit met gestagte veranderingen
<kbd>p</kbd>: pick commit (when mid-rebase) <kbd>p</kbd>: pick commit (when mid-rebase)
<kbd>t</kbd>: revert commit <kbd>t</kbd>: zet commit terug
<kbd>c</kbd>: copy commit (cherry-pick) <kbd>c</kbd>: kopiëer commit (cherry-pick)
<kbd>C</kbd>: copy commit range (cherry-pick) <kbd>C</kbd>: kopiëer commit range (cherry-pick)
<kbd>v</kbd>: paste commits (cherry-pick) <kbd>v</kbd>: plak commits (cherry-pick)
<kbd>enter</kbd>: view commit's files <kbd>enter</kbd>: bekijk commited bestanden
<kbd>space</kbd>: diff specific commits <kbd>space</kbd>: diff specifieke commit's
</pre> </pre>
## Stash ## Stash
<pre> <pre>
<kbd>space</kbd>: toepassen <kbd>space</kbd>: toepassen
<kbd>g</kbd>: pop <kbd>g</kbd>: poppen
<kbd>d</kbd>: drop <kbd>d</kbd>: drop
</pre> </pre>
## Commit files ## Commit files
<pre> <pre>
<kbd>esc</kbd>: go back <kbd>esc</kbd>: ga terug
<kbd>c</kbd>: checkout file <kbd>c</kbd>: checkout bestand
<kbd>d</kbd>: discard this commit's changes to this file <kbd>d</kbd>: uitsluit deze commit zijn veranderingen aan dit bestand
<kbd>o</kbd>: open bestand <kbd>o</kbd>: open bestand
</pre> </pre>
## Main (Normal) ## Main (Normal)
<pre> <pre>
<kbd>PgDn</kbd>: scroll down <kbd>PgDn</kbd>: scroll omhoog
<kbd>PgUp</kbd>: scroll up <kbd>PgUp</kbd>: scroll omlaag
</pre> </pre>
## Main (Stage Lines/Hunks) ## Main (Stage Lines/Hunks)
<pre> <pre>
<kbd>esc</kbd>: ga terug naar het bestanden paneel <kbd>esc</kbd>: ga terug naar het bestanden paneel
<kbd></kbd>: select previous line <kbd></kbd>: selecteer vorige line
<kbd></kbd>: select next line <kbd></kbd>: selecteer volgende line
<kbd></kbd>: select previous hunk <kbd></kbd>: selecteer vorige hunk
<kbd></kbd>: select next hunk <kbd></kbd>: selecteer volgende hunk
<kbd>space</kbd>: stage lijn <kbd>space</kbd>: stage lijn
<kbd>a</kbd>: stage hunk <kbd>a</kbd>: stage hunk
</pre> </pre>
@ -115,10 +115,10 @@
<pre> <pre>
<kbd>esc</kbd>: ga terug naar het bestanden paneel <kbd>esc</kbd>: ga terug naar het bestanden paneel
<kbd>space</kbd>: pick hunk <kbd>space</kbd>: pick hunk
<kbd>b</kbd>: pick both hunks <kbd>b</kbd>: pick bijde hunks
<kbd></kbd>: select previous conflict <kbd></kbd>: selecteer vorige conflict
<kbd></kbd>: select next conflict <kbd></kbd>: selecteer volgende conflict
<kbd></kbd>: select top hunk <kbd></kbd>: selecteer bovenste hunk
<kbd></kbd>: select bottom hunk <kbd></kbd>: selecteer laatste hunk
<kbd>z</kbd>: undo <kbd>z</kbd>: ongedaan maken
</pre> </pre>

View File

@ -453,34 +453,34 @@ func addDutch(i18nObject *i18n.Bundle) error {
Other: "Merging", Other: "Merging",
}, &i18n.Message{ }, &i18n.Message{
ID: "ConfirmRebase", ID: "ConfirmRebase",
Other: "Are you sure you want to rebase {{.checkedOutBranch}} onto {{.selectedBranch}}?", Other: "Weet je zeker dat je {{.checkedOutBranch}} naar {{.selectedBranch}} wil rebasen?",
}, &i18n.Message{ }, &i18n.Message{
ID: "ConfirmMerge", ID: "ConfirmMerge",
Other: "Are you sure you want to merge {{.selectedBranch}} into {{.checkedOutBranch}}?", Other: "Weet je zeker dat je {{.selectedBranch}} in {{.checkedOutBranch}} wil mergen?",
}, &i18n.Message{ }, &i18n.Message{
ID: "FwdNoUpstream", ID: "FwdNoUpstream",
Other: "Cannot fast-forward a branch with no upstream", Other: "can niet de branch niet vooruitspoelen met upstream",
}, &i18n.Message{ }, &i18n.Message{
ID: "ErrorOccurred", ID: "ErrorOccurred",
Other: "An error occurred! Please create an issue at https://github.com/jesseduffield/lazygit/issues", Other: "Er is iets fout gegaan! Zou je een issue willen maken hier https://github.com/jesseduffield/lazygit/issues",
}, &i18n.Message{ }, &i18n.Message{
ID: "FwdCommitsToPush", ID: "FwdCommitsToPush",
Other: "Cannot fast-forward a branch with commits to push", Other: "Kan niet vooruitspoelen, er zijn commits not niet gepushed",
}, &i18n.Message{ }, &i18n.Message{
ID: "MainTitle", ID: "MainTitle",
Other: "Main", Other: "Hoofd",
}, &i18n.Message{ }, &i18n.Message{
ID: "NormalTitle", ID: "NormalTitle",
Other: "Normal", Other: "Normaal",
}, &i18n.Message{ }, &i18n.Message{
ID: "softReset", ID: "softReset",
Other: "soft reset", Other: "zacht reset",
}, &i18n.Message{ }, &i18n.Message{
ID: "CantRebaseOntoSelf", ID: "CantRebaseOntoSelf",
Other: "You cannot rebase a branch onto itself", Other: "Je kan niet een branch rebasen op zichzelf",
}, &i18n.Message{ }, &i18n.Message{
ID: "SureSquashThisCommit", ID: "SureSquashThisCommit",
Other: "Are you sure you want to squash this commit into the commit below?", Other: "Weet je zeker dat je deze commit wil squashen in de commit hieronder?",
}, &i18n.Message{ }, &i18n.Message{
ID: "Squash", ID: "Squash",
Other: "Squash", Other: "Squash",
@ -489,130 +489,130 @@ func addDutch(i18nObject *i18n.Bundle) error {
Other: "pick commit (when mid-rebase)", Other: "pick commit (when mid-rebase)",
}, &i18n.Message{ }, &i18n.Message{
ID: "revertCommit", ID: "revertCommit",
Other: "revert commit", Other: "terug naar commit",
}, &i18n.Message{ }, &i18n.Message{
ID: "deleteCommit", ID: "deleteCommit",
Other: "delete commit", Other: "verwijder commit",
}, &i18n.Message{ }, &i18n.Message{
ID: "moveDownCommit", ID: "moveDownCommit",
Other: "move commit down one", Other: "verplaats commit 1 omlaag",
}, &i18n.Message{ }, &i18n.Message{
ID: "moveUpCommit", ID: "moveUpCommit",
Other: "move commit up one", Other: "verplaats commit 1 omhoog",
}, &i18n.Message{ }, &i18n.Message{
ID: "editCommit", ID: "editCommit",
Other: "edit commit", Other: "verander commit",
}, &i18n.Message{ }, &i18n.Message{
ID: "amendToCommit", ID: "amendToCommit",
Other: "amend commit with staged changes", Other: "wijzig commit met staged veranderingen",
}, &i18n.Message{ }, &i18n.Message{
ID: "FoundConflicts", ID: "FoundConflicts",
Other: "Damn, conflicts! To abort press 'esc', otherwise press 'enter'", Other: "Conflicten!, Om af te breken druk 'esc', anders druk op 'enter'",
}, &i18n.Message{ }, &i18n.Message{
ID: "FoundConflictsTitle", ID: "FoundConflictsTitle",
Other: "Auto-merge failed", Other: "Auto-merge mislukt",
}, &i18n.Message{ }, &i18n.Message{
ID: "Undo", ID: "Undo",
Other: "undo", Other: "ongedaan maken",
}, &i18n.Message{ }, &i18n.Message{
ID: "PickHunk", ID: "PickHunk",
Other: "pick hunk", Other: "pick hunk",
}, &i18n.Message{ }, &i18n.Message{
ID: "PickBothHunks", ID: "PickBothHunks",
Other: "pick both hunks", Other: "pick bijde hunks",
}, &i18n.Message{ }, &i18n.Message{
ID: "ViewMergeRebaseOptions", ID: "ViewMergeRebaseOptions",
Other: "view merge/rebase options", Other: "bekijk merge/rebase opties",
}, &i18n.Message{ }, &i18n.Message{
ID: "NotMergingOrRebasing", ID: "NotMergingOrRebasing",
Other: "You are currently neither rebasing nor merging", Other: "Je bent momenteel niet aan het rebasen of mergen",
}, &i18n.Message{ }, &i18n.Message{
ID: "RecentRepos", ID: "RecentRepos",
Other: "recent repositories", Other: "recent repositories",
}, &i18n.Message{ }, &i18n.Message{
ID: "MergeOptionsTitle", ID: "MergeOptionsTitle",
Other: "Merge Options", Other: "Merge Opties",
}, &i18n.Message{ }, &i18n.Message{
ID: "RebaseOptionsTitle", ID: "RebaseOptionsTitle",
Other: "Rebase Options", Other: "Rebase Opties",
}, &i18n.Message{ }, &i18n.Message{
ID: "ConflictsResolved", ID: "ConflictsResolved",
Other: "all merge conflicts resolved. Continue?", Other: "alle merge conflicten zijn opgelost. Verder?",
}, &i18n.Message{ }, &i18n.Message{
ID: "NoRoom", ID: "NoRoom",
Other: "Not enough room", Other: "Niet genoeg ruimte",
}, &i18n.Message{ }, &i18n.Message{
ID: "YouAreHere", ID: "YouAreHere",
Other: "YOU ARE HERE", Other: "JE BENT HIER",
}, &i18n.Message{ }, &i18n.Message{
ID: "rewordNotSupported", ID: "rewordNotSupported",
Other: "rewording commits while interactively rebasing is not currently supported", Other: "herformatteren van commits in interactiev rebasen is nog niet gesupport",
}, &i18n.Message{ }, &i18n.Message{
ID: "cherryPickCopy", ID: "cherryPickCopy",
Other: "copy commit (cherry-pick)", Other: "kopiëer commit (cherry-pick)",
}, &i18n.Message{ }, &i18n.Message{
ID: "cherryPickCopyRange", ID: "cherryPickCopyRange",
Other: "copy commit range (cherry-pick)", Other: "kopiëer commit reeks (cherry-pick)",
}, &i18n.Message{ }, &i18n.Message{
ID: "pasteCommits", ID: "pasteCommits",
Other: "paste commits (cherry-pick)", Other: "plak commits (cherry-pick)",
}, &i18n.Message{ }, &i18n.Message{
ID: "SureCherryPick", ID: "SureCherryPick",
Other: "Are you sure you want to cherry-pick the copied commits onto this branch?", Other: "Weet je zeker dat je de gekopieerde commits naar deze branch wil cherry-picken?",
}, &i18n.Message{ }, &i18n.Message{
ID: "CherryPick", ID: "CherryPick",
Other: "Cherry-Pick", Other: "Cherry-Pick",
}, &i18n.Message{ }, &i18n.Message{
ID: "CannotRebaseOntoFirstCommit", ID: "CannotRebaseOntoFirstCommit",
Other: "You cannot interactive rebase onto the first commit", Other: "Je kan niet interactiev rebasen naar de eerste commit",
}, &i18n.Message{ }, &i18n.Message{
ID: "CannotSquashOntoSecondCommit", ID: "CannotSquashOntoSecondCommit",
Other: "You cannot squash/fixup onto the second commit", Other: "Je kan niet een squash/fixup doen naar de 2de commit",
}, &i18n.Message{ }, &i18n.Message{
ID: "Donate", ID: "Donate",
Other: "Donate", Other: "Doneer",
}, &i18n.Message{ }, &i18n.Message{
ID: "PrevLine", ID: "PrevLine",
Other: "select previous line", Other: "selecteer de vorige lijn",
}, &i18n.Message{ }, &i18n.Message{
ID: "NextLine", ID: "NextLine",
Other: "select next line", Other: "selecteer de volgende lijn",
}, &i18n.Message{ }, &i18n.Message{
ID: "PrevHunk", ID: "PrevHunk",
Other: "select previous hunk", Other: "selecteer de vorige hunk",
}, &i18n.Message{ }, &i18n.Message{
ID: "NextHunk", ID: "NextHunk",
Other: "select next hunk", Other: "selecteer de volgende hunk",
}, &i18n.Message{ }, &i18n.Message{
ID: "PrevConflict", ID: "PrevConflict",
Other: "select previous conflict", Other: "selecteer voorgaand conflict",
}, &i18n.Message{ }, &i18n.Message{
ID: "NextConflict", ID: "NextConflict",
Other: "select next conflict", Other: "selecteer volgende conflict",
}, &i18n.Message{ }, &i18n.Message{
ID: "SelectTop", ID: "SelectTop",
Other: "select top hunk", Other: "selecteer bovenste hunk",
}, &i18n.Message{ }, &i18n.Message{
ID: "SelectBottom", ID: "SelectBottom",
Other: "select bottom hunk", Other: "selecteer bodem hunk",
}, &i18n.Message{ }, &i18n.Message{
ID: "ScrollDown", ID: "ScrollDown",
Other: "scroll down", Other: "scroll omlaag",
}, &i18n.Message{ }, &i18n.Message{
ID: "ScrollUp", ID: "ScrollUp",
Other: "scroll up", Other: "scroll omhoog",
}, &i18n.Message{ }, &i18n.Message{
ID: "AmendCommitTitle", ID: "AmendCommitTitle",
Other: "Amend Commit", Other: "Commit wijzigen",
}, &i18n.Message{ }, &i18n.Message{
ID: "AmendCommitPrompt", ID: "AmendCommitPrompt",
Other: "Are you sure you want to amend this commit with your staged files?", Other: "Weet je zeker dat je deze commit wil wijzigen met de vorige staged bestanden?",
}, &i18n.Message{ }, &i18n.Message{
ID: "DeleteCommitTitle", ID: "DeleteCommitTitle",
Other: "Delete Commit", Other: "Verwijder Commit",
}, &i18n.Message{ }, &i18n.Message{
ID: "DeleteCommitPrompt", ID: "DeleteCommitPrompt",
Other: "Are you sure you want to delete this commit?", Other: "Weet je zeker dat je deze commit wil verwijderen?",
}, &i18n.Message{ }, &i18n.Message{
ID: "SquashingStatus", ID: "SquashingStatus",
Other: "squashing", Other: "squashing",
@ -621,118 +621,118 @@ func addDutch(i18nObject *i18n.Bundle) error {
Other: "fixing up", Other: "fixing up",
}, &i18n.Message{ }, &i18n.Message{
ID: "DeletingStatus", ID: "DeletingStatus",
Other: "deleting", Other: "verwijderen",
}, &i18n.Message{ }, &i18n.Message{
ID: "MovingStatus", ID: "MovingStatus",
Other: "moving", Other: "verplaatsen",
}, &i18n.Message{ }, &i18n.Message{
ID: "RebasingStatus", ID: "RebasingStatus",
Other: "rebasing", Other: "rebasing",
}, &i18n.Message{ }, &i18n.Message{
ID: "AmendingStatus", ID: "AmendingStatus",
Other: "amending", Other: "wijzigen",
}, &i18n.Message{ }, &i18n.Message{
ID: "CherryPickingStatus", ID: "CherryPickingStatus",
Other: "cherry-picking", Other: "cherry-picking",
}, &i18n.Message{ }, &i18n.Message{
ID: "CommitFiles", ID: "CommitFiles",
Other: "Commit files", Other: "Commit bestanden",
}, &i18n.Message{ }, &i18n.Message{
ID: "viewCommitFiles", ID: "viewCommitFiles",
Other: "view commit's files", Other: "bekijk gecommite bestanden",
}, &i18n.Message{ }, &i18n.Message{
ID: "CommitFilesTitle", ID: "CommitFilesTitle",
Other: "Commit files", Other: "Commit bestanden",
}, &i18n.Message{ }, &i18n.Message{
ID: "goBack", ID: "goBack",
Other: "go back", Other: "ga terug",
}, &i18n.Message{ }, &i18n.Message{
ID: "NoCommiteFiles", ID: "NoCommiteFiles",
Other: "No files for this commit", Other: "Geen bestanden voor deze commit",
}, &i18n.Message{ }, &i18n.Message{
ID: "checkoutCommitFile", ID: "checkoutCommitFile",
Other: "checkout file", Other: "bestand uitchecken",
}, &i18n.Message{ }, &i18n.Message{
ID: "discardOldFileChange", ID: "discardOldFileChange",
Other: "discard this commit's changes to this file", Other: "uitsluit deze commit zijn veranderingen aan dit bestand",
}, &i18n.Message{ }, &i18n.Message{
ID: "DiscardFileChangesTitle", ID: "DiscardFileChangesTitle",
Other: "Discard file changes", Other: "uitsluit bestand zijn veranderingen",
}, &i18n.Message{ }, &i18n.Message{
ID: "DiscardFileChangesPrompt", ID: "DiscardFileChangesPrompt",
Other: "Are you sure you want to discard this commit's changes to this file? If this file was created in this commit, it will be deleted", Other: "Weet je zeker dat je de wijzigingen van deze commit in dit bestand wilt weggooien? Als dit bestand is gecreëerd in deze commit dan zal dit bestand worden verwijdert",
}, &i18n.Message{ }, &i18n.Message{
ID: "DisabledForGPG", ID: "DisabledForGPG",
Other: "Feature not available for users using GPG", Other: "Onderdelen niet beschikbaar voor gebruikers die GPG gebruiken",
}, &i18n.Message{ }, &i18n.Message{
ID: "CreateRepo", ID: "CreateRepo",
Other: "Not in a git repository. Create a new git repository? (y/n): ", Other: "Niet in een git repository. Creëer een nieuwe git repository? (y/n): ",
}, &i18n.Message{ }, &i18n.Message{
ID: "AutoStashTitle", ID: "AutoStashTitle",
Other: "Autostash?", Other: "Autostash?",
}, &i18n.Message{ }, &i18n.Message{
ID: "AutoStashPrompt", ID: "AutoStashPrompt",
Other: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)", Other: "Je moet je veranderingen stashen en poppen om ze over te bregen. Dit automaties doen? (enter/esc)",
}, &i18n.Message{ }, &i18n.Message{
ID: "StashPrefix", ID: "StashPrefix",
Other: "Auto-stashing changes for ", Other: "Auto-stashing veranderingen voor ",
}, &i18n.Message{ }, &i18n.Message{
ID: "viewDiscardOptions", ID: "viewDiscardOptions",
Other: "view 'discard changes' options", Other: "bekijk 'veranderingen ongedaan maken' opties",
}, &i18n.Message{ }, &i18n.Message{
ID: "cancel", ID: "cancel",
Other: "cancel", Other: "anuleren",
}, &i18n.Message{ }, &i18n.Message{
ID: "discardAllChanges", ID: "discardAllChanges",
Other: "discard all changes", Other: "negeer alle wijzigingen",
}, &i18n.Message{ }, &i18n.Message{
ID: "discardUnstagedChanges", ID: "discardUnstagedChanges",
Other: "discard unstaged changes", Other: "negeer unstaged wijzigingen",
}, &i18n.Message{ }, &i18n.Message{
ID: "discardAllChangesToAllFiles", ID: "discardAllChangesToAllFiles",
Other: "nuke working tree", Other: "verwijder werkende tree",
}, &i18n.Message{ }, &i18n.Message{
ID: "discardAnyUnstagedChanges", ID: "discardAnyUnstagedChanges",
Other: "discard unstaged changes", Other: "discard unstaged changes",
}, &i18n.Message{ }, &i18n.Message{
ID: "discardUntrackedFiles", ID: "discardUntrackedFiles",
Other: "discard untracked files", Other: "negeer niet-gevonden bestanden",
}, &i18n.Message{ }, &i18n.Message{
ID: "viewResetOptions", ID: "viewResetOptions",
Other: `view reset options`, Other: `bekijk reset opties`,
}, &i18n.Message{ }, &i18n.Message{
ID: "hardReset", ID: "hardReset",
Other: "hard reset", Other: "harde reset",
}, &i18n.Message{ }, &i18n.Message{
ID: "createFixupCommit", ID: "createFixupCommit",
Other: `create fixup commit for this commit`, Other: `creëer fixup commit voor deze commit`,
}, &i18n.Message{ }, &i18n.Message{
ID: "squashAboveCommits", ID: "squashAboveCommits",
Other: `squash above commits`, Other: `squash bovenstaande commits`,
}, &i18n.Message{ }, &i18n.Message{
ID: "SquashAboveCommits", ID: "SquashAboveCommits",
Other: `Squash above commits`, Other: `Squash bovenstaande commits`,
}, &i18n.Message{ }, &i18n.Message{
ID: "SureSquashAboveCommits", ID: "SureSquashAboveCommits",
Other: `Are you sure you want to squash all fixup! commits above {{.commit}}?`, Other: `Weet je zeker dat je alles wil squash/fixup! voor de bovenstaand commits {{.commit}}?`,
}, &i18n.Message{ }, &i18n.Message{
ID: "CreateFixupCommit", ID: "CreateFixupCommit",
Other: `Create fixup commit`, Other: `Creëer fixup commit`,
}, &i18n.Message{ }, &i18n.Message{
ID: "SureCreateFixupCommit", ID: "SureCreateFixupCommit",
Other: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`, Other: `Weet je zeker dat je een fixup wil maken! commit voor commit {{.commit}}?`,
}, &i18n.Message{ }, &i18n.Message{
ID: "executeCustomCommand", ID: "executeCustomCommand",
Other: "execute custom command", Other: "voor aangepast commando uit",
}, &i18n.Message{ }, &i18n.Message{
ID: "CustomCommand", ID: "CustomCommand",
Other: "Custom Command:", Other: "Aangepast commando:",
}, &i18n.Message{ }, &i18n.Message{
ID: "commitChangesWithoutHook", ID: "commitChangesWithoutHook",
Other: "commit changes without pre-commit hook", Other: "commit veranderingen zonder pre-commit hook",
}, &i18n.Message{ }, &i18n.Message{
ID: "SkipHookPrefixNotConfigured", ID: "SkipHookPrefixNotConfigured",
Other: "You have not configured a commit message prefix for skipping hooks. Set `git.skipHookPrefix = 'WIP'` in your config", Other: "Je hebt nog niet een commit bericht voorvoegsel ingesteld voor het overslaan van hooks. Set `git.skipHookPrefix = 'WIP'` in je config",
}, },
) )
} }

View File

@ -509,7 +509,7 @@ func addEnglish(i18nObject *i18n.Bundle) error {
Other: "fetching and fast-forwarding {{.from}} -> {{.to}} ...", Other: "fetching and fast-forwarding {{.from}} -> {{.to}} ...",
}, &i18n.Message{ }, &i18n.Message{
ID: "FoundConflicts", ID: "FoundConflicts",
Other: "Damn, conflicts! To abort press 'esc', otherwise press 'enter'", Other: "Conflicts! To abort press 'esc', otherwise press 'enter'",
}, &i18n.Message{ }, &i18n.Message{
ID: "FoundConflictsTitle", ID: "FoundConflictsTitle",
Other: "Auto-merge failed", Other: "Auto-merge failed",

View File

@ -490,7 +490,7 @@ func addPolish(i18nObject *i18n.Bundle) error {
Other: "amend commit with staged changes", Other: "amend commit with staged changes",
}, &i18n.Message{ }, &i18n.Message{
ID: "FoundConflicts", ID: "FoundConflicts",
Other: "Damn, conflicts! To abort press 'esc', otherwise press 'enter'", Other: "Conflicts! To abort press 'esc', otherwise press 'enter'",
}, &i18n.Message{ }, &i18n.Message{
ID: "FoundConflictsTitle", ID: "FoundConflictsTitle",
Other: "Auto-merge failed", Other: "Auto-merge failed",