opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge https://github.com/prati0100/git-gui 

* 'master' of https://github.com/prati0100/git-gui:
  git-gui: create a new namespace for chord script evaluation
  git-gui: reduce Tcl version requirement from 8.6 to 8.5
  git-gui--askpass: coerce answers to UTF-8 on Windows
  git-gui: fix error popup when doing blame -> "Show History Context"
  git-gui: add missing close bracket
  git-gui: update German translation
  git-gui: extend translation glossary template with more terms
  git-gui: update pot template and German translation to current source code
This commit is contained in:
Junio C Hamano 2020-03-19 16:06:51 -07:00
parent 7fcb965970 a5728022e0
commit 98cedd0233
10 changed files with 4802 additions and 3741 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-gui/git-gui--askpass
View File

@ -56,6 +56,11 @@ proc finish {} {
}
}
# On Windows, force the encoding to UTF-8: it is what `git.exe` expects
if {$::tcl_platform(platform) eq {windows}} {
set ::answer [encoding convertto utf-8 $::answer]
}
puts $::answer
set ::rc 0
}

14
git-gui/git-gui.sh
View File

@ -30,8 +30,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.}]
##
## Tcl/Tk sanity check
if {[catch {package require Tcl 8.6} err]
|| [catch {package require Tk 8.6} err]
if {[catch {package require Tcl 8.5} err]
|| [catch {package require Tk 8.5} err]
} {
catch {wm withdraw .}
tk_messageBox \
@ -2205,11 +2205,13 @@ proc do_gitk {revs {is_submodule false}} {
set env(GIT_WORK_TREE) $_gitworktree
cd $pwd
set status_operation [$::main_status \
start \
[mc "Starting %s... please wait..." "gitk"]]
if {[info exists main_status]} {
set status_operation [$::main_status \
start \
[mc "Starting %s... please wait..." "gitk"]]
after 3500 [list $status_operation stop]
after 3500 [list $status_operation stop]
}
}
}

56
git-gui/lib/chord.tcl
View File

@ -27,7 +27,7 @@
# # Turn off the UI while running a couple of async operations.
# lock_ui
#
# set chord [SimpleChord new {
# set chord [SimpleChord::new {
# unlock_ui
# # Note: $notice here is not referenced in the calling scope
# if {$notice} { info_popup $notice }
@ -37,9 +37,9 @@
# # all operations have been initiated.
# set common_note [$chord add_note]
#
# # Pass notes as 'after' callbacks to other operations
# async_operation $args [$chord add_note]
# other_async_operation $args [$chord add_note]
# # Activate notes in 'after' callbacks to other operations
# set newnote [$chord add_note]
# async_operation $args [list $newnote activate]
#
# # Communicate with the chord body
# if {$condition} {
@ -48,7 +48,7 @@
# }
#
# # Activate the common note, making the chord eligible to complete
# $common_note
# $common_note activate
#
# At this point, the chord will complete at some unknown point in the future.
# The common note might have been the first note activated, or the async
@ -60,18 +60,23 @@
# Represents a procedure that conceptually has multiple entrypoints that must
# all be called before the procedure executes. Each entrypoint is called a
# "note". The chord is only "completed" when all the notes are "activated".
oo::class create SimpleChord {
variable notes body is_completed
class SimpleChord {
field notes
field body
field is_completed
field eval_ns
# Constructor:
# set chord [SimpleChord new {body}]
# set chord [SimpleChord::new {body}]
# Creates a new chord object with the specified body script. The
# body script is evaluated at most once, when a note is activated
# and the chord has no other non-activated notes.
constructor {body} {
constructor new {i_body} {
set notes [list]
my eval [list set body $body]
set body $i_body
set is_completed 0
set eval_ns "[namespace qualifiers $this]::eval"
return $this
}
# Method:
@ -80,7 +85,7 @@ oo::class create SimpleChord {
# the chord body will be evaluated. This can be used to set variable
# values for the chord body to use.
method eval {script} {
namespace eval [self] $script
namespace eval $eval_ns $script
}
# Method:
@ -92,7 +97,7 @@ oo::class create SimpleChord {
method add_note {} {
if {$is_completed} { error "Cannot add a note to a completed chord" }
set note [ChordNote new [self]]
set note [ChordNote::new $this]
lappend notes $note
@ -108,8 +113,8 @@ oo::class create SimpleChord {
set is_completed 1
namespace eval [self] $body
namespace delete [self]
namespace eval $eval_ns $body
delete_this
}
}
}
@ -119,15 +124,17 @@ oo::class create SimpleChord {
# final note of the chord is activated (this can be any note in the chord,
# with all other notes already previously activated in any order), the chord's
# body is evaluated.
oo::class create ChordNote {
variable chord is_activated
class ChordNote {
field chord
field is_activated
# Constructor:
# Instances of ChordNote are created internally by calling add_note on
# SimpleChord objects.
constructor {chord} {
my eval set chord $chord
constructor new {c} {
set chord $c
set is_activated 0
return $this
}
# Method:
@ -138,20 +145,11 @@ oo::class create ChordNote {
}
# Method:
# $note
# $note activate
# Activates the note, if it has not already been activated, and
# completes the chord if there are no other notes awaiting
# activation. Subsequent calls will have no further effect.
#
# NB: In TclOO, if an object is invoked like a method without supplying
# any method name, then this internal method `unknown` is what
# actually runs (with no parameters). It is used in the ChordNote
# class for the purpose of allowing the note object to be called as
# a function (see example above). (The `unknown` method can also be
# used to support dynamic dispatch, but must take parameters to
# identify the "unknown" method to be invoked. In this form, this
# proc serves only to make instances behave directly like methods.)
method unknown {} {
method activate {} {
if {!$is_activated} {
set is_activated 1
$chord notify_note_activation

10
git-gui/lib/index.tcl
View File

@ -436,7 +436,7 @@ proc revert_helper {txt paths} {
#
# The asynchronous operations are each indicated below by a comment
# before the code block that starts the async operation.
set after_chord [SimpleChord new {
set after_chord [SimpleChord::new {
if {[string trim $err] != ""} {
rescan_on_error $err
} else {
@ -522,10 +522,11 @@ proc revert_helper {txt paths} {
]
if {$reply == 1} {
set note [$after_chord add_note]
checkout_index \
$txt \
$path_list \
[$after_chord add_note] \
[list $note activate] \
$capture_error
}
}
@ -567,14 +568,15 @@ proc revert_helper {txt paths} {
if {$reply == 1} {
$after_chord eval { set should_reshow_diff 1 }
delete_files $untracked_list [$after_chord add_note]
set note [$after_chord add_note]
delete_files $untracked_list [list $note activate]
}
}
# Activate the common note. If no other notes were created, this
# completes the chord. If other notes were created, then this common
# note prevents a race condition where the chord might complete early.
$after_common_note
$after_common_note activate
}
# Delete all of the specified files, performing deletion in batches to allow the

2
git-gui/lib/merge.tcl
View File

@ -244,7 +244,7 @@ Continue with resetting the current changes?"]
set status_bar_operation [$::main_status \
start \
[mc "Aborting"] \
[mc "files reset"]
[mc "files reset"]]
fileevent $fd readable [namespace code [list \
_reset_wait $fd $status_bar_operation]]
} else {

4480
git-gui/po/de.po
View File

File diff suppressed because it is too large Load Diff

3302
git-gui/po/git-gui.pot
View File

File diff suppressed because it is too large Load Diff

317
git-gui/po/glossary/de.po
View File

@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: git-gui glossary\n"
"POT-Creation-Date: 2008-01-07 21:20+0100\n"
"PO-Revision-Date: 2008-02-16 21:48+0100\n"
"POT-Creation-Date: 2020-01-26 22:26+0100\n"
"PO-Revision-Date: 2020-02-09 21:22+0100\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German \n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -19,6 +20,9 @@ msgid ""
"English Term (Dear translator: This file will never be visible to the user!)"
msgstr ""
"Deutsche Übersetzung.\n"
"Git-core glossary:\n"
" https://github.com/ruester/git-po-de/wiki/Translation-Guidelines\n"
"\n"
"Andere deutsche SCM:\n"
" http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://"
"tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po "
@ -32,33 +36,77 @@ msgstr ""
" http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po "
"(username=guest, password empty, schlecht)"
#. "prematurely stop and abandon an operation"
msgid "abort"
msgstr "abbrechen"
#. ""
msgid "amend"
msgstr "nachbessern (ergänzen)"
#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
msgid "ancestor"
msgstr "Vorgänger-Commit"
#. ""
msgid "annotate"
msgstr "annotieren"
#. "The person who initially created (authored) a commit"
msgid "author"
msgstr "Autor"
#. "a repository with only .git directory, without working directory"
msgid "bare repository"
msgstr "bloßes Projektarchiv"
#. "a parent version of the current file"
msgid "base"
msgstr "Ursprung"
#. ""
msgid "bisect"
msgstr "binäre Suche [noun], binäre Suche benutzen [verb]"
#. "get the authors responsible for each line in a file"
msgid "blame"
msgstr "annotieren"
#. ""
msgid "blob"
msgstr "Blob"
#. "A 'branch' is an active line of development."
msgid "branch [noun]"
msgstr "Zweig"
msgstr "Branch"
#. ""
msgid "branch [verb]"
msgstr "verzweigen"
msgstr "branchen"
#. ""
msgid "checkout [noun]"
msgstr ""
"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? "
"Source Safe: Auscheckvorgang)"
"Arbeitskopie (Checkout; Erstellung einer Arbeitskopie; Auscheck? Source "
"Safe: Auscheckvorgang)"
#. "The action of updating the working tree to a revision which was stored in the object database."
msgid "checkout [verb]"
msgstr ""
"Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? "
"ausspielen? abrufen? Source Safe: auschecken)"
"Arbeitskopie erstellen; Branch auschecken [checkout a branch] (umstellen? "
"Source Safe: auschecken)"
#. "to select and apply a single commit to the current HEAD without merging"
msgid "cherry-pick"
msgstr "cherry-pick (pflücken?)"
#. "a commit that directly succeeds the current one in git's graph of commits"
msgid "child commit"
msgstr "Kind-Commit"
#. "clean the state of the git repository, often after manually stopped operation"
msgid "cleanup"
msgstr "aufräumen"
#. ""
msgid "clone [verb]"
@ -66,39 +114,98 @@ msgstr "klonen"
#. "A single point in the git history."
msgid "commit [noun]"
msgstr ""
"Version; Eintragung; Änderung (Buchung?, Eintragung?, Übertragung?, "
"Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)"
msgstr "Commit (Version?)"
#. "The action of storing a new snapshot of the project's state in the git history."
msgid "commit [verb]"
msgstr ""
"eintragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, "
"übergeben?, einspielen?, einpflegen?, ablegen?)"
"committen (eintragen?, TortoiseSVN: übertragen; Source Safe: einchecken)"
#. "a message that gets attached with any commit"
msgid "commit message"
msgstr "Commit-Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
#. "The person who committed a commit (to the current branch), which might be different than the author."
msgid "committer"
msgstr "Committer"
#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
msgid "descendant"
msgstr "Nachfolger-Commit"
#. "checkout of a revision rather than some head"
msgid "detached HEAD"
msgstr "losgelöster HEAD / Branchspitze"
#. "checkout of a revision rather than some head"
msgid "detached checkout"
msgstr "losgelöster Commit (von Branch losgelöster Commit?)"
#. ""
msgid "diff [noun]"
msgstr "Vergleich (Source Safe: Unterschiede)"
msgstr "Vergleich (Diff? Source Safe: Unterschiede)"
#. ""
msgid "diff [verb]"
msgstr "vergleichen"
#. "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."
msgid "fast forward merge"
msgstr "Schnellzusammenführung"
#. ""
msgid "directory"
msgstr "Verzeichnis"
#. "A fast-forward merge 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."
msgid "fast-forward"
msgstr "vorspulen"
#. "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."
msgid "fetch"
msgstr "anfordern (holen?)"
#. "any merge strategy that works on a file by file basis"
msgid "file level merging"
msgstr "Datei-basiertes zusammenführen"
#. ""
msgid "file"
msgstr "Datei"
#. "the last revision in a branch"
msgid "head"
msgstr "HEAD / Branchspitze"
#. "script that gets executed automatically on some event"
msgid "hook"
msgstr "Hook (in der dt. Informatik wohl als Einschubmethode bezeichnet)"
#. "One context of consecutive lines in a whole patch, which consists of many such hunks"
msgid "hunk"
msgstr "Kontext"
msgstr "Patch-Block (Kontext?)"
#. "A collection of files. The index is a stored version of your working tree."
msgid "index (in git-gui: staging area)"
msgstr "Bereitstellung"
msgstr ""
"Bereitstellung (sofern der git index gemeint ist. In git-gui sowieso: "
"staging area)"
#. "the first checkout during a clone operation"
msgid "initial checkout"
msgstr "Erstellen der Arbeitskopie, auschecken"
#. "The very first commit in a repository"
msgid "initial commit"
msgstr "Allererster Commit"
#. "a branch that resides in the local git repository"
msgid "local branch"
msgstr "Lokaler Branch"
#. "a Git object that is not part of any pack"
msgid "loose object"
msgstr "loses Objekt"
#. "a branch called by convention 'master' that exists in a newly created git repository"
msgid "master branch"
msgstr "Master-Branch"
#. "A successful merge results in the creation of a new commit representing the result of the merge."
msgid "merge [noun]"
@ -112,78 +219,212 @@ msgstr "zusammenführen"
msgid "message"
msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
#. "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>'."
#. "a remote called by convention 'origin' that the current git repository has been cloned from"
msgid "origin"
msgstr "origin"
#. ""
msgid "orphan commit"
msgstr "verwaister Commit"
#. ""
msgid "orphan reference"
msgstr "verwaiste Referenz"
#. "a file containing many git objects packed together"
msgid "pack [noun]"
msgstr "Pack-Datei"
#. "the process of creating a pack file"
msgid "pack [verb]"
msgstr "Pack-Datei erstellen"
#. "a Git object part of some pack"
msgid "packed object"
msgstr "gepacktes Objekt"
#. "a commit that directly precedes the current one in git's graph of commits"
msgid "parent commit"
msgstr "Eltern-Commit"
msgid "patch"
msgstr "Patch"
#. "The path to a file"
msgid "path"
msgstr "Pfad"
#. "Delete 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>'."
msgid "prune"
msgstr "aufräumen (entfernen?)"
msgstr "veraltete Branches entfernen (aufräumen?, entfernen?)"
#. "Pulling a branch means to fetch it and merge it."
msgid "pull"
msgstr "übernehmen (ziehen?)"
msgstr ""
"übernehmen (pull? ziehen? Vorsicht: zusammenführen = merge, aber pull kann "
"auch rebase bewirken)"
#. "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?)"
msgid "push"
msgstr "versenden (ausliefern? hochladen? verschicken? schieben?)"
#. "The process of rebasing one set of commits on top of another branch's head"
msgid "rebase [noun]"
msgstr "der Rebase (das Umpflanzen)"
#. "Re-apply one set of commits on top of another branch's head. Contrary to merge."
msgid "rebase [verb]"
msgstr "rebase (umpflanzen)"
#. ""
msgid "redo"
msgstr "wiederholen"
#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
msgid "remote"
msgstr "Andere Archive (Gegenseite?, Entfernte?, Server?)"
#. ""
msgid "reference"
msgstr "Referenz"
#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
msgid "reflog"
msgstr "Commit-Log, »reflog«"
msgid "refmap"
msgstr "Refmap"
#. ""
msgid "refspec"
msgstr "Refspec"
#. "The adjective for anything which is outside of the current (local) repository"
msgid "remote [adj]"
msgstr "Extern (Andere?, Gegenseite?, Entfernte?, Server?)"
#. "A branch in any other ('remote') repository"
msgid "remote branch"
msgstr "Externer branch"
#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
msgid "remote repository"
msgstr "Externes 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?)"
msgid "repository"
msgstr "Projektarchiv"
msgstr "Repository"
#. ""
msgid "reset"
msgstr "zurücksetzen (zurückkehren?)"
msgstr "umsetzen (reset to commit), Änderungen verwerfen (reset to HEAD)"
#. "decide which changes from alternative versions of a file should persist in Git"
msgid "resolve (a conflict)"
msgstr "auflösen (einen Konflikt)"
#. "abandon changes and go to pristine version"
msgid "revert changes"
msgstr ""
"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also "
"mit neuem commit; umkehren?)"
#. ""
msgid "revert"
msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)"
msgstr ""
"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also "
"mit neuem commit; umkehren?)"
#. "expression that signifies a revision in git"
msgid "revision expression"
msgstr "Version Regexp-Ausdruck"
#. "A particular state of files and directories which was stored in the object database."
msgid "revision"
msgstr "Version (TortoiseSVN: Revision; Source Safe: Version)"
msgstr ""
"Version (aber was macht das Wort revision hier im Git?? TortoiseSVN: "
"Revision; Source Safe: Version)"
#. ""
msgid "sign off"
msgstr "abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)"
msgstr "abzeichnen (signieren? gegenzeichnen?, freizeichnen?)"
#. ""
#. "see: staging area. In some areas of git this is called 'index'."
msgid "stage [noun], index"
msgstr "Bereitstellung"
#. "add some content of files and directories to the staging area in preparation for a commit"
msgid "stage [verb]"
msgstr "bereitstellen"
#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'."
msgid "staging area"
msgstr "Bereitstellung"
#. "The place (stack) where changes can be temporarily saved without committing"
msgid "stash [noun]"
msgstr "der Stash"
#. "temporarily save changes in a stack without committing"
msgid "stash [verb]"
msgstr "in Stash speichern; \"stash\" benutzen"
#. ""
msgid "status"
msgstr "Status"
#. "A ref pointing to a tag or commit object"
msgid "tag [noun]"
msgstr "Markierung"
#. ""
msgid "submodule"
msgstr "Submodul (Untermodul?)"
#. "A ref pointing to some commit object. In other words: A label on a specific commit."
msgid "tag [noun]"
msgstr "Tag (Markierung?)"
#. "The process of creating a tag at a specific commit object"
msgid "tag [verb]"
msgstr "markieren"
msgstr "taggen (markieren?)"
#. "The person who created a tag"
msgid "tagger"
msgstr "Tag-Ersteller (Markierungs-Ersteller?)"
#. "file whose content is tracked/not tracked by git"
msgid "tracked/untracked"
msgstr "versioniert/unversioniert"
#. "A regular git branch that is used to follow changes from another repository."
msgid "tracking branch"
msgstr "Übernahmezweig"
msgstr "Tracking-Branch (Verfolgungsbranch? Übernahmebranch?)"
#. ""
msgid "trailer"
msgstr "Anhang"
#. "1. tree object, 2. directory tree"
msgid "tree"
msgstr "1. Baum-Objekt, 2. Verzeichnisbaum"
#. ""
msgid "undo"
msgstr "rückgängig"
#. "Remove content of files from the staging area again so that it will not be part of the next commit"
msgid "unstage"
msgstr "aus Bereitstellung herausnehmen"
#. "Retrieving the temporarily saved changes back again from the stash"
msgid "unstash [verb]"
msgstr "aus Stash zurückladen"
#. ""
msgid "update"
msgstr "aktualisieren"
#. ""
msgid "upstream branch"
msgstr "Upstream-Branch"
#. ""
msgid "verify"
msgstr "überprüfen"
#. "The tree of actual checked out files."
msgid "working copy, working tree"
msgid "working directory, working copy, working tree"
msgstr "Arbeitskopie"

250
git-gui/po/glossary/git-gui-glossary.pot
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2008-01-07 21:20+0100\n"
"POT-Creation-Date: 2020-01-26 22:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,14 +18,46 @@ msgstr ""
msgid "English Term (Dear translator: This file will never be visible to the user!)"
msgstr ""
#. "prematurely stop and abandon an operation"
msgid "abort"
msgstr ""
#. ""
msgid "amend"
msgstr ""
#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
msgid "ancestor"
msgstr ""
#. ""
msgid "annotate"
msgstr ""
#. "The person who initially created (authored) a commit"
msgid "author"
msgstr ""
#. "a repository with only .git directory, without working directory"
msgid "bare repository"
msgstr ""
#. "a parent version of the current file"
msgid "base"
msgstr ""
#. ""
msgid "bisect"
msgstr ""
#. "get the authors responsible for each line in a file"
msgid "blame"
msgstr ""
#. ""
msgid "blob"
msgstr ""
#. "A 'branch' is an active line of development."
msgid "branch [noun]"
msgstr ""
@ -42,6 +74,18 @@ msgstr ""
msgid "checkout [verb]"
msgstr ""
#. "to select and apply a single commit to the current HEAD without merging"
msgid "cherry-pick"
msgstr ""
#. "a commit that directly succeeds the current one in git's graph of commits"
msgid "child commit"
msgstr ""
#. "clean the state of the git repository, often after manually stopped operation"
msgid "cleanup"
msgstr ""
#. ""
msgid "clone [verb]"
msgstr ""
@ -54,6 +98,26 @@ msgstr ""
msgid "commit [verb]"
msgstr ""
#. "a message that gets attached with any commit"
msgid "commit message"
msgstr ""
#. "The person who committed a commit (to the current branch), which might be different than the author."
msgid "committer"
msgstr ""
#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
msgid "descendant"
msgstr ""
#. "checkout of a revision rather than some head"
msgid "detached HEAD"
msgstr ""
#. "checkout of a revision rather than some head"
msgid "detached checkout"
msgstr ""
#. ""
msgid "diff [noun]"
msgstr ""
@ -62,14 +126,34 @@ msgstr ""
msgid "diff [verb]"
msgstr ""
#. "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."
msgid "fast forward merge"
#. ""
msgid "directory"
msgstr ""
#. "A fast-forward merge 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."
msgid "fast-forward"
msgstr ""
#. "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."
msgid "fetch"
msgstr ""
#. "any merge strategy that works on a file by file basis"
msgid "file level merging"
msgstr ""
#. ""
msgid "file"
msgstr ""
#. "the last revision in a branch"
msgid "head"
msgstr ""
#. "script that gets executed automatically on some event"
msgid "hook"
msgstr ""
#. "One context of consecutive lines in a whole patch, which consists of many such hunks"
msgid "hunk"
msgstr ""
@ -78,6 +162,26 @@ msgstr ""
msgid "index (in git-gui: staging area)"
msgstr ""
#. "the first checkout during a clone operation"
msgid "initial checkout"
msgstr ""
#. "The very first commit in a repository"
msgid "initial commit"
msgstr ""
#. "a branch that resides in the local git repository"
msgid "local branch"
msgstr ""
#. "a Git object that is not part of any pack"
msgid "loose object"
msgstr ""
#. "a branch called by convention 'master' that exists in a newly created git repository"
msgid "master branch"
msgstr ""
#. "A successful merge results in the creation of a new commit representing the result of the merge."
msgid "merge [noun]"
msgstr ""
@ -90,7 +194,42 @@ msgstr ""
msgid "message"
msgstr ""
#. "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>'."
#. "a remote called by convention 'origin' that the current git repository has been cloned from"
msgid "origin"
msgstr ""
#. ""
msgid "orphan commit"
msgstr ""
#. ""
msgid "orphan reference"
msgstr ""
#. "a file containing many git objects packed together"
msgid "pack [noun]"
msgstr ""
#. "the process of creating a pack file"
msgid "pack [verb]"
msgstr ""
#. "a Git object part of some pack"
msgid "packed object"
msgstr ""
#. "a commit that directly precedes the current one in git's graph of commits"
msgid "parent commit"
msgstr ""
msgid "patch" ""
msgstr ""
#. "The path to a file"
msgid "path"
msgstr ""
#. "Delete 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>'."
msgid "prune"
msgstr ""
@ -102,12 +241,43 @@ msgstr ""
msgid "push"
msgstr ""
#. "The process of rebasing one set of commits on top of another branch's head"
msgid "rebase [noun]"
msgstr ""
#. "Re-apply one set of commits on top of another branch's head. Contrary to merge."
msgid "rebase [verb]"
msgstr ""
#. ""
msgid "redo"
msgstr ""
#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
msgid "remote"
#. ""
msgid "reference"
msgstr ""
#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
msgid "reflog"
msgstr ""
msgid "refmap" ""
msgstr ""
#. ""
msgid "refspec"
msgstr ""
#. "The adjective for anything which is outside of the current (local) repository"
msgid "remote [adj]"
msgstr ""
#. "A branch in any other ('remote') repository"
msgid "remote branch"
msgstr ""
#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
msgid "remote repository"
msgstr ""
#. "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?)"
@ -118,10 +288,22 @@ msgstr ""
msgid "reset"
msgstr ""
#. "decide which changes from alternative versions of a file should persist in Git"
msgid "resolve (a conflict)"
msgstr ""
#. "abandon changes and go to pristine version"
msgid "revert changes"
msgstr ""
#. ""
msgid "revert"
msgstr ""
#. "expression that signifies a revision in git"
msgid "revision expression"
msgstr ""
#. "A particular state of files and directories which was stored in the object database."
msgid "revision"
msgstr ""
@ -130,39 +312,87 @@ msgstr ""
msgid "sign off"
msgstr ""
#. ""
#. "see: staging area. In some areas of git this is called 'index'."
msgid "stage [noun], index"
msgstr ""
#. "add some content of files and directories to the staging area in preparation for a commit"
msgid "stage [verb]"
msgstr ""
#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'."
msgid "staging area"
msgstr ""
#. "The place (stack) where changes can be temporarily saved without committing"
msgid "stash [noun]"
msgstr ""
#. "temporarily save changes in a stack without committing"
msgid "stash [verb]"
msgstr ""
#. ""
msgid "status"
msgstr ""
#. "A ref pointing to a tag or commit object"
#. ""
msgid "submodule"
msgstr ""
#. "A ref pointing to some commit object. In other words: A label on a specific commit."
msgid "tag [noun]"
msgstr ""
#. ""
#. "The process of creating a tag at a specific commit object"
msgid "tag [verb]"
msgstr ""
#. "The person who created a tag"
msgid "tagger"
msgstr ""
#. "file whose content is tracked/not tracked by git"
msgid "tracked/untracked"
msgstr ""
#. "A regular git branch that is used to follow changes from another repository."
msgid "tracking branch"
msgstr ""
#. ""
msgid "trailer"
msgstr ""
#. "1. tree object, 2. directory tree"
msgid "tree"
msgstr ""
#. ""
msgid "undo"
msgstr ""
#. "Remove content of files from the staging area again so that it will not be part of the next commit"
msgid "unstage"
msgstr ""
#. "Retrieving the temporarily saved changes back again from the stash"
msgid "unstash [verb]"
msgstr ""
#. ""
msgid "update"
msgstr ""
#. ""
msgid "upstream branch"
msgstr ""
#. ""
msgid "verify"
msgstr ""
#. "The tree of actual checked out files."
msgid "working copy, working tree"
msgid "working directory, working copy, working tree"
msgstr ""

107
git-gui/po/glossary/git-gui-glossary.txt
View File

@ -1,67 +1,96 @@
"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.)"
"abort" "prematurely stop and abandon an operation"
"amend" ""
"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
"annotate" ""
"author" "The person who initially created (authored) a commit"
"bare repository" "a repository with only .git directory, without working directory"
"base" "a parent version of the current file"
"bisect" ""
"blame" "get the authors responsible for each line in a file"
"blob" ""
"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."
"cherry-pick" "to select and apply a single commit to the current HEAD without merging"
"child commit" "a commit that directly succeeds the current one in git's graph of commits"
"cleanup" "clean the state of the git repository, often after manually stopped operation"
"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."
"commit message" "a message that gets attached with any commit"
"committer" "The person who committed a commit (to the current branch), which might be different than the author."
"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
"detached HEAD" "checkout of a revision rather than some head"
"detached checkout" "checkout of a revision rather than some head"
"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."
"directory" ""
"fast-forward" "A fast-forward merge 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."
"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
"abort" "prematurely stop and abandon an operation"
"bare repository" "a repository with only .git directory, without working directory"
"base" "a parent version of the current file"
"blame" "get the authors responsible for each line in a file"
"cherry-pick" "to select and apply a single commit without merging"
"child" "a commit that directly succeeds the current one in git's graph of commits"
"cleanup" "clean the state of the git repository, often after manually stopped operation"
"commit message" "a message that gets attached with any commit"
"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
"detached checkout" "checkout of a revision rather than a some head"
"file level merging" "any merge strategy that works on a file by file basis"
"file" ""
"head" "the last revision in a branch"
"hook" "script that gets executed automatically on some event"
"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."
"initial checkout" "the first checkout during a clone operation"
"initial commit" "The very first commit in a repository"
"local branch" "a branch that resides in the local git repository"
"loose object" "a Git object that is not part of any pack"
"master branch" "a branch called by convention 'master' that exists in a newly created git repository"
"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" ""
"origin" "a remote called by convention 'origin' that the current git repository has been cloned from"
"orphan commit" ""
"orphan reference" ""
"pack [noun]" "a file containing many git objects packed together"
"pack [verb]" "the process of creating a pack file"
"packed object" "a Git object part of some pack"
"parent" "a commit that directly precedes the current one in git's graph of commits"
"parent commit" "a commit that directly precedes the current one in git's graph of commits"
"patch" ""
"path" "The path to a file"
"prune" "Delete 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?)"
"rebase [noun]" "The process of rebasing one set of commits on top of another branch's head"
"rebase [verb]" "Re-apply one set of commits on top of another branch's head. Contrary to merge."
"redo" ""
"reference" ""
"reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
"refmap" ""
"refspec" ""
"remote [adj]" "The adjective for anything which is outside of the current (local) repository"
"remote branch" "A branch in any other ('remote') repository"
"remote repository" "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" ""
"resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git"
"revert changes" "abandon changes and go to pristine version"
"revert" ""
"revision expression" "expression that signifies a revision in git"
"stage/unstage" "add some content of files and directories to the staging area in preparation for a commit"
"stash" "temporarily save changes in a stack without committing"
"revision" "A particular state of files and directories which was stored in the object database."
"sign off" ""
"stage [noun], index" "see: staging area. In some areas of git this is called 'index'."
"stage [verb]" "add some content of files and directories to the staging area in preparation for a commit"
"staging area" "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'."
"stash [noun]" "The place (stack) where changes can be temporarily saved without committing"
"stash [verb]" "temporarily save changes in a stack without committing"
"status" ""
"submodule" ""
"tag [noun]" "A ref pointing to some commit object. In other words: A label on a specific commit."
"tag [verb]" "The process of creating a tag at a specific commit object"
"tagger" "The person who created a tag"
"tracked/untracked" "file whose content is tracked/not tracked by git"
"tracking branch" "A regular git branch that is used to follow changes from another repository."
"trailer" ""
"tree" "1. tree object, 2. directory tree"
"undo" ""
"unstage" "Remove content of files from the staging area again so that it will not be part of the next commit"
"unstash [verb]" "Retrieving the temporarily saved changes back again from the stash"
"update" ""
"upstream branch" ""
"verify" ""
"working directory, working copy, working tree" "The tree of actual checked out files."