mirror of
https://github.com/git/git.git
synced 2024-11-14 21:23:03 +01:00
105c21df14
* git://repo.or.cz/git-gui: git-gui: Makefile - Handle $DESTDIR on Cygwin git-gui: add french glossary: glossary/fr.po git-gui: Refresh file status description after hunk application git-gui: Allow 'Create New Repository' on existing directories git-gui: Initial french translation git-gui: Improve German translation. git-gui: Updated Swedish translation after mailing list review. git-gui: Fix broken revert confirmation. git-gui: Update German translation git-gui: Update glossary: add term "hunk"
38 lines
2.6 KiB
Text
38 lines
2.6 KiB
Text
"English Term (Dear translator: This file will never be visible to the user!)" "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
|
|
"amend" ""
|
|
"annotate" ""
|
|
"branch [noun]" "A 'branch' is an active line of development."
|
|
"branch [verb]" ""
|
|
"checkout [noun]" ""
|
|
"checkout [verb]" "The action of updating the working tree to a revision which was stored in the object database."
|
|
"clone [verb]" ""
|
|
"commit [noun]" "A single point in the git history."
|
|
"commit [verb]" "The action of storing a new snapshot of the project's state in the git history."
|
|
"diff [noun]" ""
|
|
"diff [verb]" ""
|
|
"fast forward merge" "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
|
|
"fetch" "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
|
|
"hunk" "One context of consecutive lines in a whole patch, which consists of many such hunks"
|
|
"index (in git-gui: staging area)" "A collection of files. The index is a stored version of your working tree."
|
|
"merge [noun]" "A successful merge results in the creation of a new commit representing the result of the merge."
|
|
"merge [verb]" "To bring the contents of another branch into the current branch."
|
|
"message" ""
|
|
"prune" "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
|
|
"pull" "Pulling a branch means to fetch it and merge it."
|
|
"push" "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)"
|
|
"redo" ""
|
|
"remote" "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
|
|
"repository" "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
|
|
"reset" ""
|
|
"revert" ""
|
|
"revision" "A particular state of files and directories which was stored in the object database."
|
|
"sign off" ""
|
|
"staging area" ""
|
|
"status" ""
|
|
"tag [noun]" "A ref pointing to a tag or commit object"
|
|
"tag [verb]" ""
|
|
"tracking branch" "A regular git branch that is used to follow changes from another repository."
|
|
"undo" ""
|
|
"update" ""
|
|
"verify" ""
|
|
"working copy, working tree" "The tree of actual checked out files."
|