зеркало из https://github.com/microsoft/git.git
Merge git://repo.or.cz/git-gui
* 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"
This commit is contained in:
Junio C Hamano
Коммит
105c21df14
|
|
@ -110,7 +110,7 @@ TCLTK_PATH_SED = $(subst ','\'',$(subst \,\\,$(TCLTK_PATH)))
|
|||
|
||||
gg_libdir ?= $(sharedir)/git-gui/lib
|
||||
libdir_SQ = $(subst ','\'',$(gg_libdir))
|
||||
libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir)))
|
||||
libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir_sed_in)))
|
||||
exedir = $(dir $(gitexecdir))share/git-gui/lib
|
||||
|
||||
GITGUI_SCRIPT := $$0
|
||||
|
|
@ -119,11 +119,12 @@ GITGUI_MACOSXAPP :=
|
|||
|
||||
ifeq ($(uname_O),Cygwin)
|
||||
GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
|
||||
gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
|
||||
gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
|
||||
else
|
||||
ifeq ($(exedir),$(gg_libdir))
|
||||
GITGUI_RELATIVE := 1
|
||||
endif
|
||||
gg_libdir_sed_in := $(gg_libdir)
|
||||
endif
|
||||
ifeq ($(uname_S),Darwin)
|
||||
ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
|
||||
|
|
|
|||
|
|
@ -290,11 +290,6 @@ method _write_local_path {args} {
|
|||
}
|
||||
|
||||
method _git_init {} {
|
||||
if {[file exists $local_path]} {
|
||||
error_popup [mc "Location %s already exists." $local_path]
|
||||
return 0
|
||||
}
|
||||
|
||||
if {[catch {file mkdir $local_path} err]} {
|
||||
error_popup [strcat \
|
||||
[mc "Failed to create repository %s:" $local_path] \
|
||||
|
|
@ -417,41 +412,35 @@ method _new_local_path {} {
|
|||
if {$p eq {}} return
|
||||
|
||||
set p [file normalize $p]
|
||||
if {[file isdirectory $p]} {
|
||||
foreach i [glob \
|
||||
-directory $p \
|
||||
-tails \
|
||||
-nocomplain \
|
||||
* .*] {
|
||||
switch -- $i {
|
||||
. continue
|
||||
.. continue
|
||||
default {
|
||||
error_popup [mc "Directory %s already exists." $p]
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
if {[catch {file delete $p} err]} {
|
||||
error_popup [strcat \
|
||||
[mc "Directory %s already exists." $p] \
|
||||
"\n\n$err"]
|
||||
return
|
||||
}
|
||||
} elseif {[file exists $p]} {
|
||||
error_popup [mc "File %s already exists." $p]
|
||||
if {![_new_ok $p]} {
|
||||
return
|
||||
}
|
||||
set local_path $p
|
||||
}
|
||||
|
||||
method _do_new2 {} {
|
||||
if {![_new_ok $local_path]} {
|
||||
return
|
||||
}
|
||||
if {![_git_init $this]} {
|
||||
return
|
||||
}
|
||||
set done 1
|
||||
}
|
||||
|
||||
proc _new_ok {p} {
|
||||
if {[file isdirectory $p]} {
|
||||
if {[_is_git [file join $p .git]]} {
|
||||
error_popup [mc "Directory %s already exists." $p]
|
||||
return 0
|
||||
}
|
||||
} elseif {[file exists $p]} {
|
||||
error_popup [mc "File %s already exists." $p]
|
||||
return 0
|
||||
}
|
||||
return 1
|
||||
}
|
||||
|
||||
######################################################################
|
||||
##
|
||||
## Clone Existing Repository
|
||||
|
|
@ -607,6 +596,11 @@ method _do_clone2 {} {
|
|||
}
|
||||
}
|
||||
|
||||
if {[file exists $local_path]} {
|
||||
error_popup [mc "Location %s already exists." $local_path]
|
||||
return
|
||||
}
|
||||
|
||||
if {![_git_init $this]} return
|
||||
set local_path [pwd]
|
||||
|
||||
|
|
|
|||
|
|
@ -358,5 +358,7 @@ proc apply_hunk {x y} {
|
|||
display_file $current_diff_path $mi
|
||||
if {$o eq {_}} {
|
||||
clear_diff
|
||||
} else {
|
||||
set current_diff_path $current_diff_path
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -386,7 +386,9 @@ proc revert_helper {txt paths} {
|
|||
set reply [tk_dialog \
|
||||
.confirm_revert \
|
||||
"[appname] ([reponame])" \
|
||||
[mc "Any unstaged changes will be permanently lost by the revert."] \
|
||||
"$query
|
||||
|
||||
[mc "Any unstaged changes will be permanently lost by the revert."]" \
|
||||
question \
|
||||
1 \
|
||||
[mc "Do Nothing"] \
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgstr ""
|
|||
"Project-Id-Version: git-gui\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2007-11-24 10:36+0100\n"
|
||||
"PO-Revision-Date: 2007-11-24 10:55+0100\n"
|
||||
"PO-Revision-Date: 2008-01-15 20:33+0100\n"
|
||||
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
|
||||
"Language-Team: German\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -272,7 +272,7 @@ msgstr "Neue Version"
|
|||
|
||||
#: git-gui.sh:1973 git-gui.sh:2357
|
||||
msgid "Amend Last Commit"
|
||||
msgstr "Letzte Version nachbessern"
|
||||
msgstr "Letzte nachbessern"
|
||||
|
||||
#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
|
||||
msgid "Rescan"
|
||||
|
|
@ -284,7 +284,7 @@ msgstr "Zum Eintragen bereitstellen"
|
|||
|
||||
#: git-gui.sh:1994
|
||||
msgid "Stage Changed Files To Commit"
|
||||
msgstr "Geänderte Dateien zum Eintragen bereitstellen"
|
||||
msgstr "Geänderte Dateien bereitstellen"
|
||||
|
||||
#: git-gui.sh:2000
|
||||
msgid "Unstage From Commit"
|
||||
|
|
@ -292,7 +292,7 @@ msgstr "Aus der Bereitstellung herausnehmen"
|
|||
|
||||
#: git-gui.sh:2005 lib/index.tcl:393
|
||||
msgid "Revert Changes"
|
||||
msgstr "Änderungen revidieren"
|
||||
msgstr "Änderungen verwerfen"
|
||||
|
||||
#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
|
||||
msgid "Sign Off"
|
||||
|
|
@ -351,7 +351,7 @@ msgstr "Aktueller Zweig:"
|
|||
|
||||
#: git-gui.sh:2255
|
||||
msgid "Staged Changes (Will Commit)"
|
||||
msgstr "Bereitgestellte Änderungen (zum Eintragen)"
|
||||
msgstr "Bereitstellung (zum Eintragen)"
|
||||
|
||||
#: git-gui.sh:2274
|
||||
msgid "Unstaged Changes"
|
||||
|
|
@ -403,7 +403,7 @@ msgstr "Aktualisieren"
|
|||
|
||||
#: git-gui.sh:2566
|
||||
msgid "Apply/Reverse Hunk"
|
||||
msgstr "Änderung anwenden/umkehren"
|
||||
msgstr "Kontext anwenden/umkehren"
|
||||
|
||||
#: git-gui.sh:2572
|
||||
msgid "Decrease Font Size"
|
||||
|
|
@ -415,19 +415,19 @@ msgstr "Schriftgröße vergrößern"
|
|||
|
||||
#: git-gui.sh:2581
|
||||
msgid "Show Less Context"
|
||||
msgstr "Weniger Kontext anzeigen"
|
||||
msgstr "Weniger Zeilen anzeigen"
|
||||
|
||||
#: git-gui.sh:2588
|
||||
msgid "Show More Context"
|
||||
msgstr "Mehr Kontext anzeigen"
|
||||
msgstr "Mehr Zeilen anzeigen"
|
||||
|
||||
#: git-gui.sh:2602
|
||||
msgid "Unstage Hunk From Commit"
|
||||
msgstr "Aus der Bereitstellung herausnehmen"
|
||||
msgstr "Kontext aus Bereitstellung herausnehmen"
|
||||
|
||||
#: git-gui.sh:2604
|
||||
msgid "Stage Hunk For Commit"
|
||||
msgstr "In die Bereitstellung hinzufügen"
|
||||
msgstr "Kontext zur Bereitstellung hinzufügen"
|
||||
|
||||
#: git-gui.sh:2623
|
||||
msgid "Initializing..."
|
||||
|
|
@ -914,11 +914,11 @@ msgstr "Neu..."
|
|||
|
||||
#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
|
||||
msgid "Clone Existing Repository"
|
||||
msgstr "Projektarchiv kopieren"
|
||||
msgstr "Projektarchiv klonen"
|
||||
|
||||
#: lib/choose_repository.tcl:99
|
||||
msgid "Clone..."
|
||||
msgstr "Kopieren..."
|
||||
msgstr "Klonen..."
|
||||
|
||||
#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
|
||||
msgid "Open Existing Repository"
|
||||
|
|
@ -968,7 +968,7 @@ msgstr "Datei »%s« existiert bereits."
|
|||
|
||||
#: lib/choose_repository.tcl:463
|
||||
msgid "Clone"
|
||||
msgstr "Kopieren"
|
||||
msgstr "Klonen"
|
||||
|
||||
#: lib/choose_repository.tcl:476
|
||||
msgid "URL:"
|
||||
|
|
@ -976,7 +976,7 @@ msgstr "URL:"
|
|||
|
||||
#: lib/choose_repository.tcl:496
|
||||
msgid "Clone Type:"
|
||||
msgstr "Art der Kopie:"
|
||||
msgstr "Art des Klonens:"
|
||||
|
||||
#: lib/choose_repository.tcl:502
|
||||
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
|
||||
|
|
@ -1025,7 +1025,7 @@ msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
|
|||
#: lib/choose_repository.tcl:690
|
||||
#, tcl-format
|
||||
msgid "Nothing to clone from %s."
|
||||
msgstr "Von »%s« konnte nichts kopiert werden."
|
||||
msgstr "Von »%s« konnte nichts geklont werden."
|
||||
|
||||
#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
|
||||
#: lib/choose_repository.tcl:918
|
||||
|
|
@ -1086,7 +1086,7 @@ msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
|
|||
|
||||
#: lib/choose_repository.tcl:897
|
||||
msgid "Clone failed."
|
||||
msgstr "Kopieren fehlgeschlagen."
|
||||
msgstr "Klonen fehlgeschlagen."
|
||||
|
||||
#: lib/choose_repository.tcl:904
|
||||
msgid "No default branch obtained."
|
||||
|
|
@ -1440,11 +1440,11 @@ msgstr "Fehler beim Laden des Vergleichs:"
|
|||
|
||||
#: lib/diff.tcl:302
|
||||
msgid "Failed to unstage selected hunk."
|
||||
msgstr "Fehler beim Herausnehmen der gewählten Dateien aus der Bereitstellung."
|
||||
msgstr "Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
|
||||
|
||||
#: lib/diff.tcl:309
|
||||
msgid "Failed to stage selected hunk."
|
||||
msgstr "Fehler beim Bereitstellen der gewählten Dateien."
|
||||
msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
|
||||
|
||||
#: lib/error.tcl:12 lib/error.tcl:102
|
||||
msgid "error"
|
||||
|
|
@ -1494,17 +1494,16 @@ msgstr "»%s« hinzufügen..."
|
|||
#: lib/index.tcl:381
|
||||
#, tcl-format
|
||||
msgid "Revert changes in file %s?"
|
||||
msgstr "Änderungen in Datei »%s« revidieren?"
|
||||
msgstr "Änderungen in Datei »%s« verwerfen?"
|
||||
|
||||
#: lib/index.tcl:383
|
||||
#, tcl-format
|
||||
msgid "Revert changes in these %i files?"
|
||||
msgstr "Änderungen in den gewählten %i Dateien revidieren?"
|
||||
msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
|
||||
|
||||
#: lib/index.tcl:389
|
||||
msgid "Any unstaged changes will be permanently lost by the revert."
|
||||
msgstr ""
|
||||
"Alle nicht bereitgestellten Änderungen werden beim Revidieren verloren gehen."
|
||||
msgstr "Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
|
||||
|
||||
#: lib/index.tcl:392
|
||||
msgid "Do Nothing"
|
||||
|
|
@ -1730,7 +1729,7 @@ msgstr "Optionen konnten nicht gespeichert werden:"
|
|||
|
||||
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
|
||||
msgid "Delete Remote Branch"
|
||||
msgstr "Zweig im anderen Projektarchiv löschen"
|
||||
msgstr "Zweig aus anderem Projektarchiv löschen"
|
||||
|
||||
#: lib/remote_branch_delete.tcl:47
|
||||
msgid "From Repository"
|
||||
|
|
@ -1852,7 +1851,7 @@ msgstr "Neue Änderungen von »%s« holen"
|
|||
#: lib/transport.tcl:18
|
||||
#, tcl-format
|
||||
msgid "remote prune %s"
|
||||
msgstr "Entfernen von »%s« im anderen Archiv"
|
||||
msgstr "Entfernen von »%s« aus anderem Archiv"
|
||||
|
||||
#: lib/transport.tcl:19
|
||||
#, tcl-format
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -6,8 +6,8 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: git-gui glossary\n"
|
||||
"POT-Creation-Date: 2007-10-19 21:43+0200\n"
|
||||
"PO-Revision-Date: 2007-10-20 15:24+0200\n"
|
||||
"POT-Creation-Date: 2008-01-07 21:20+0100\n"
|
||||
"PO-Revision-Date: 2008-01-15 20:32+0100\n"
|
||||
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
|
||||
"Language-Team: German \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -62,7 +62,7 @@ msgstr ""
|
|||
|
||||
#. ""
|
||||
msgid "clone [verb]"
|
||||
msgstr "kopieren"
|
||||
msgstr "klonen"
|
||||
|
||||
#. "A single point in the git history."
|
||||
msgid "commit [noun]"
|
||||
|
|
@ -92,6 +92,10 @@ msgstr "Schnellzusammenführung"
|
|||
msgid "fetch"
|
||||
msgstr "anfordern (holen?)"
|
||||
|
||||
#. "One context of consecutive lines in a whole patch, which consists of many such hunks"
|
||||
msgid "hunk"
|
||||
msgstr "Kontext"
|
||||
|
||||
#. "A collection of files. The index is a stored version of your working tree."
|
||||
msgid "index (in git-gui: staging area)"
|
||||
msgstr "Bereitstellung"
|
||||
|
|
@ -138,7 +142,7 @@ msgstr "zurücksetzen (zurückkehren?)"
|
|||
|
||||
#. ""
|
||||
msgid "revert"
|
||||
msgstr "revidieren"
|
||||
msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)"
|
||||
|
||||
#. "A particular state of files and directories which was stored in the object database."
|
||||
msgid "revision"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,166 @@
|
|||
# translation of fr.po to French
|
||||
# Translation of git-gui glossary to French
|
||||
# Copyright (C) 2008 Shawn Pearce, et al.
|
||||
#
|
||||
# Christian Couder <chriscool@tuxfamily.org>, 2008.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: fr\n"
|
||||
"POT-Creation-Date: 2008-01-15 21:04+0100\n"
|
||||
"PO-Revision-Date: 2008-01-15 21:17+0100\n"
|
||||
"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n"
|
||||
"Language-Team: French\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: KBabel 1.11.4\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
|
||||
#. "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.)"
|
||||
msgid "English Term (Dear translator: This file will never be visible to the user!)"
|
||||
msgstr ""
|
||||
|
||||
#. ""
|
||||
msgid "amend"
|
||||
msgstr "corriger"
|
||||
|
||||
#. ""
|
||||
msgid "annotate"
|
||||
msgstr "annoter"
|
||||
|
||||
#. "A 'branch' is an active line of development."
|
||||
msgid "branch [noun]"
|
||||
msgstr "branche"
|
||||
|
||||
#. ""
|
||||
msgid "branch [verb]"
|
||||
msgstr "créer une branche"
|
||||
|
||||
#. ""
|
||||
msgid "checkout [noun]"
|
||||
msgstr "emprunt"
|
||||
|
||||
#. "The action of updating the working tree to a revision which was stored in the object database."
|
||||
msgid "checkout [verb]"
|
||||
msgstr "emprunter"
|
||||
|
||||
#. ""
|
||||
msgid "clone [verb]"
|
||||
msgstr "cloner"
|
||||
|
||||
#. "A single point in the git history."
|
||||
msgid "commit [noun]"
|
||||
msgstr "commit"
|
||||
|
||||
#. "The action of storing a new snapshot of the project's state in the git history."
|
||||
msgid "commit [verb]"
|
||||
msgstr "commiter"
|
||||
|
||||
#. ""
|
||||
msgid "diff [noun]"
|
||||
msgstr "différence"
|
||||
|
||||
#. ""
|
||||
msgid "diff [verb]"
|
||||
msgstr "comparer"
|
||||
|
||||
#. "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 "fusion par avance rapide"
|
||||
|
||||
#. "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 "récupérer"
|
||||
|
||||
#. "A collection of files. The index is a stored version of your working tree."
|
||||
msgid "index (in git-gui: staging area)"
|
||||
msgstr "pré-commit"
|
||||
|
||||
#. "A successful merge results in the creation of a new commit representing the result of the merge."
|
||||
msgid "merge [noun]"
|
||||
msgstr "fusion"
|
||||
|
||||
#. "To bring the contents of another branch into the current branch."
|
||||
msgid "merge [verb]"
|
||||
msgstr "fusionner"
|
||||
|
||||
#. ""
|
||||
msgid "message"
|
||||
msgstr "message"
|
||||
|
||||
#. "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>'."
|
||||
msgid "prune"
|
||||
msgstr "nettoyer"
|
||||
|
||||
#. "Pulling a branch means to fetch it and merge it."
|
||||
msgid "pull"
|
||||
msgstr "tirer"
|
||||
|
||||
#. "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 "pousser"
|
||||
|
||||
#. ""
|
||||
msgid "redo"
|
||||
msgstr "refaire"
|
||||
|
||||
#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
|
||||
msgid "remote"
|
||||
msgstr "référentiel distant"
|
||||
|
||||
#. "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 "référentiel"
|
||||
|
||||
#. ""
|
||||
msgid "reset"
|
||||
msgstr "réinitialiser"
|
||||
|
||||
#. ""
|
||||
msgid "revert"
|
||||
msgstr "inverser"
|
||||
|
||||
#. "A particular state of files and directories which was stored in the object database."
|
||||
msgid "revision"
|
||||
msgstr "révision"
|
||||
|
||||
#. ""
|
||||
msgid "sign off"
|
||||
msgstr "signer"
|
||||
|
||||
#. ""
|
||||
msgid "staging area"
|
||||
msgstr "pré-commit"
|
||||
|
||||
#. ""
|
||||
msgid "status"
|
||||
msgstr "état"
|
||||
|
||||
#. "A ref pointing to a tag or commit object"
|
||||
msgid "tag [noun]"
|
||||
msgstr "marque"
|
||||
|
||||
#. ""
|
||||
msgid "tag [verb]"
|
||||
msgstr "marquer"
|
||||
|
||||
#. "A regular git branch that is used to follow changes from another repository."
|
||||
msgid "tracking branch"
|
||||
msgstr "branche de suivi"
|
||||
|
||||
#. ""
|
||||
msgid "undo"
|
||||
msgstr "défaire"
|
||||
|
||||
#. ""
|
||||
msgid "update"
|
||||
msgstr "mise à jour"
|
||||
|
||||
#. ""
|
||||
msgid "verify"
|
||||
msgstr "vérifier"
|
||||
|
||||
#. "The tree of actual checked out files."
|
||||
msgid "working copy, working tree"
|
||||
msgstr "copie de travail, arborescence de travail"
|
||||
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2007-10-19 21:43+0200\n"
|
||||
"POT-Creation-Date: 2008-01-07 21:20+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"
|
||||
|
|
@ -70,6 +70,10 @@ msgstr ""
|
|||
msgid "fetch"
|
||||
msgstr ""
|
||||
|
||||
#. "One context of consecutive lines in a whole patch, which consists of many such hunks"
|
||||
msgid "hunk"
|
||||
msgstr ""
|
||||
|
||||
#. "A collection of files. The index is a stored version of your working tree."
|
||||
msgid "index (in git-gui: staging area)"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
"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."
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
# Copyright (C) 2007 Shawn Pearce, et al.
|
||||
# This file is distributed under the same license as the git-gui package.
|
||||
#
|
||||
# Peter Karlsson <peter@softwolves.pp.se>, 2007.
|
||||
# Peter Karlsson <peter@softwolves.pp.se>, 2007-2008.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: sv\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2007-11-24 10:36+0100\n"
|
||||
"PO-Revision-Date: 2007-12-27 13:31CET-1\n"
|
||||
"PO-Revision-Date: 2008-01-12 09:27+0100\n"
|
||||
"Last-Translator: Peter Karlsson <peter@softwolves.pp.se>\n"
|
||||
"Language-Team: Swedish <sv@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -67,11 +67,11 @@ msgstr "Git-katalogen hittades inte:"
|
|||
|
||||
#: git-gui.sh:895
|
||||
msgid "Cannot move to top of working directory:"
|
||||
msgstr "Kunde inte gå till början på arbetskatalogen:"
|
||||
msgstr "Kan inte gå till början på arbetskatalogen:"
|
||||
|
||||
#: git-gui.sh:902
|
||||
msgid "Cannot use funny .git directory:"
|
||||
msgstr "Kunde inte använda underlig .git-katalog:"
|
||||
msgstr "Kan inte använda underlig .git-katalog:"
|
||||
|
||||
#: git-gui.sh:907
|
||||
msgid "No working directory"
|
||||
|
|
@ -87,7 +87,7 @@ msgstr "Söker efter ändrade filer..."
|
|||
|
||||
#: git-gui.sh:1294 lib/browser.tcl:245
|
||||
msgid "Ready."
|
||||
msgstr "Redo."
|
||||
msgstr "Klar."
|
||||
|
||||
#: git-gui.sh:1560
|
||||
msgid "Unmodified"
|
||||
|
|
@ -127,7 +127,7 @@ msgstr "Köade för borttagning, fortfarande närvarande"
|
|||
|
||||
#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
|
||||
msgid "Requires merge resolution"
|
||||
msgstr "Kräver avgörande efter sammanslagning"
|
||||
msgstr "Kräver konflikthantering efter sammanslagning"
|
||||
|
||||
#: git-gui.sh:1614
|
||||
msgid "Starting gitk... please wait..."
|
||||
|
|
@ -499,23 +499,23 @@ msgstr "Läser %s..."
|
|||
|
||||
#: lib/blame.tcl:473
|
||||
msgid "Loading copy/move tracking annotations..."
|
||||
msgstr "Läser spårningsanteckningar för kopiering/flyttning..."
|
||||
msgstr "Läser annoteringar för kopiering/flyttning..."
|
||||
|
||||
#: lib/blame.tcl:493
|
||||
msgid "lines annotated"
|
||||
msgstr "rader spårade"
|
||||
msgstr "rader annoterade"
|
||||
|
||||
#: lib/blame.tcl:674
|
||||
msgid "Loading original location annotations..."
|
||||
msgstr "Läser in spårning av originalplacering..."
|
||||
msgstr "Läser in annotering av originalplacering..."
|
||||
|
||||
#: lib/blame.tcl:677
|
||||
msgid "Annotation complete."
|
||||
msgstr "Spårning fullbordad."
|
||||
msgstr "Annotering fullbordad."
|
||||
|
||||
#: lib/blame.tcl:731
|
||||
msgid "Loading annotation..."
|
||||
msgstr "Läser in spårning..."
|
||||
msgstr "Läser in annotering..."
|
||||
|
||||
#: lib/blame.tcl:787
|
||||
msgid "Author:"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче