* How to email out commit message automatically?
From: Weiwei Shu @ 2010-01-27 16:20 UTC (permalink / raw)
To: git, shuww2008
Hi All,
The second time to post here. Git is great.
I would like to email the commit message to my Gmail box automatically
whenever I submit a commit. Can anybody point me a link on how to do
that? I've searched it for half day but not successful. Thanks!
Weiwei
^ permalink raw reply
* Re: [PATCH] Fix remote.<remote>.vcs
From: Sverre Rabbelier @ 2010-01-27 16:22 UTC (permalink / raw)
To: Ilari Liusvaara; +Cc: git, Tor Arvid Lund
In-Reply-To: <1264608977-20665-1-git-send-email-ilari.liusvaara@elisanet.fi>
Heya,
On Wed, Jan 27, 2010 at 17:16, Ilari Liusvaara
<ilari.liusvaara@elisanet.fi> wrote:
> it isn't likely anyone is using VCS setting and multiple
> push URLs, as VCS setting is meant for non-URL-based helpers
I don't like that assumption, I've used the vcs setting with regular
urls myself, is there a different way to solve this without
introducing that assumption? Also, what happens if one _does_ do that,
do we crash? abort?
--
Cheers,
Sverre Rabbelier
^ permalink raw reply
* Re: How to email out commit message automatically?
From: Matthieu Moy @ 2010-01-27 16:36 UTC (permalink / raw)
To: Weiwei Shu; +Cc: git, shuww2008
In-Reply-To: <65d12cb11001270820i7094001odc4d9f27b7f57767@mail.gmail.com>
Weiwei Shu <shuww1980@gmail.com> writes:
> Hi All,
>
> The second time to post here. Git is great.
>
> I would like to email the commit message to my Gmail box automatically
> whenever I submit a commit. Can anybody point me a link on how to do
> that? I've searched it for half day but not successful. Thanks!
http://git.kernel.org/?p=git/git.git;a=blob;f=contrib/hooks/post-receive-email
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply
* Re: How to email out commit message automatically?
From: Weiwei Shu @ 2010-01-27 16:38 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git, shuww2008
In-Reply-To: <vpq7hr3wln2.fsf@bauges.imag.fr>
Matthieu,
Thank you very much!! I'll give it a shot and hope it will work in Windows.
Weiwei
On Wed, Jan 27, 2010 at 11:36 AM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> Weiwei Shu <shuww1980@gmail.com> writes:
>
>> Hi All,
>>
>> The second time to post here. Git is great.
>>
>> I would like to email the commit message to my Gmail box automatically
>> whenever I submit a commit. Can anybody point me a link on how to do
>> that? I've searched it for half day but not successful. Thanks!
>
> http://git.kernel.org/?p=git/git.git;a=blob;f=contrib/hooks/post-receive-email
>
> --
> Matthieu Moy
> http://www-verimag.imag.fr/~moy/
>
--
Weiwei
--Hope Springs Eternal.
^ permalink raw reply
* Re: [PATCH not-for-mainline] Implement git-vcs-p4
From: Daniel Barkalow @ 2010-01-27 16:49 UTC (permalink / raw)
To: Ilari Liusvaara; +Cc: Tor Arvid Lund, git
In-Reply-To: <20100127155636.GA18210@Knoppix>
On Wed, 27 Jan 2010, Ilari Liusvaara wrote:
> On Wed, Jan 27, 2010 at 12:18:35PM +0100, Tor Arvid Lund wrote:
>
> > Then, I did 'git fetch', and got a seg fault. I got around it by
> > commenting out a line:
> >
> > diff --git a/transport.c b/transport.c
> > index 7714fdb..5b404f7 100644
> > --- a/transport.c
> > +++ b/transport.c
> > @@ -924,7 +924,7 @@ struct transport *transport_get(struct remote
> > *remote, const char *url)
> > ret->url = url;
> >
> > /* In case previous URL had helper forced, reset it. */
> > - remote->foreign_vcs = NULL;
> > +/* remote->foreign_vcs = NULL;*/
> >
> > /* maybe it is a foreign URL? */
> > if (url) {
> >
>
> Hmm... And just commenting out that line will break case if you have
> push URL using remote helpers and second one for same remote that
> doesn't.
>
> I'll look into that issue.
I think that field should only be used for things like:
[remote "foo"]
vcs = something
...
and the case where the helper is inferred from the URL shouldn't use a
field on the remote, but be passing the information around in function
arguments. A field of the struct remote only really makes sense with
information that applies to the whole remote.
-Daniel
*This .sig left intentionally blank*
^ permalink raw reply
* Re: [PATCH not-for-mainline] Implement git-vcs-p4
From: Ilari Liusvaara @ 2010-01-27 17:14 UTC (permalink / raw)
To: Daniel Barkalow; +Cc: Tor Arvid Lund, git
In-Reply-To: <alpine.LNX.2.00.1001271145500.14365@iabervon.org>
On Wed, Jan 27, 2010 at 11:49:02AM -0500, Daniel Barkalow wrote:
> On Wed, 27 Jan 2010, Ilari Liusvaara wrote:
>
> > On Wed, Jan 27, 2010 at 12:18:35PM +0100, Tor Arvid Lund wrote:
> >
> > > Then, I did 'git fetch', and got a seg fault. I got around it by
> > > commenting out a line:
> > >
> > > diff --git a/transport.c b/transport.c
> > > index 7714fdb..5b404f7 100644
> > > --- a/transport.c
> > > +++ b/transport.c
> > > @@ -924,7 +924,7 @@ struct transport *transport_get(struct remote
> > > *remote, const char *url)
> > > ret->url = url;
> > >
> > > /* In case previous URL had helper forced, reset it. */
> > > - remote->foreign_vcs = NULL;
> > > +/* remote->foreign_vcs = NULL;*/
> > >
> > > /* maybe it is a foreign URL? */
> > > if (url) {
> > >
> >
> > Hmm... And just commenting out that line will break case if you have
> > push URL using remote helpers and second one for same remote that
> > doesn't.
> >
> > I'll look into that issue.
>
> I think that field should only be used for things like:
>
> [remote "foo"]
> vcs = something
> ...
>
> and the case where the helper is inferred from the URL shouldn't use a
> field on the remote, but be passing the information around in function
> arguments. A field of the struct remote only really makes sense with
> information that applies to the whole remote.
Why that 'remote->foreign_vcs = NULL;' is there is the following case:
[remote "origin"]
url = gits::git://[@/tmp/gits]/git-d2
url = ssh://repo.or.cz/srv/git/git-daemon2.git
The first URL is handled by 'gits' helper (as it should). But without
resetting the helper, it tries to pass that ssh:// URL to 'gits' helper
too (instead of handling it internally).
But, that reset didn't take the vcs setting into account.
-Ilari
^ permalink raw reply
* [problem] out of memory
From: Frédéric Heulin @ 2010-01-27 17:16 UTC (permalink / raw)
To: git
Hi All,
I have a cvs repository I try to convert to git.
I have used cvs2git (1 week old) to get the dumps from cvs.
To be able to do the fast-import import into the new git.
I had to use a bigger machine than mine (the big is 64bits, 8GB ram, mine is 32bits,4GB ram)
because on my machine git ran out of memory.
Once converted, I tried to do a clone, it ran out of memory on my machine.
- version used for gitc
- on my machine : 1.6.6.1
- on the big machine : 1.5.6.5 (debian lenny)
- Here's the list of the commands that failed out of memory (stop at 2.7GB memory consumed):
git for-each-ref
git rev-list --branches --tags
- this command succeeded :
git rev-list --branches (80MB consumed)
- some packing have been done :
git repack -a -d -f
git pack-ref --all
(on the big machine, it fails on mine)
after the git commands keep failing out of memory, 'git rev-list --branches' included.
- there is 2159 refs in the repository.
- git count-objects -v gives :
count: 0
size: 0
in-pack: 133986
packs: 1
size-pack: 365678
prune-packable: 0
garbage: 0
- I still have a copy of the cvs and git repositories for testing.
Thanks in advance for any help,
Frédéric Heulin.
^ permalink raw reply
* Re: [PATCH not-for-mainline] Implement git-vcs-p4
From: Daniel Barkalow @ 2010-01-27 17:18 UTC (permalink / raw)
To: Tor Arvid Lund; +Cc: git
In-Reply-To: <1a6be5fa1001270318h4ac8ac3bnaba48787a5b3efa6@mail.gmail.com>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 4691 bytes --]
On Wed, 27 Jan 2010, Tor Arvid Lund wrote:
> On Mon, Jan 25, 2010 at 10:35 PM, Daniel Barkalow <barkalow@iabervon.org> wrote:
> > This is probably not particularly appropriate for mainline
> > application, and is somewhat buggy, not extensively tested, and
> > incomplete. The push support is also currently based on a transport helper
> > export design that isn't upstream and I don't like any more; a better
> > design is probably to have the core send an "export" command and then a
> > gfi stream, but I haven't worked on this.
> >
> > It has two implementations of the interaction with the Perforce
> > server: one that uses the command-line client (and therefore makes a
> > ton of separate connections to the server) and one that uses the
> > (closed source, vaguely licensed) C++ API. The former does not support
> > everything used in push/submit correctly at this point.
> >
> > It also adds support to the Makefile for building C++ object files and
> > linking with a C++ linker. It should be easy to omit entirely for
> > builds that don't use p4, and it's at least somewhat out of the way.
> >
> > The biggest flaw currently is that it doesn't save its analysis of the
> > structure of the history, and doesn't have a way to push it out of memory,
> > so a long or complex history will run you out of memory or will take a
> > long time to do an incremental fetch.
> >
> > Fetch features:
> >
> > - following integrations (with some guessing)
> > - finding other branches of a codeline
> >
> > Push features (only with the C++ API):
> >
> > - works if you don't do anything at all complicated
> >
> > Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
> <snip>
>
> Hi, and thank you for posting this.
>
> I tried applying it to current master, and got it to compile using the
> p4 c++ api.
>
> However, I'm having trouble getting it to run. This is most certainly
> my own fault, and I'm guessing it has to do with my .git/config file
> setup.
>
> I tried doing 'git init', and making a .git/config file like so:
> ------------
> [core]
> repositoryformatversion = 0
> filemode = true
> bare = false
> logallrefupdates = true
>
> [vcs-p4]
> port = perforce.mycompany.com:1666
> client = toral
>
> [remote "origin"]
> vcs = p4
> codeline = //depot/path/to/my/existing/test/project
> ------------
> Then, I did 'git fetch', and got a seg fault. I got around it by
> commenting out a line:
>
> diff --git a/transport.c b/transport.c
> index 7714fdb..5b404f7 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -924,7 +924,7 @@ struct transport *transport_get(struct remote
> *remote, const char *url)
> ret->url = url;
>
> /* In case previous URL had helper forced, reset it. */
> - remote->foreign_vcs = NULL;
> +/* remote->foreign_vcs = NULL;*/
>
> /* maybe it is a foreign URL? */
> if (url) {
>
> -------------
> So - now I get this:
>
> $ GIT_TRANSPORT_HELPER_DEBUG=1 git fetch
> Debug: Remote helper: -> capabilities
> Debug: Remote helper: Waiting...
> Debug: Remote helper: <- import
> Debug: Got cap import
> Debug: Remote helper: Waiting...
> Debug: Remote helper: <- export
> Debug: Got cap export
> Debug: Remote helper: Waiting...
> Debug: Remote helper: <-
> Debug: Capabilities complete.
> Debug: Remote helper: Waiting...
> Debug: Remote helper: <- ? refs/p4/depot/path/to/my/existing/test/project
> Debug: Remote helper: Waiting...
> Debug: Remote helper: <- ? refs/p4/depot/path/to/my/existing/test/project
> Debug: Remote helper: Waiting...
> Debug: Remote helper: <-
> Debug: Read ref listing.
> fatal: Couldn't find remote ref HEAD
> -------------
>
> I also tried setting vcs-p4.findbranches to 'true'. The only
> difference in the output, is that the "<- ? refs/p4/..." line is just
> output once.
>
> So if anyone has a clue for me, I shall, well, cease to be clueless.
The p4 remote helper doesn't present the remote as having a ref "HEAD". It
probably ought to when you've configured exactly one codeline, which is
obviously the default you mean. (And that should be an easy addition.)
The way I use it is to have a line like:
fetch = refs/p4/depot/path/to/my/existing/test/project:refs/remotes/origin/master
Or, actually, I'm making a mirror of the p4 (since I want multiple
working directories without redoing the import), so I'm fetching a pattern
into refs/heads/*.
The findBranches thing can identify more branches by looking at outgoing
integrations, but these (if any) come out with the same long branches
name, and need to be fetched into something sensible.
-Daniel
*This .sig left intentionally blank*
^ permalink raw reply
* Re: [PATCH] Fix remote.<remote>.vcs
From: Ilari Liusvaara @ 2010-01-27 17:18 UTC (permalink / raw)
To: Sverre Rabbelier; +Cc: git, Tor Arvid Lund
In-Reply-To: <fabb9a1e1001270822u7727b0fdq3270ee5bb3ce546c@mail.gmail.com>
On Wed, Jan 27, 2010 at 05:22:07PM +0100, Sverre Rabbelier wrote:
> Heya,
>
> On Wed, Jan 27, 2010 at 17:16, Ilari Liusvaara
> <ilari.liusvaara@elisanet.fi> wrote:
> > it isn't likely anyone is using VCS setting and multiple
> > push URLs, as VCS setting is meant for non-URL-based helpers
>
> I don't like that assumption, I've used the vcs setting with regular
> urls myself, is there a different way to solve this without
> introducing that assumption? Also, what happens if one _does_ do that,
> do we crash? abort?
If you have url-based remote helper, then use the <helper>::<URL> syntax.
As for what would happen: If you don't override with URL, the first
URL would use remote helper specified by vcs setting.
Maybe it would be better idea to have vcs setting set the default
helper (that gets used unless you override?)
-Ilari
^ permalink raw reply
* Re: [PATCH not-for-mainline] Implement git-vcs-p4
From: Daniel Barkalow @ 2010-01-27 17:28 UTC (permalink / raw)
To: Ilari Liusvaara; +Cc: Tor Arvid Lund, git
In-Reply-To: <20100127171426.GA20820@Knoppix>
On Wed, 27 Jan 2010, Ilari Liusvaara wrote:
> On Wed, Jan 27, 2010 at 11:49:02AM -0500, Daniel Barkalow wrote:
> > On Wed, 27 Jan 2010, Ilari Liusvaara wrote:
> >
> > > On Wed, Jan 27, 2010 at 12:18:35PM +0100, Tor Arvid Lund wrote:
> > >
> > > > Then, I did 'git fetch', and got a seg fault. I got around it by
> > > > commenting out a line:
> > > >
> > > > diff --git a/transport.c b/transport.c
> > > > index 7714fdb..5b404f7 100644
> > > > --- a/transport.c
> > > > +++ b/transport.c
> > > > @@ -924,7 +924,7 @@ struct transport *transport_get(struct remote
> > > > *remote, const char *url)
> > > > ret->url = url;
> > > >
> > > > /* In case previous URL had helper forced, reset it. */
> > > > - remote->foreign_vcs = NULL;
> > > > +/* remote->foreign_vcs = NULL;*/
> > > >
> > > > /* maybe it is a foreign URL? */
> > > > if (url) {
> > > >
> > >
> > > Hmm... And just commenting out that line will break case if you have
> > > push URL using remote helpers and second one for same remote that
> > > doesn't.
> > >
> > > I'll look into that issue.
> >
> > I think that field should only be used for things like:
> >
> > [remote "foo"]
> > vcs = something
> > ...
> >
> > and the case where the helper is inferred from the URL shouldn't use a
> > field on the remote, but be passing the information around in function
> > arguments. A field of the struct remote only really makes sense with
> > information that applies to the whole remote.
>
> Why that 'remote->foreign_vcs = NULL;' is there is the following case:
>
> [remote "origin"]
> url = gits::git://[@/tmp/gits]/git-d2
> url = ssh://repo.or.cz/srv/git/git-daemon2.git
>
> The first URL is handled by 'gits' helper (as it should). But without
> resetting the helper, it tries to pass that ssh:// URL to 'gits' helper
> too (instead of handling it internally).
>
> But, that reset didn't take the vcs setting into account.
Yes, but the first URL should be directed to the 'gits' helper
without setting remote->foreign_vcs. That is, instead of setting
remote->foreign_vcs, you should just call transport_helper_init(ret,
xstrndup(url, p - url));
-Daniel
*This .sig left intentionally blank*
^ permalink raw reply
* Re: cvs revision number -> git commit name?
From: Hallvard B Furuseth @ 2010-01-27 17:47 UTC (permalink / raw)
To: Johan Herland; +Cc: git, Aaron Crane
In-Reply-To: <201001270043.44614.johan@herland.net>
Johan Herland writes:
>On Tuesday 26 January 2010, Aaron Crane wrote:
>> One thing to be aware of (beyond the need to run grep to convert old
>> CVS revision numbers to Git commit IDs)
which sounds like a job for a small tool, maybe aliased in .git/config.
'git cvsinfo file.c 1.23' or 'git cvsinfo [file.c] <git-commitname>' -->
output cvs and git commit info (cvs rev, commit, log message, etc).
Or maybe it shouldn't be cvs-specific.
>> is that there's a good chance
>> the mapping file will pollute the results of `git grep` for some
>> tasks. (We've put the mapping file into our repo, where it's easy to
>> find.) I'm considering gzipping the mapping file as a workaround;
>> that would mean our users will need to use zgrep (or equivalent) to
>> look up CVS revision numbers, which may or may not be a problem in
>> your situation.
Thanks for the tip. Zipping sounds good. In particular combined with
the grepping tool above. If the unzipping gets slow, cvsinfo --unpack
could always put a bunzipped file in .git/cvsinfo.txt or something.
> You could consider adding the CVS revision numbers as notes (see "git help
> notes" in >= v1.6.6) to the corresponding commits. Then they don't pollute
> the commit messages, but instead live in a separate, but parallel hierarchy
> that can be easily pulled in when you need to reference them (e.g.
> GIT_NOTES_REF="refs/" git log).
Thanks, looks better than munging the log. Though with one common
weakness - should likely omit noting mass commits, since they'd clutter
what 'git log' displays too much. Of course, either could used combined
with a mapping table.
--
Hallvard
^ permalink raw reply
* Re: [PATCH not-for-mainline] Implement git-vcs-p4
From: Ilari Liusvaara @ 2010-01-27 17:49 UTC (permalink / raw)
To: Daniel Barkalow; +Cc: Tor Arvid Lund, git
In-Reply-To: <alpine.LNX.2.00.1001271218360.14365@iabervon.org>
On Wed, Jan 27, 2010 at 12:28:07PM -0500, Daniel Barkalow wrote:
> On Wed, 27 Jan 2010, Ilari Liusvaara wrote:
>
> Yes, but the first URL should be directed to the 'gits' helper
> without setting remote->foreign_vcs.
Updated patch done that way coming shortly...
> That is, instead of setting
> remote->foreign_vcs, you should just call transport_helper_init(ret,
> xstrndup(url, p - url));
That doesn't quite work...
-Ilari
^ permalink raw reply
* [PATCH v2] Fix remote.<remote>.vcs
From: Ilari Liusvaara @ 2010-01-27 17:53 UTC (permalink / raw)
To: git; +Cc: Tor Arvid Lund, Daniel Barkalow
remote.<remote>.vcs causes remote->foreign_vcs to be set on entry to
transport_get(). Unfortunately, the code assumed that any such entry
is stale from previous round.
Fix this by making VCS set by URL to be volatile w.r.t. transport_get()
instead.
Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
---
transport.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
Differences from first round:
This makes VCS setting apply to all URLs that don't explicitly override,
instead of it applying to just the first one.
diff --git a/transport.c b/transport.c
index 7714fdb..87581b8 100644
--- a/transport.c
+++ b/transport.c
@@ -912,20 +912,19 @@ static int external_specification_len(const char *url)
struct transport *transport_get(struct remote *remote, const char *url)
{
+ const char *helper;
struct transport *ret = xcalloc(1, sizeof(*ret));
if (!remote)
die("No remote provided to transport_get()");
ret->remote = remote;
+ helper = remote->foreign_vcs;
if (!url && remote && remote->url)
url = remote->url[0];
ret->url = url;
- /* In case previous URL had helper forced, reset it. */
- remote->foreign_vcs = NULL;
-
/* maybe it is a foreign URL? */
if (url) {
const char *p = url;
@@ -933,11 +932,11 @@ struct transport *transport_get(struct remote *remote, const char *url)
while (isalnum(*p))
p++;
if (!prefixcmp(p, "::"))
- remote->foreign_vcs = xstrndup(url, p - url);
+ helper = xstrndup(url, p - url);
}
- if (remote && remote->foreign_vcs) {
- transport_helper_init(ret, remote->foreign_vcs);
+ if (helper) {
+ transport_helper_init(ret, helper);
} else if (!prefixcmp(url, "rsync:")) {
ret->get_refs_list = get_refs_via_rsync;
ret->fetch = fetch_objs_via_rsync;
--
1.7.0.rc0.19.gb557e6
^ permalink raw reply related
* Re: [PATCH v2] Fix remote.<remote>.vcs
From: Sverre Rabbelier @ 2010-01-27 18:09 UTC (permalink / raw)
To: Ilari Liusvaara; +Cc: git, Tor Arvid Lund, Daniel Barkalow
In-Reply-To: <1264614797-22394-1-git-send-email-ilari.liusvaara@elisanet.fi>
Heya,
On Wed, Jan 27, 2010 at 18:53, Ilari Liusvaara
<ilari.liusvaara@elisanet.fi> wrote:
> Fix this by making VCS set by URL to be volatile w.r.t. transport_get()
> instead.
Patch looks good (didn't test it though), but I had to read this line
twice; I'm afraid I don't have any suggestions on how to improve it
though.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply
* Re: [PATCH v2] Fix remote.<remote>.vcs
From: Daniel Barkalow @ 2010-01-27 18:39 UTC (permalink / raw)
To: Ilari Liusvaara; +Cc: git, Tor Arvid Lund
In-Reply-To: <1264614797-22394-1-git-send-email-ilari.liusvaara@elisanet.fi>
On Wed, 27 Jan 2010, Ilari Liusvaara wrote:
> remote.<remote>.vcs causes remote->foreign_vcs to be set on entry to
> transport_get(). Unfortunately, the code assumed that any such entry
> is stale from previous round.
>
> Fix this by making VCS set by URL to be volatile w.r.t. transport_get()
> instead.
>
> Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Except that you missed the "remote == NULL" case (noted below), this is
what I was thinking of.
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
> ---
> transport.c | 11 +++++------
> 1 files changed, 5 insertions(+), 6 deletions(-)
>
> Differences from first round:
>
> This makes VCS setting apply to all URLs that don't explicitly override,
> instead of it applying to just the first one.
>
> diff --git a/transport.c b/transport.c
> index 7714fdb..87581b8 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -912,20 +912,19 @@ static int external_specification_len(const char *url)
>
> struct transport *transport_get(struct remote *remote, const char *url)
> {
> + const char *helper;
> struct transport *ret = xcalloc(1, sizeof(*ret));
>
> if (!remote)
> die("No remote provided to transport_get()");
>
> ret->remote = remote;
> + helper = remote->foreign_vcs;
Needs to be "helper = remote ? remote->foreign_vcs : NULL", for the same
reason that the test below had been "remote && remote->foreign_vcs".
>
> if (!url && remote && remote->url)
> url = remote->url[0];
> ret->url = url;
>
> - /* In case previous URL had helper forced, reset it. */
> - remote->foreign_vcs = NULL;
> -
> /* maybe it is a foreign URL? */
> if (url) {
> const char *p = url;
> @@ -933,11 +932,11 @@ struct transport *transport_get(struct remote *remote, const char *url)
> while (isalnum(*p))
> p++;
> if (!prefixcmp(p, "::"))
> - remote->foreign_vcs = xstrndup(url, p - url);
> + helper = xstrndup(url, p - url);
> }
>
> - if (remote && remote->foreign_vcs) {
> - transport_helper_init(ret, remote->foreign_vcs);
> + if (helper) {
> + transport_helper_init(ret, helper);
> } else if (!prefixcmp(url, "rsync:")) {
> ret->get_refs_list = get_refs_via_rsync;
> ret->fetch = fetch_objs_via_rsync;
> --
> 1.7.0.rc0.19.gb557e6
>
>
^ permalink raw reply
* Re: [PATCH] fix portability issues with $ in double quotes
From: Stephen Boyd @ 2010-01-27 18:47 UTC (permalink / raw)
To: Johannes Sixt; +Cc: git, Junio C Hamano
In-Reply-To: <4B5FF106.3070604@viscovery.net>
On 01/26/2010 11:53 PM, Johannes Sixt wrote:
> The instances you changed look good. I didn't check whether you missed
> some. Was this some sort of mechanical change?
Not really mechanical. I just grepped for sed and grep expressions and
then went through the results by hand looking for unescaped dollar signs.
^ permalink raw reply
* Re: How to email out commit message automatically?
From: Weiwei Shu @ 2010-01-27 18:49 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git, shuww2008
In-Reply-To: <vpq7hr3wln2.fsf@bauges.imag.fr>
Matthieu,
I've tried it, but not successful. Where should I setup email server
information? Thanks!
Weiwei
On Wed, Jan 27, 2010 at 11:36 AM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> Weiwei Shu <shuww1980@gmail.com> writes:
>
>> Hi All,
>>
>> The second time to post here. Git is great.
>>
>> I would like to email the commit message to my Gmail box automatically
>> whenever I submit a commit. Can anybody point me a link on how to do
>> that? I've searched it for half day but not successful. Thanks!
>
> http://git.kernel.org/?p=git/git.git;a=blob;f=contrib/hooks/post-receive-email
>
> --
> Matthieu Moy
> http://www-verimag.imag.fr/~moy/
>
--
Weiwei
--Hope Springs Eternal.
^ permalink raw reply
* Re: [PATCH 1/2] t1506: more test for @{upstream} syntax
From: Junio C Hamano @ 2010-01-27 18:50 UTC (permalink / raw)
To: Jeff King; +Cc: git, Johannes Schindelin
In-Reply-To: <20100127102417.GD6262@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
> A minor nit, but wouldn't:
>
> int approxidate_careful(const char *str, unsigned long *out);
>
> returning an error code be the more usual pattern for a function with
> error-plus-output (your approxidate wrapper would have to be a function then,
> not a macro)?
I don't have strong preference either way; the one in the patch was
modelled after setup_git_directory_gently(&nongit_ok), and slightly easier
to work with for existing callers that don't care enough.
>> @@ -413,8 +413,11 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
>> } else if (0 <= nth)
>> at_time = 0;
>> else {
>> + int errors = 0;
>> char *tmp = xstrndup(str + at + 2, reflog_len);
>> - at_time = approxidate(tmp);
>> + at_time = approxidate_careful(tmp, &errors);
>> + if (errors)
>> + die("Bogus timestamp '%s'", tmp);
>> free(tmp);
>
> I was just going to "return -1" here, which yields:
>
> $ git show @{bogosity}
> fatal: ambiguous argument '@{bogosity}': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions
>
> instead of
>
> $ git show @{bogosity}
> fatal: Bogus timestamp 'bogosity'
Good point. Let's change it to silently return -1 and let the caller take
care of it. Perhaps there are some callers that say "does this name an
object? If not, let's try pathname".
>> +test_expect_success '@{30.years.ago} shows old' '
>> + check_at @{30.years.ago} one
>
> Side note: I chose this because we needed to go back from the current
> time beyond where test_tick would place the commit. Which means this
> test has a 2035 bug. :)
Can't we use an absolute date, given that test_tick gives fixed timestamp
sequence to pretend as if we were still in 2005 when we are running these
tests?
sha1_name.c | 4 ++--
t/t0101-at-syntax.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index f4a74fe..04fb3b8 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -398,9 +398,9 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
int errors = 0;
char *tmp = xstrndup(str + at + 2, reflog_len);
at_time = approxidate_careful(tmp, &errors);
- if (errors)
- die("Bogus timestamp '%s'", tmp);
free(tmp);
+ if (errors)
+ return -1;
}
if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
&co_time, &co_tz, &co_cnt)) {
diff --git a/t/t0101-at-syntax.sh b/t/t0101-at-syntax.sh
index ccabc37..5e298c5 100755
--- a/t/t0101-at-syntax.sh
+++ b/t/t0101-at-syntax.sh
@@ -26,8 +26,8 @@ test_expect_success '@{now} shows current' '
check_at @{now} two
'
-test_expect_success '@{30.years.ago} shows old' '
- check_at @{30.years.ago} one
+test_expect_success '@{2001-09-17} (before the first commit) shows old' '
+ check_at @{2001-09-17} one
'
test_expect_success 'silly approxidates work' '
^ permalink raw reply related
* Re: [PATCH v2] Fix remote.<remote>.vcs
From: Ilari Liusvaara @ 2010-01-27 18:59 UTC (permalink / raw)
To: Daniel Barkalow; +Cc: git, Tor Arvid Lund
In-Reply-To: <alpine.LNX.2.00.1001271335140.14365@iabervon.org>
On Wed, Jan 27, 2010 at 01:39:00PM -0500, Daniel Barkalow wrote:
> On Wed, 27 Jan 2010, Ilari Liusvaara wrote:
> >
> > if (!remote)
> > die("No remote provided to transport_get()");
> >
> > ret->remote = remote;
> > + helper = remote->foreign_vcs;
>
> Needs to be "helper = remote ? remote->foreign_vcs : NULL", for the same
> reason that the test below had been "remote && remote->foreign_vcs".
Few lines above that:
if (!remote)
die("No remote provided to transport_get()");
-Ilari
^ permalink raw reply
* Re: [PATCH 1/2] t1506: more test for @{upstream} syntax
From: Junio C Hamano @ 2010-01-27 19:10 UTC (permalink / raw)
To: Jeff King; +Cc: git, Johannes Schindelin
In-Reply-To: <20100127114009.GE6262@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
> Using "git show @{-1}@{u}" is still broken, though.
>
> I tried tracing the parsing through get_sha1_basic and
> interpret_branch_name, but it's pretty confusing. Especially as we seem
> to deal with @{upstream}, @{now}, and @{-1} at different places.
>
> I think the patch below does what we want, but the whole thing feels
> overly complicated to me, especially with the split of parsing @{...}
> between get_sha1_basic and interpret_branch_name. I guess we have spots
> that don't take reflogs but do take branch names, but I think the code
> would be much simpler if the syntax were parsed in one place, and then
> we threw out or complained about bogus semantics (like "checkout
> @{now}").
I wanted to do something like what your patch does by iterating over the
input inside get_sha1_basic() while we still see @{...}, parsing pieces
from the beginning, not from the end like the original "do we have the
reflog indicator at the end? If so strip it and deal with what we have at
the front". Your patch to i-b-n does that by recursing inside, which is a
nice solution.
Care to roll a patch with additional tests, to build on top of 105e473
(Fix log -g this@{upstream}, 2010-01-26)?
^ permalink raw reply
* Re: [PATCH] git-gui: Update German translation (12 new or changed strings).
From: Christian Stimming @ 2010-01-27 19:11 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
In-Reply-To: <20100126235214.GG15015@spearce.org>
[-- Attachment #1: Type: Text/Plain, Size: 521 bytes --]
Am Mittwoch, 27. Januar 2010 schrieb Shawn O. Pearce:
> > po/de.po | 824
> > ++++++++++++++++++++++++++++++++------------------------------ 1 files
> > changed, 426 insertions(+), 398 deletions(-)
>
> Ugh. This won't apply to my published master branch. I'm guessing
> mailer damage somewhere in the chain, most likely on my end since
> I've never been able to apply an inline translation patch cleanly.
>
> Can you please resend as an attachment?
Sure. Sorry for forgetting about that. Patch attached.
Christian
[-- Attachment #2: 0001-git-gui-Update-German-translation-12-new-or-changed-.patch --]
[-- Type: text/x-patch, Size: 61222 bytes --]
From fb81d92bd53203c5318547dc0f974abbc2fc755e Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Tue, 26 Jan 2010 22:26:45 +0100
Subject: [PATCH] git-gui: Update German translation (12 new or changed strings).
---
po/de.po | 824 ++++++++++++++++++++++++++++++++------------------------------
1 files changed, 426 insertions(+), 398 deletions(-)
diff --git a/po/de.po b/po/de.po
index 51abb50..44c5ddc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,41 +7,41 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-06 20:51+0100\n"
-"PO-Revision-Date: 2008-12-06 21:22+0100\n"
+"POT-Creation-Date: 2010-01-26 22:22+0100\n"
+"PO-Revision-Date: 2010-01-26 22:25+0100\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
-#: git-gui.sh:763
+#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
+#: git-gui.sh:922
msgid "git-gui: fatal error"
msgstr "git-gui: Programmfehler"
-#: git-gui.sh:593
+#: git-gui.sh:743
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "Ungültige Zeichensatz-Angabe in %s:"
-#: git-gui.sh:620
+#: git-gui.sh:779
msgid "Main Font"
msgstr "Programmschriftart"
-#: git-gui.sh:621
+#: git-gui.sh:780
msgid "Diff/Console Font"
msgstr "Vergleich-Schriftart"
-#: git-gui.sh:635
+#: git-gui.sh:794
msgid "Cannot find git in PATH."
msgstr "Git kann im PATH nicht gefunden werden."
-#: git-gui.sh:662
+#: git-gui.sh:821
msgid "Cannot parse Git version string:"
msgstr "Git Versionsangabe kann nicht erkannt werden:"
-#: git-gui.sh:680
+#: git-gui.sh:839
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -60,447 +60,479 @@ msgstr ""
"\n"
"Soll angenommen werden, »%s« sei Version 1.5.0?\n"
-#: git-gui.sh:918
+#: git-gui.sh:1128
msgid "Git directory not found:"
msgstr "Git-Verzeichnis nicht gefunden:"
-#: git-gui.sh:925
+#: git-gui.sh:1146
msgid "Cannot move to top of working directory:"
msgstr ""
"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
"werden:"
-#: git-gui.sh:932
-msgid "Cannot use funny .git directory:"
-msgstr "Unerwartete Struktur des .git Verzeichnis:"
+#: git-gui.sh:1154
+msgid "Cannot use bare repository:"
+msgstr "Leeres Projektarchiv kann nicht benutzt werden:"
-#: git-gui.sh:937
+#: git-gui.sh:1162
msgid "No working directory"
msgstr "Kein Arbeitsverzeichnis"
-#: git-gui.sh:1084 lib/checkout_op.tcl:283
+#: git-gui.sh:1334 lib/checkout_op.tcl:306
msgid "Refreshing file status..."
msgstr "Dateistatus aktualisieren..."
-#: git-gui.sh:1149
+#: git-gui.sh:1390
msgid "Scanning for modified files ..."
msgstr "Nach geänderten Dateien suchen..."
-#: git-gui.sh:1367
+#: git-gui.sh:1454
msgid "Calling prepare-commit-msg hook..."
msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle..."
-#: git-gui.sh:1384
+#: git-gui.sh:1471
msgid "Commit declined by prepare-commit-msg hook."
-msgstr "Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit hook«)."
+msgstr ""
+"Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit "
+"hook«)."
-#: git-gui.sh:1542 lib/browser.tcl:246
+#: git-gui.sh:1629 lib/browser.tcl:246
msgid "Ready."
msgstr "Bereit."
-#: git-gui.sh:1590
+#: git-gui.sh:1787
+#, tcl-format
+msgid "Displaying only %s of %s files."
+msgstr "Nur %s von %s Dateien werden angezeigt."
+
+#: git-gui.sh:1913
msgid "Unmodified"
msgstr "Unverändert"
-#: git-gui.sh:1592
+#: git-gui.sh:1915
msgid "Modified, not staged"
msgstr "Verändert, nicht bereitgestellt"
-#: git-gui.sh:1593 git-gui.sh:1598
+#: git-gui.sh:1916 git-gui.sh:1924
msgid "Staged for commit"
msgstr "Bereitgestellt zum Eintragen"
-#: git-gui.sh:1594 git-gui.sh:1599
+#: git-gui.sh:1917 git-gui.sh:1925
msgid "Portions staged for commit"
msgstr "Teilweise bereitgestellt zum Eintragen"
-#: git-gui.sh:1595 git-gui.sh:1600
+#: git-gui.sh:1918 git-gui.sh:1926
msgid "Staged for commit, missing"
msgstr "Bereitgestellt zum Eintragen, fehlend"
-#: git-gui.sh:1658
+#: git-gui.sh:1920
msgid "File type changed, not staged"
msgstr "Dateityp geändert, nicht bereitgestellt"
-#: git-gui.sh:1659
+#: git-gui.sh:1921
msgid "File type changed, staged"
msgstr "Dateityp geändert, bereitgestellt"
-#: git-gui.sh:1661
+#: git-gui.sh:1923
msgid "Untracked, not staged"
msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
-#: git-gui.sh:1602
+#: git-gui.sh:1928
msgid "Missing"
msgstr "Fehlend"
-#: git-gui.sh:1603
+#: git-gui.sh:1929
msgid "Staged for removal"
msgstr "Bereitgestellt zum Löschen"
-#: git-gui.sh:1604
+#: git-gui.sh:1930
msgid "Staged for removal, still present"
msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
-#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
+#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
+#: git-gui.sh:1936 git-gui.sh:1937
msgid "Requires merge resolution"
msgstr "Konfliktauflösung nötig"
-#: git-gui.sh:1644
+#: git-gui.sh:1972
msgid "Starting gitk... please wait..."
msgstr "Gitk wird gestartet... bitte warten."
-#: git-gui.sh:1698
+#: git-gui.sh:1984
msgid "Couldn't find gitk in PATH"
msgstr "Gitk kann im PATH nicht gefunden werden."
-#: git-gui.sh:1948 lib/choose_repository.tcl:36
+#: git-gui.sh:2043
+msgid "Couldn't find git gui in PATH"
+msgstr "»Git gui« kann im PATH nicht gefunden werden."
+
+#: git-gui.sh:2455 lib/choose_repository.tcl:36
msgid "Repository"
msgstr "Projektarchiv"
-#: git-gui.sh:1861
+#: git-gui.sh:2456
msgid "Edit"
msgstr "Bearbeiten"
-#: git-gui.sh:1863 lib/choose_rev.tcl:561
+#: git-gui.sh:2458 lib/choose_rev.tcl:561
msgid "Branch"
msgstr "Zweig"
-#: git-gui.sh:1866 lib/choose_rev.tcl:548
+#: git-gui.sh:2461 lib/choose_rev.tcl:548
msgid "Commit@@noun"
msgstr "Version"
-#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
+#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
msgid "Merge"
msgstr "Zusammenführen"
-#: git-gui.sh:1870 lib/choose_rev.tcl:557
+#: git-gui.sh:2465 lib/choose_rev.tcl:557
msgid "Remote"
msgstr "Andere Archive"
-#: git-gui.sh:2293
+#: git-gui.sh:2468
msgid "Tools"
msgstr "Werkzeuge"
-#: git-gui.sh:2302
+#: git-gui.sh:2477
msgid "Explore Working Copy"
msgstr "Arbeitskopie im Dateimanager"
-#: git-gui.sh:2247
+#: git-gui.sh:2483
msgid "Browse Current Branch's Files"
msgstr "Aktuellen Zweig durchblättern"
-#: git-gui.sh:1883
+#: git-gui.sh:2487
msgid "Browse Branch Files..."
msgstr "Einen Zweig durchblättern..."
-#: git-gui.sh:1888
+#: git-gui.sh:2492
msgid "Visualize Current Branch's History"
msgstr "Aktuellen Zweig darstellen"
-#: git-gui.sh:1892
+#: git-gui.sh:2496
msgid "Visualize All Branch History"
msgstr "Alle Zweige darstellen"
-#: git-gui.sh:1899
+#: git-gui.sh:2503
#, tcl-format
msgid "Browse %s's Files"
msgstr "Zweig »%s« durchblättern"
-#: git-gui.sh:1901
+#: git-gui.sh:2505
#, tcl-format
msgid "Visualize %s's History"
msgstr "Historie von »%s« darstellen"
-#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
msgid "Database Statistics"
msgstr "Datenbankstatistik"
-#: git-gui.sh:1909 lib/database.tcl:34
+#: git-gui.sh:2513 lib/database.tcl:34
msgid "Compress Database"
msgstr "Datenbank komprimieren"
-#: git-gui.sh:1912
+#: git-gui.sh:2516
msgid "Verify Database"
msgstr "Datenbank überprüfen"
-#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
-#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
+#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
+#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
msgid "Create Desktop Icon"
msgstr "Desktop-Icon erstellen"
-#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
+#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
msgid "Quit"
msgstr "Beenden"
-#: git-gui.sh:1939
+#: git-gui.sh:2547
msgid "Undo"
msgstr "Rückgängig"
-#: git-gui.sh:1942
+#: git-gui.sh:2550
msgid "Redo"
msgstr "Wiederholen"
-#: git-gui.sh:1946 git-gui.sh:2443
+#: git-gui.sh:2554 git-gui.sh:3109
msgid "Cut"
msgstr "Ausschneiden"
-#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
+#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
#: lib/console.tcl:69
msgid "Copy"
msgstr "Kopieren"
-#: git-gui.sh:1952 git-gui.sh:2449
+#: git-gui.sh:2560 git-gui.sh:3115
msgid "Paste"
msgstr "Einfügen"
-#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
+#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr "Löschen"
-#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
+#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
msgid "Select All"
msgstr "Alle auswählen"
-#: git-gui.sh:1968
+#: git-gui.sh:2576
msgid "Create..."
msgstr "Erstellen..."
-#: git-gui.sh:1974
+#: git-gui.sh:2582
msgid "Checkout..."
msgstr "Umstellen..."
-#: git-gui.sh:1980
+#: git-gui.sh:2588
msgid "Rename..."
msgstr "Umbenennen..."
-#: git-gui.sh:1985 git-gui.sh:2085
+#: git-gui.sh:2593
msgid "Delete..."
msgstr "Löschen..."
-#: git-gui.sh:1990
+#: git-gui.sh:2598
msgid "Reset..."
msgstr "Zurücksetzen..."
-#: git-gui.sh:2372
+#: git-gui.sh:2608
msgid "Done"
msgstr "Fertig"
-#: git-gui.sh:2374
+#: git-gui.sh:2610
msgid "Commit@@verb"
msgstr "Eintragen"
-#: git-gui.sh:2383 git-gui.sh:2786
+#: git-gui.sh:2619 git-gui.sh:3050
msgid "New Commit"
msgstr "Neue Version"
-#: git-gui.sh:2010 git-gui.sh:2396
+#: git-gui.sh:2627 git-gui.sh:3057
msgid "Amend Last Commit"
msgstr "Letzte nachbessern"
-#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr "Neu laden"
-#: git-gui.sh:2025
+#: git-gui.sh:2643
msgid "Stage To Commit"
msgstr "Zum Eintragen bereitstellen"
-#: git-gui.sh:2031
+#: git-gui.sh:2649
msgid "Stage Changed Files To Commit"
msgstr "Geänderte Dateien bereitstellen"
-#: git-gui.sh:2037
+#: git-gui.sh:2655
msgid "Unstage From Commit"
msgstr "Aus der Bereitstellung herausnehmen"
-#: git-gui.sh:2042 lib/index.tcl:395
+#: git-gui.sh:2661 lib/index.tcl:412
msgid "Revert Changes"
msgstr "Änderungen verwerfen"
-#: git-gui.sh:2141 git-gui.sh:2702
+#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
msgid "Show Less Context"
msgstr "Weniger Zeilen anzeigen"
-#: git-gui.sh:2145 git-gui.sh:2706
+#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
msgid "Show More Context"
msgstr "Mehr Zeilen anzeigen"
-#: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
+#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
msgid "Sign Off"
msgstr "Abzeichnen"
-#: git-gui.sh:2458
+#: git-gui.sh:2696
msgid "Local Merge..."
msgstr "Lokales Zusammenführen..."
-#: git-gui.sh:2069
+#: git-gui.sh:2701
msgid "Abort Merge..."
msgstr "Zusammenführen abbrechen..."
-#: git-gui.sh:2475
+#: git-gui.sh:2713 git-gui.sh:2741
msgid "Add..."
msgstr "Hinzufügen..."
-#: git-gui.sh:2479
+#: git-gui.sh:2717
msgid "Push..."
msgstr "Versenden..."
-#: git-gui.sh:2483
+#: git-gui.sh:2721
msgid "Delete Branch..."
msgstr "Zweig löschen..."
-#: git-gui.sh:2493 git-gui.sh:2515 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
-#, tcl-format
-msgid "About %s"
-msgstr "Über %s"
-
-#: git-gui.sh:2099
-msgid "Preferences..."
-msgstr "Einstellungen..."
-
-#: git-gui.sh:2107 git-gui.sh:2639
+#: git-gui.sh:2731 git-gui.sh:3292
msgid "Options..."
msgstr "Optionen..."
-#: git-gui.sh:2576
+#: git-gui.sh:2742
msgid "Remove..."
msgstr "Entfernen..."
-#: git-gui.sh:2585 lib/choose_repository.tcl:50
+#: git-gui.sh:2751 lib/choose_repository.tcl:50
msgid "Help"
msgstr "Hilfe"
-#: git-gui.sh:2154
+#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#, tcl-format
+msgid "About %s"
+msgstr "Über %s"
+
+#: git-gui.sh:2783
msgid "Online Documentation"
msgstr "Online-Dokumentation"
-#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
msgid "Show SSH Key"
msgstr "SSH-Schlüssel anzeigen"
-#: git-gui.sh:2707
+#: git-gui.sh:2893
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
"Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis "
"nicht gefunden"
-#: git-gui.sh:2271
+#: git-gui.sh:2926
msgid "Current Branch:"
msgstr "Aktueller Zweig:"
-#: git-gui.sh:2292
+#: git-gui.sh:2947
msgid "Staged Changes (Will Commit)"
msgstr "Bereitstellung (zum Eintragen)"
-#: git-gui.sh:2312
+#: git-gui.sh:2967
msgid "Unstaged Changes"
msgstr "Nicht bereitgestellte Änderungen"
-#: git-gui.sh:2362
+#: git-gui.sh:3017
msgid "Stage Changed"
msgstr "Alles bereitstellen"
-#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
msgid "Push"
msgstr "Versenden"
-#: git-gui.sh:2408
+#: git-gui.sh:3071
msgid "Initial Commit Message:"
msgstr "Erste Versionsbeschreibung:"
-#: git-gui.sh:2409
+#: git-gui.sh:3072
msgid "Amended Commit Message:"
msgstr "Nachgebesserte Beschreibung:"
-#: git-gui.sh:2410
+#: git-gui.sh:3073
msgid "Amended Initial Commit Message:"
msgstr "Nachgebesserte erste Beschreibung:"
-#: git-gui.sh:2411
+#: git-gui.sh:3074
msgid "Amended Merge Commit Message:"
msgstr "Nachgebesserte Zusammenführungs-Beschreibung:"
-#: git-gui.sh:2412
+#: git-gui.sh:3075
msgid "Merge Commit Message:"
msgstr "Zusammenführungs-Beschreibung:"
-#: git-gui.sh:2413
+#: git-gui.sh:3076
msgid "Commit Message:"
msgstr "Versionsbeschreibung:"
-#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
+#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
msgid "Copy All"
msgstr "Alle kopieren"
-#: git-gui.sh:2483 lib/blame.tcl:107
+#: git-gui.sh:3149 lib/blame.tcl:104
msgid "File:"
msgstr "Datei:"
-#: git-gui.sh:2834
+#: git-gui.sh:3255
msgid "Refresh"
msgstr "Aktualisieren"
-#: git-gui.sh:2631
+#: git-gui.sh:3276
msgid "Decrease Font Size"
msgstr "Schriftgröße verkleinern"
-#: git-gui.sh:2635
+#: git-gui.sh:3280
msgid "Increase Font Size"
msgstr "Schriftgröße vergrößern"
-#: git-gui.sh:3033 lib/blame.tcl:281
+#: git-gui.sh:3288 lib/blame.tcl:281
msgid "Encoding"
msgstr "Zeichenkodierung"
-#: git-gui.sh:3044
+#: git-gui.sh:3299
msgid "Apply/Reverse Hunk"
msgstr "Kontext anwenden/umkehren"
-#: git-gui.sh:2875
+#: git-gui.sh:3304
msgid "Apply/Reverse Line"
msgstr "Zeile anwenden/umkehren"
-#: git-gui.sh:2885
+#: git-gui.sh:3323
msgid "Run Merge Tool"
msgstr "Zusammenführungswerkzeug"
-#: git-gui.sh:2890
+#: git-gui.sh:3328
msgid "Use Remote Version"
msgstr "Entfernte Version benutzen"
-#: git-gui.sh:2894
+#: git-gui.sh:3332
msgid "Use Local Version"
msgstr "Lokale Version benutzen"
-#: git-gui.sh:2898
+#: git-gui.sh:3336
msgid "Revert To Base"
msgstr "Ursprüngliche Version benutzen"
-#: git-gui.sh:3091
+#: git-gui.sh:3354
+msgid "Visualize These Changes In The Submodule"
+msgstr "Diese Änderungen im Untermodul darstellen"
+
+#: git-gui.sh:3358
+msgid "Visualize Current Branch History In The Submodule"
+msgstr "Aktuellen Zweig im Untermodul darstellen"
+
+#: git-gui.sh:3362
+msgid "Visualize All Branch History In The Submodule"
+msgstr "Alle Zweige im Untermodul darstellen"
+
+#: git-gui.sh:3367
+msgid "Start git gui In The Submodule"
+msgstr "Git gui im Untermodul starten"
+
+#: git-gui.sh:3389
msgid "Unstage Hunk From Commit"
msgstr "Kontext aus Bereitstellung herausnehmen"
-#: git-gui.sh:2748
+#: git-gui.sh:3391
+msgid "Unstage Lines From Commit"
+msgstr "Zeilen aus der Bereitstellung herausnehmen"
+
+#: git-gui.sh:3393
msgid "Unstage Line From Commit"
msgstr "Zeile aus der Bereitstellung herausnehmen"
-#: git-gui.sh:2750
+#: git-gui.sh:3396
msgid "Stage Hunk For Commit"
msgstr "Kontext zur Bereitstellung hinzufügen"
-#: git-gui.sh:2751
+#: git-gui.sh:3398
+msgid "Stage Lines For Commit"
+msgstr "Zeilen zur Bereitstellung hinzufügen"
+
+#: git-gui.sh:3400
msgid "Stage Line For Commit"
msgstr "Zeile zur Bereitstellung hinzufügen"
-#: git-gui.sh:2771
+#: git-gui.sh:3424
msgid "Initializing..."
msgstr "Initialisieren..."
-#: git-gui.sh:2762
+#: git-gui.sh:3541
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -516,7 +548,7 @@ msgstr ""
"von %s an Git weitergegeben werden:\n"
"\n"
-#: git-gui.sh:2792
+#: git-gui.sh:3570
msgid ""
"\n"
"This is due to a known issue with the\n"
@@ -526,7 +558,7 @@ msgstr ""
"Dies ist ein bekanntes Problem der Tcl-Version, die\n"
"in Cygwin mitgeliefert wird."
-#: git-gui.sh:2797
+#: git-gui.sh:3575
#, tcl-format
msgid ""
"\n"
@@ -546,15 +578,15 @@ msgstr ""
msgid "git-gui - a graphical user interface for Git."
msgstr "git-gui - eine grafische Oberfläche für Git."
-#: lib/blame.tcl:77
+#: lib/blame.tcl:72
msgid "File Viewer"
msgstr "Datei-Browser"
-#: lib/blame.tcl:81
+#: lib/blame.tcl:78
msgid "Commit:"
msgstr "Version:"
-#: lib/blame.tcl:264
+#: lib/blame.tcl:271
msgid "Copy Commit"
msgstr "Version kopieren"
@@ -566,88 +598,88 @@ msgstr "Text suchen..."
msgid "Do Full Copy Detection"
msgstr "Volle Kopie-Erkennung"
-#: lib/blame.tcl:263
+#: lib/blame.tcl:288
msgid "Show History Context"
msgstr "Historien-Kontext anzeigen"
-#: lib/blame.tcl:266
+#: lib/blame.tcl:291
msgid "Blame Parent Commit"
msgstr "Elternversion annotieren"
-#: lib/blame.tcl:394
+#: lib/blame.tcl:450
#, tcl-format
msgid "Reading %s..."
msgstr "%s lesen..."
-#: lib/blame.tcl:488
+#: lib/blame.tcl:557
msgid "Loading copy/move tracking annotations..."
msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
-#: lib/blame.tcl:508
+#: lib/blame.tcl:577
msgid "lines annotated"
msgstr "Zeilen annotiert"
-#: lib/blame.tcl:689
+#: lib/blame.tcl:769
msgid "Loading original location annotations..."
msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
-#: lib/blame.tcl:692
+#: lib/blame.tcl:772
msgid "Annotation complete."
msgstr "Annotierung vollständig."
-#: lib/blame.tcl:737
+#: lib/blame.tcl:802
msgid "Busy"
msgstr "Verarbeitung läuft"
-#: lib/blame.tcl:738
+#: lib/blame.tcl:803
msgid "Annotation process is already running."
msgstr "Annotierung läuft bereits."
-#: lib/blame.tcl:777
+#: lib/blame.tcl:842
msgid "Running thorough copy detection..."
msgstr "Intensive Kopie-Erkennung läuft..."
-#: lib/blame.tcl:827
+#: lib/blame.tcl:910
msgid "Loading annotation..."
msgstr "Annotierung laden..."
-#: lib/blame.tcl:802
+#: lib/blame.tcl:963
msgid "Author:"
msgstr "Autor:"
-#: lib/blame.tcl:806
+#: lib/blame.tcl:967
msgid "Committer:"
msgstr "Eintragender:"
-#: lib/blame.tcl:811
+#: lib/blame.tcl:972
msgid "Original File:"
msgstr "Ursprüngliche Datei:"
-#: lib/blame.tcl:1021
+#: lib/blame.tcl:1020
msgid "Cannot find HEAD commit:"
msgstr "Zweigspitze (»HEAD«) kann nicht gefunden werden:"
-#: lib/blame.tcl:1076
+#: lib/blame.tcl:1075
msgid "Cannot find parent commit:"
msgstr "Elternversion kann nicht gefunden werden:"
-#: lib/blame.tcl:1001
+#: lib/blame.tcl:1090
msgid "Unable to display parent"
msgstr "Elternversion kann nicht angezeigt werden"
-#: lib/blame.tcl:1002 lib/diff.tcl:191
+#: lib/blame.tcl:1091 lib/diff.tcl:320
msgid "Error loading diff:"
msgstr "Fehler beim Laden des Vergleichs:"
-#: lib/blame.tcl:1142
+#: lib/blame.tcl:1231
msgid "Originally By:"
msgstr "Ursprünglich von:"
-#: lib/blame.tcl:931
+#: lib/blame.tcl:1237
msgid "In File:"
msgstr "In Datei:"
-#: lib/blame.tcl:936
+#: lib/blame.tcl:1242
msgid "Copied Or Moved Here By:"
msgstr "Kopiert oder verschoben durch:"
@@ -661,16 +693,18 @@ msgstr "Umstellen"
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
-#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
+#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
+#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
+#: lib/transport.tcl:108
msgid "Cancel"
msgstr "Abbrechen"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
msgid "Revision"
msgstr "Version"
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
msgid "Options"
msgstr "Optionen"
@@ -690,7 +724,7 @@ msgstr "Zweig erstellen"
msgid "Create New Branch"
msgstr "Neuen Zweig erstellen"
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
msgid "Create"
msgstr "Erstellen"
@@ -698,7 +732,7 @@ msgstr "Erstellen"
msgid "Branch Name"
msgstr "Zweigname"
-#: lib/branch_create.tcl:43
+#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
msgid "Name:"
msgstr "Name:"
@@ -722,7 +756,7 @@ msgstr "Nein"
msgid "Fast Forward Only"
msgstr "Nur Schnellzusammenführung"
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
msgid "Reset"
msgstr "Zurücksetzen"
@@ -764,15 +798,26 @@ msgstr "Lokale Zweige"
msgid "Delete Only If Merged Into"
msgstr "Nur löschen, wenn zusammengeführt nach"
-#: lib/branch_delete.tcl:54
-msgid "Always (Do not perform merge test.)"
-msgstr "Immer (ohne Zusammenführungstest)"
+#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge checks)"
+msgstr "Immer (Keine Zusammenführungsprüfung)"
#: lib/branch_delete.tcl:103
#, tcl-format
msgid "The following branches are not completely merged into %s:"
msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
+#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand "
+"möglich.\n"
+"\n"
+"Sollen die ausgewählten Zweige gelöscht werden?"
+
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@ -802,7 +847,7 @@ msgstr "Neuer Name:"
msgid "Please select a branch to rename."
msgstr "Bitte wählen Sie einen Zweig zum umbenennen."
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
#, tcl-format
msgid "Branch '%s' already exists."
msgstr "Zweig »%s« existiert bereits."
@@ -833,37 +878,38 @@ msgstr "[Nach oben]"
msgid "Browse Branch Files"
msgstr "Dateien des Zweigs durchblättern"
-#: lib/browser.tcl:278 lib/choose_repository.tcl:387
-#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
-#: lib/choose_repository.tcl:987
+#: lib/browser.tcl:278 lib/choose_repository.tcl:398
+#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
+#: lib/choose_repository.tcl:1028
msgid "Browse"
msgstr "Blättern"
-#: lib/checkout_op.tcl:79
+#: lib/checkout_op.tcl:85
#, tcl-format
msgid "Fetching %s from %s"
msgstr "Änderungen »%s« von »%s« anfordern"
-#: lib/checkout_op.tcl:127
+#: lib/checkout_op.tcl:133
#, tcl-format
msgid "fatal: Cannot resolve %s"
msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden"
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
+#: lib/sshkey.tcl:53
msgid "Close"
msgstr "Schließen"
-#: lib/checkout_op.tcl:169
+#: lib/checkout_op.tcl:175
#, tcl-format
msgid "Branch '%s' does not exist."
msgstr "Zweig »%s« existiert nicht."
-#: lib/checkout_op.tcl:193
+#: lib/checkout_op.tcl:194
#, tcl-format
msgid "Failed to configure simplified git-pull for '%s'."
msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«."
-#: lib/checkout_op.tcl:228
+#: lib/checkout_op.tcl:229
#, tcl-format
msgid ""
"Branch '%s' already exists.\n"
@@ -876,21 +922,21 @@ msgstr ""
"Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres "
"Zusammenführen ist notwendig."
-#: lib/checkout_op.tcl:220
+#: lib/checkout_op.tcl:243
#, tcl-format
msgid "Merge strategy '%s' not supported."
msgstr "Zusammenführungsmethode »%s« nicht unterstützt."
-#: lib/checkout_op.tcl:239
+#: lib/checkout_op.tcl:262
#, tcl-format
msgid "Failed to update '%s'."
msgstr "Aktualisieren von »%s« fehlgeschlagen."
-#: lib/checkout_op.tcl:251
+#: lib/checkout_op.tcl:274
msgid "Staging area (index) is already locked."
msgstr "Bereitstellung (»index«) ist zur Bearbeitung gesperrt (»locked«)."
-#: lib/checkout_op.tcl:266
+#: lib/checkout_op.tcl:289
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
@@ -906,32 +952,32 @@ msgstr ""
"\n"
"Es wird gleich neu geladen.\n"
-#: lib/checkout_op.tcl:322
+#: lib/checkout_op.tcl:345
#, tcl-format
msgid "Updating working directory to '%s'..."
msgstr "Arbeitskopie umstellen auf »%s«..."
-#: lib/checkout_op.tcl:323
+#: lib/checkout_op.tcl:346
msgid "files checked out"
msgstr "Dateien aktualisiert"
-#: lib/checkout_op.tcl:353
+#: lib/checkout_op.tcl:376
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
msgstr ""
"Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist "
"notwendig)."
-#: lib/checkout_op.tcl:354
+#: lib/checkout_op.tcl:377
msgid "File level merge required."
msgstr "Zusammenführen der Dateien ist notwendig."
-#: lib/checkout_op.tcl:358
+#: lib/checkout_op.tcl:381
#, tcl-format
msgid "Staying on branch '%s'."
msgstr "Es wird auf Zweig »%s« verblieben."
-#: lib/checkout_op.tcl:429
+#: lib/checkout_op.tcl:452
msgid ""
"You are no longer on a local branch.\n"
"\n"
@@ -943,32 +989,32 @@ msgstr ""
"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen "
"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«."
-#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
+#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
#, tcl-format
msgid "Checked out '%s'."
msgstr "Umgestellt auf »%s«."
-#: lib/checkout_op.tcl:478
+#: lib/checkout_op.tcl:535
#, tcl-format
msgid "Resetting '%s' to '%s' will lose the following commits:"
msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:"
-#: lib/checkout_op.tcl:500
+#: lib/checkout_op.tcl:557
msgid "Recovering lost commits may not be easy."
msgstr ""
"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt "
"werden."
-#: lib/checkout_op.tcl:505
+#: lib/checkout_op.tcl:562
#, tcl-format
msgid "Reset '%s'?"
msgstr "»%s« zurücksetzen?"
-#: lib/checkout_op.tcl:510 lib/merge.tcl:163
+#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
msgid "Visualize"
msgstr "Darstellen"
-#: lib/checkout_op.tcl:578
+#: lib/checkout_op.tcl:635
#, tcl-format
msgid ""
"Failed to set current branch.\n"
@@ -1014,231 +1060,231 @@ msgstr ""
msgid "Git Gui"
msgstr "Git Gui"
-#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
msgid "Create New Repository"
msgstr "Neues Projektarchiv"
-#: lib/choose_repository.tcl:87
+#: lib/choose_repository.tcl:93
msgid "New..."
msgstr "Neu..."
-#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
msgid "Clone Existing Repository"
msgstr "Projektarchiv klonen"
-#: lib/choose_repository.tcl:100
+#: lib/choose_repository.tcl:106
msgid "Clone..."
msgstr "Klonen..."
-#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
msgid "Open Existing Repository"
msgstr "Projektarchiv öffnen"
-#: lib/choose_repository.tcl:113
+#: lib/choose_repository.tcl:119
msgid "Open..."
msgstr "Öffnen..."
-#: lib/choose_repository.tcl:126
+#: lib/choose_repository.tcl:132
msgid "Recent Repositories"
msgstr "Zuletzt benutzte Projektarchive"
-#: lib/choose_repository.tcl:132
+#: lib/choose_repository.tcl:138
msgid "Open Recent Repository:"
msgstr "Zuletzt benutztes Projektarchiv öffnen:"
-#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
-#: lib/choose_repository.tcl:310
+#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
+#: lib/choose_repository.tcl:320
#, tcl-format
msgid "Failed to create repository %s:"
msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
-#: lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:391
msgid "Directory:"
msgstr "Verzeichnis:"
-#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
-#: lib/choose_repository.tcl:1011
+#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
+#: lib/choose_repository.tcl:1052
msgid "Git Repository"
msgstr "Git Projektarchiv"
-#: lib/choose_repository.tcl:442
+#: lib/choose_repository.tcl:448
#, tcl-format
msgid "Directory %s already exists."
msgstr "Verzeichnis »%s« existiert bereits."
-#: lib/choose_repository.tcl:446
+#: lib/choose_repository.tcl:452
#, tcl-format
msgid "File %s already exists."
msgstr "Datei »%s« existiert bereits."
-#: lib/choose_repository.tcl:455
+#: lib/choose_repository.tcl:466
msgid "Clone"
msgstr "Klonen"
-#: lib/choose_repository.tcl:473
+#: lib/choose_repository.tcl:479
msgid "Source Location:"
msgstr "Herkunft:"
-#: lib/choose_repository.tcl:484
+#: lib/choose_repository.tcl:490
msgid "Target Directory:"
msgstr "Zielverzeichnis:"
-#: lib/choose_repository.tcl:490
+#: lib/choose_repository.tcl:502
msgid "Clone Type:"
msgstr "Art des Klonens:"
-#: lib/choose_repository.tcl:495
+#: lib/choose_repository.tcl:508
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr "Standard (schnell, teilweise redundant, Hardlinks)"
-#: lib/choose_repository.tcl:501
+#: lib/choose_repository.tcl:514
msgid "Full Copy (Slower, Redundant Backup)"
msgstr "Alles kopieren (langsamer, volle Redundanz)"
-#: lib/choose_repository.tcl:507
+#: lib/choose_repository.tcl:520
msgid "Shared (Fastest, Not Recommended, No Backup)"
msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)"
-#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
-#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
-#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
+#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
+#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
+#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
#, tcl-format
msgid "Not a Git repository: %s"
msgstr "Kein Git-Projektarchiv in »%s« gefunden."
-#: lib/choose_repository.tcl:579
+#: lib/choose_repository.tcl:592
msgid "Standard only available for local repository."
msgstr "Standard ist nur für lokale Projektarchive verfügbar."
-#: lib/choose_repository.tcl:583
+#: lib/choose_repository.tcl:596
msgid "Shared only available for local repository."
msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar."
-#: lib/choose_repository.tcl:604
+#: lib/choose_repository.tcl:617
#, tcl-format
msgid "Location %s already exists."
msgstr "Projektarchiv »%s« existiert bereits."
-#: lib/choose_repository.tcl:615
+#: lib/choose_repository.tcl:628
msgid "Failed to configure origin"
msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
-#: lib/choose_repository.tcl:627
+#: lib/choose_repository.tcl:640
msgid "Counting objects"
msgstr "Objekte werden gezählt"
-#: lib/choose_repository.tcl:628
+#: lib/choose_repository.tcl:641
msgid "buckets"
msgstr "Buckets"
-#: lib/choose_repository.tcl:652
+#: lib/choose_repository.tcl:665
#, tcl-format
msgid "Unable to copy objects/info/alternates: %s"
msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
-#: lib/choose_repository.tcl:688
+#: lib/choose_repository.tcl:701
#, tcl-format
msgid "Nothing to clone from %s."
msgstr "Von »%s« konnte nichts geklont werden."
-#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
-#: lib/choose_repository.tcl:916
+#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
+#: lib/choose_repository.tcl:929
msgid "The 'master' branch has not been initialized."
msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
-#: lib/choose_repository.tcl:703
+#: lib/choose_repository.tcl:716
msgid "Hardlinks are unavailable. Falling back to copying."
msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert."
-#: lib/choose_repository.tcl:715
+#: lib/choose_repository.tcl:728
#, tcl-format
msgid "Cloning from %s"
msgstr "Kopieren von »%s«"
-#: lib/choose_repository.tcl:746
+#: lib/choose_repository.tcl:759
msgid "Copying objects"
msgstr "Objektdatenbank kopieren"
-#: lib/choose_repository.tcl:747
+#: lib/choose_repository.tcl:760
msgid "KiB"
msgstr "KB"
-#: lib/choose_repository.tcl:771
+#: lib/choose_repository.tcl:784
#, tcl-format
msgid "Unable to copy object: %s"
msgstr "Objekt kann nicht kopiert werden: %s"
-#: lib/choose_repository.tcl:781
+#: lib/choose_repository.tcl:794
msgid "Linking objects"
msgstr "Objekte verlinken"
-#: lib/choose_repository.tcl:782
+#: lib/choose_repository.tcl:795
msgid "objects"
msgstr "Objekte"
-#: lib/choose_repository.tcl:790
+#: lib/choose_repository.tcl:803
#, tcl-format
msgid "Unable to hardlink object: %s"
msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s"
-#: lib/choose_repository.tcl:845
+#: lib/choose_repository.tcl:858
msgid "Cannot fetch branches and objects. See console output for details."
msgstr ""
"Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die "
"Ausgaben auf der Konsole für weitere Angaben."
-#: lib/choose_repository.tcl:856
+#: lib/choose_repository.tcl:869
msgid "Cannot fetch tags. See console output for details."
msgstr ""
"Markierungen konnten nicht angefordert werden. Kontrollieren Sie die "
"Ausgaben auf der Konsole für weitere Angaben."
-#: lib/choose_repository.tcl:880
+#: lib/choose_repository.tcl:893
msgid "Cannot determine HEAD. See console output for details."
msgstr ""
"Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die "
"Ausgaben auf der Konsole für weitere Angaben."
-#: lib/choose_repository.tcl:889
+#: lib/choose_repository.tcl:902
#, tcl-format
msgid "Unable to cleanup %s"
msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
-#: lib/choose_repository.tcl:895
+#: lib/choose_repository.tcl:908
msgid "Clone failed."
msgstr "Klonen fehlgeschlagen."
-#: lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:915
msgid "No default branch obtained."
msgstr "Kein voreingestellter Zweig gefunden."
-#: lib/choose_repository.tcl:913
+#: lib/choose_repository.tcl:926
#, tcl-format
msgid "Cannot resolve %s as a commit."
msgstr "»%s« wurde nicht als Version gefunden."
-#: lib/choose_repository.tcl:925
+#: lib/choose_repository.tcl:938
msgid "Creating working directory"
msgstr "Arbeitskopie erstellen"
-#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
-#: lib/index.tcl:193
+#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
+#: lib/index.tcl:198
msgid "files"
msgstr "Dateien"
-#: lib/choose_repository.tcl:955
+#: lib/choose_repository.tcl:968
msgid "Initial file checkout failed."
msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
-#: lib/choose_repository.tcl:971
+#: lib/choose_repository.tcl:1011
msgid "Open"
msgstr "Öffnen"
-#: lib/choose_repository.tcl:981
+#: lib/choose_repository.tcl:1021
msgid "Repository:"
msgstr "Projektarchiv:"
-#: lib/choose_repository.tcl:1031
+#: lib/choose_repository.tcl:1072
#, tcl-format
msgid "Failed to open repository %s:"
msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
@@ -1311,19 +1357,24 @@ msgstr ""
"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung "
"beenden oder abbrechen.\n"
-#: lib/commit.tcl:49
+#: lib/commit.tcl:48
msgid "Error loading commit data for amend:"
msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:"
-#: lib/commit.tcl:76
+#: lib/commit.tcl:75
msgid "Unable to obtain your identity:"
msgstr "Benutzername konnte nicht bestimmt werden:"
-#: lib/commit.tcl:81
+#: lib/commit.tcl:80
msgid "Invalid GIT_COMMITTER_IDENT:"
msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:"
-#: lib/commit.tcl:133
+#: lib/commit.tcl:129
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht."
+
+#: lib/commit.tcl:149
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
@@ -1339,7 +1390,7 @@ msgstr ""
"\n"
"Es wird gleich neu geladen.\n"
-#: lib/commit.tcl:154
+#: lib/commit.tcl:172
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
@@ -1352,7 +1403,7 @@ msgstr ""
"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie "
"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n"
-#: lib/commit.tcl:162
+#: lib/commit.tcl:180
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
@@ -1363,7 +1414,7 @@ msgstr ""
"\n"
"Datei »%s« kann nicht eingetragen werden.\n"
-#: lib/commit.tcl:170
+#: lib/commit.tcl:188
msgid ""
"No changes to commit.\n"
"\n"
@@ -1373,7 +1424,7 @@ msgstr ""
"\n"
"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n"
-#: lib/commit.tcl:183
+#: lib/commit.tcl:203
msgid ""
"Please supply a commit message.\n"
"\n"
@@ -1393,47 +1444,42 @@ msgstr ""
"\n"
"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n"
-#: lib/commit.tcl:207
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht."
-
-#: lib/commit.tcl:221
+#: lib/commit.tcl:234
msgid "Calling pre-commit hook..."
msgstr "Aufrufen der Vor-Eintragen-Kontrolle..."
-#: lib/commit.tcl:236
+#: lib/commit.tcl:249
msgid "Commit declined by pre-commit hook."
msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)."
-#: lib/commit.tcl:259
+#: lib/commit.tcl:272
msgid "Calling commit-msg hook..."
msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle..."
-#: lib/commit.tcl:274
+#: lib/commit.tcl:287
msgid "Commit declined by commit-msg hook."
msgstr ""
"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message "
"hook«)."
-#: lib/commit.tcl:287
+#: lib/commit.tcl:300
msgid "Committing changes..."
msgstr "Änderungen eintragen..."
-#: lib/commit.tcl:303
+#: lib/commit.tcl:316
msgid "write-tree failed:"
msgstr "write-tree fehlgeschlagen:"
-#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
msgid "Commit failed."
msgstr "Eintragen fehlgeschlagen."
-#: lib/commit.tcl:321
+#: lib/commit.tcl:334
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr "Version »%s« scheint beschädigt zu sein"
-#: lib/commit.tcl:326
+#: lib/commit.tcl:339
msgid ""
"No changes to commit.\n"
"\n"
@@ -1448,19 +1494,19 @@ msgstr ""
"\n"
"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
-#: lib/commit.tcl:333
+#: lib/commit.tcl:346
msgid "No changes to commit."
msgstr "Keine Änderungen, die eingetragen werden können."
-#: lib/commit.tcl:347
+#: lib/commit.tcl:360
msgid "commit-tree failed:"
msgstr "commit-tree fehlgeschlagen:"
-#: lib/commit.tcl:367
+#: lib/commit.tcl:381
msgid "update-ref failed:"
msgstr "update-ref fehlgeschlagen:"
-#: lib/commit.tcl:454
+#: lib/commit.tcl:469
#, tcl-format
msgid "Created commit %s: %s"
msgstr "Version %s übertragen: %s"
@@ -1513,21 +1559,19 @@ msgstr "Objektdatenbank komprimieren"
msgid "Verifying the object database with fsck-objects"
msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen"
-#: lib/database.tcl:108
+#: lib/database.tcl:107
#, tcl-format
msgid ""
"This repository currently has approximately %i loose objects.\n"
"\n"
"To maintain optimal performance it is strongly recommended that you compress "
-"the database when more than %i loose objects exist.\n"
+"the database.\n"
"\n"
"Compress the database now?"
msgstr ""
"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n"
"\n"
-"Für eine optimale Performance wird empfohlen, die Datenbank des "
-"Projektarchivs zu komprimieren, sobald mehr als %i nicht verknüpfte Objekte "
-"vorliegen.\n"
+"Für eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren.\n"
"\n"
"Soll die Datenbank jetzt komprimiert werden?"
@@ -1536,7 +1580,7 @@ msgstr ""
msgid "Invalid date from Git: %s"
msgstr "Ungültiges Datum von Git: %s"
-#: lib/diff.tcl:42
+#: lib/diff.tcl:64
#, tcl-format
msgid ""
"No differences detected.\n"
@@ -1551,19 +1595,19 @@ msgid ""
msgstr ""
"Keine Änderungen feststellbar.\n"
"\n"
-"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei "
-"von einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
+"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei von "
+"einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
"unverändert.\n"
"\n"
"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen "
"Dateien zu prüfen."
-#: lib/diff.tcl:81
+#: lib/diff.tcl:104
#, tcl-format
msgid "Loading diff of %s..."
msgstr "Vergleich von »%s« laden..."
-#: lib/diff.tcl:120
+#: lib/diff.tcl:125
msgid ""
"LOCAL: deleted\n"
"REMOTE:\n"
@@ -1571,7 +1615,7 @@ msgstr ""
"LOKAL: gelöscht\n"
"ANDERES:\n"
-#: lib/diff.tcl:125
+#: lib/diff.tcl:130
msgid ""
"REMOTE: deleted\n"
"LOCAL:\n"
@@ -1579,32 +1623,32 @@ msgstr ""
"ANDERES: gelöscht\n"
"LOKAL:\n"
-#: lib/diff.tcl:132
+#: lib/diff.tcl:137
msgid "LOCAL:\n"
msgstr "LOKAL:\n"
-#: lib/diff.tcl:135
+#: lib/diff.tcl:140
msgid "REMOTE:\n"
msgstr "ANDERES:\n"
-#: lib/diff.tcl:197 lib/diff.tcl:296
+#: lib/diff.tcl:202 lib/diff.tcl:319
#, tcl-format
msgid "Unable to display %s"
msgstr "Datei »%s« kann nicht angezeigt werden"
-#: lib/diff.tcl:115
+#: lib/diff.tcl:203
msgid "Error loading file:"
msgstr "Fehler beim Laden der Datei:"
-#: lib/diff.tcl:122
+#: lib/diff.tcl:210
msgid "Git Repository (subproject)"
msgstr "Git-Projektarchiv (Unterprojekt)"
-#: lib/diff.tcl:134
+#: lib/diff.tcl:222
msgid "* Binary file (not showing content)."
msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
-#: lib/diff.tcl:222
+#: lib/diff.tcl:227
#, tcl-format
msgid ""
"* Untracked file is %d bytes.\n"
@@ -1613,7 +1657,7 @@ msgstr ""
"* Datei nicht unter Versionskontrolle, Dateigröße %d Bytes.\n"
"* Nur erste %d Bytes werden angezeigt.\n"
-#: lib/diff.tcl:228
+#: lib/diff.tcl:233
#, tcl-format
msgid ""
"\n"
@@ -1624,20 +1668,20 @@ msgstr ""
"* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n"
"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n"
-#: lib/diff.tcl:436
+#: lib/diff.tcl:482
msgid "Failed to unstage selected hunk."
msgstr ""
"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
-#: lib/diff.tcl:310
+#: lib/diff.tcl:489
msgid "Failed to stage selected hunk."
msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
-#: lib/diff.tcl:386
+#: lib/diff.tcl:568
msgid "Failed to unstage selected line."
msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung."
-#: lib/diff.tcl:394
+#: lib/diff.tcl:576
msgid "Failed to stage selected line."
msgstr "Fehler beim Bereitstellen der gewählten Zeile."
@@ -1675,7 +1719,7 @@ msgstr "Bereitstellung kann nicht wieder freigegeben werden."
msgid "Index Error"
msgstr "Fehler in Bereitstellung"
-#: lib/index.tcl:21
+#: lib/index.tcl:17
msgid ""
"Updating the Git index failed. A rescan will be automatically started to "
"resynchronize git-gui."
@@ -1684,7 +1728,7 @@ msgstr ""
"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu "
"synchronisieren."
-#: lib/index.tcl:27
+#: lib/index.tcl:28
msgid "Continue"
msgstr "Fortsetzen"
@@ -1692,44 +1736,44 @@ msgstr "Fortsetzen"
msgid "Unlock Index"
msgstr "Bereitstellung freigeben"
-#: lib/index.tcl:282
+#: lib/index.tcl:289
#, tcl-format
msgid "Unstaging %s from commit"
msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
-#: lib/index.tcl:313
+#: lib/index.tcl:328
msgid "Ready to commit."
msgstr "Bereit zum Eintragen."
-#: lib/index.tcl:326
+#: lib/index.tcl:341
#, tcl-format
msgid "Adding %s"
msgstr "»%s« hinzufügen..."
-#: lib/index.tcl:381
+#: lib/index.tcl:398
#, tcl-format
msgid "Revert changes in file %s?"
msgstr "Änderungen in Datei »%s« verwerfen?"
-#: lib/index.tcl:383
+#: lib/index.tcl:400
#, tcl-format
msgid "Revert changes in these %i files?"
msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
-#: lib/index.tcl:391
+#: lib/index.tcl:408
msgid "Any unstaged changes will be permanently lost by the revert."
msgstr ""
"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
-#: lib/index.tcl:394
+#: lib/index.tcl:411
msgid "Do Nothing"
msgstr "Nichts tun"
-#: lib/index.tcl:419
+#: lib/index.tcl:429
msgid "Reverting selected files"
msgstr "Änderungen in gewählten Dateien verwerfen"
-#: lib/index.tcl:423
+#: lib/index.tcl:433
#, tcl-format
msgid "Reverting %s"
msgstr "Änderungen in %s verwerfen"
@@ -1761,7 +1805,7 @@ msgstr ""
"\n"
"Es wird gleich neu geladen.\n"
-#: lib/merge.tcl:44
+#: lib/merge.tcl:45
#, tcl-format
msgid ""
"You are in the middle of a conflicted merge.\n"
@@ -1778,7 +1822,7 @@ msgstr ""
"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst "
"danach kann eine neue Zusammenführung begonnen werden.\n"
-#: lib/merge.tcl:54
+#: lib/merge.tcl:55
#, tcl-format
msgid ""
"You are in the middle of a change.\n"
@@ -1795,34 +1839,34 @@ msgstr ""
"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich "
"einfacher beheben oder abbrechen.\n"
-#: lib/merge.tcl:106
+#: lib/merge.tcl:107
#, tcl-format
msgid "%s of %s"
msgstr "%s von %s"
-#: lib/merge.tcl:119
+#: lib/merge.tcl:120
#, tcl-format
msgid "Merging %s and %s..."
msgstr "Zusammenführen von %s und %s..."
-#: lib/merge.tcl:130
+#: lib/merge.tcl:131
msgid "Merge completed successfully."
msgstr "Zusammenführen erfolgreich abgeschlossen."
-#: lib/merge.tcl:132
+#: lib/merge.tcl:133
msgid "Merge failed. Conflict resolution is required."
msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig."
-#: lib/merge.tcl:157
+#: lib/merge.tcl:158
#, tcl-format
msgid "Merge Into %s"
msgstr "Zusammenführen in »%s«"
-#: lib/merge.tcl:176
+#: lib/merge.tcl:177
msgid "Revision To Merge"
msgstr "Zusammenzuführende Version"
-#: lib/merge.tcl:211
+#: lib/merge.tcl:212
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1832,7 +1876,7 @@ msgstr ""
"\n"
"Sie müssen die Nachbesserung der Version abschließen.\n"
-#: lib/merge.tcl:221
+#: lib/merge.tcl:222
msgid ""
"Abort merge?\n"
"\n"
@@ -1847,7 +1891,7 @@ msgstr ""
"\n"
"Zusammenführen jetzt abbrechen?"
-#: lib/merge.tcl:227
+#: lib/merge.tcl:228
msgid ""
"Reset changes?\n"
"\n"
@@ -1862,35 +1906,35 @@ msgstr ""
"\n"
"Änderungen jetzt zurücksetzen?"
-#: lib/merge.tcl:238
+#: lib/merge.tcl:239
msgid "Aborting"
msgstr "Abbruch"
-#: lib/merge.tcl:238
+#: lib/merge.tcl:239
msgid "files reset"
msgstr "Dateien zurückgesetzt"
-#: lib/merge.tcl:265
+#: lib/merge.tcl:267
msgid "Abort failed."
msgstr "Abbruch fehlgeschlagen."
-#: lib/merge.tcl:267
+#: lib/merge.tcl:269
msgid "Abort completed. Ready."
msgstr "Abbruch durchgeführt. Bereit."
-#: lib/mergetool.tcl:14
+#: lib/mergetool.tcl:8
msgid "Force resolution to the base version?"
msgstr "Konflikt durch Basisversion ersetzen?"
-#: lib/mergetool.tcl:15
+#: lib/mergetool.tcl:9
msgid "Force resolution to this branch?"
msgstr "Konflikt durch diesen Zweig ersetzen?"
-#: lib/mergetool.tcl:16
+#: lib/mergetool.tcl:10
msgid "Force resolution to the other branch?"
msgstr "Konflikt durch anderen Zweig ersetzen?"
-#: lib/mergetool.tcl:20
+#: lib/mergetool.tcl:14
#, tcl-format
msgid ""
"Note that the diff shows only conflicting changes.\n"
@@ -1916,31 +1960,31 @@ msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?"
msgid "Adding resolution for %s"
msgstr "Auflösung hinzugefügt für %s"
-#: lib/mergetool.tcl:119
+#: lib/mergetool.tcl:141
msgid "Cannot resolve deletion or link conflicts using a tool"
msgstr ""
"Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch "
"das Zusamenführungswerkzeug gelöst werden."
-#: lib/mergetool.tcl:124
+#: lib/mergetool.tcl:146
msgid "Conflict file does not exist"
msgstr "Konflikt-Datei existiert nicht"
-#: lib/mergetool.tcl:236
+#: lib/mergetool.tcl:264
#, tcl-format
msgid "Not a GUI merge tool: '%s'"
msgstr "Kein GUI Zusammenführungswerkzeug: »%s«"
-#: lib/mergetool.tcl:240
+#: lib/mergetool.tcl:268
#, tcl-format
msgid "Unsupported merge tool '%s'"
msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«"
-#: lib/mergetool.tcl:275
+#: lib/mergetool.tcl:303
msgid "Merge tool is already running, terminate it?"
msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?"
-#: lib/mergetool.tcl:295
+#: lib/mergetool.tcl:323
#, tcl-format
msgid ""
"Error retrieving versions:\n"
@@ -1949,7 +1993,7 @@ msgstr ""
"Fehler beim Abrufen der Dateiversionen:\n"
"%s"
-#: lib/mergetool.tcl:315
+#: lib/mergetool.tcl:343
#, tcl-format
msgid ""
"Could not start the merge tool:\n"
@@ -1960,11 +2004,11 @@ msgstr ""
"\n"
"%s"
-#: lib/mergetool.tcl:319
+#: lib/mergetool.tcl:347
msgid "Running merge tool..."
msgstr "Zusammenführungswerkzeug starten..."
-#: lib/mergetool.tcl:347 lib/mergetool.tcl:363
+#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
msgid "Merge tool failed."
msgstr "Zusammenführungswerkzeug fehlgeschlagen."
@@ -1982,76 +2026,76 @@ msgstr "Ungültige Archiv-Zeichenkodierung »%s«"
msgid "Restore Defaults"
msgstr "Voreinstellungen wiederherstellen"
-#: lib/option.tcl:99
+#: lib/option.tcl:121
msgid "Save"
msgstr "Speichern"
-#: lib/option.tcl:109
+#: lib/option.tcl:131
#, tcl-format
msgid "%s Repository"
msgstr "Projektarchiv %s"
-#: lib/option.tcl:110
+#: lib/option.tcl:132
msgid "Global (All Repositories)"
msgstr "Global (Alle Projektarchive)"
-#: lib/option.tcl:116
+#: lib/option.tcl:138
msgid "User Name"
msgstr "Benutzername"
-#: lib/option.tcl:117
+#: lib/option.tcl:139
msgid "Email Address"
msgstr "E-Mail-Adresse"
-#: lib/option.tcl:119
+#: lib/option.tcl:141
msgid "Summarize Merge Commits"
msgstr "Zusammenführungs-Versionen zusammenfassen"
-#: lib/option.tcl:120
+#: lib/option.tcl:142
msgid "Merge Verbosity"
msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
-#: lib/option.tcl:121
+#: lib/option.tcl:143
msgid "Show Diffstat After Merge"
msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
-#: lib/option.tcl:122
+#: lib/option.tcl:144
msgid "Use Merge Tool"
msgstr "Zusammenführungswerkzeug"
-#: lib/option.tcl:124
+#: lib/option.tcl:146
msgid "Trust File Modification Timestamps"
msgstr "Auf Dateiänderungsdatum verlassen"
-#: lib/option.tcl:124
+#: lib/option.tcl:147
msgid "Prune Tracking Branches During Fetch"
msgstr "Übernahmezweige aufräumen während Anforderung"
-#: lib/option.tcl:125
+#: lib/option.tcl:148
msgid "Match Tracking Branches"
msgstr "Passend zu Übernahmezweig"
-#: lib/option.tcl:126
+#: lib/option.tcl:149
msgid "Blame Copy Only On Changed Files"
msgstr "Kopie-Annotieren nur bei geänderten Dateien"
-#: lib/option.tcl:127
+#: lib/option.tcl:150
msgid "Minimum Letters To Blame Copy On"
msgstr "Mindestzahl Zeichen für Kopie-Annotieren"
-#: lib/option.tcl:128
+#: lib/option.tcl:151
msgid "Blame History Context Radius (days)"
msgstr "Anzahl Tage für Historien-Kontext"
-#: lib/option.tcl:129
+#: lib/option.tcl:152
msgid "Number of Diff Context Lines"
msgstr "Anzahl der Kontextzeilen beim Vergleich"
-#: lib/option.tcl:127
+#: lib/option.tcl:153
msgid "Commit Message Text Width"
msgstr "Textbreite der Versionsbeschreibung"
-#: lib/option.tcl:128
+#: lib/option.tcl:154
msgid "New Branch Name Template"
msgstr "Namensvorschlag für neue Zweige"
@@ -2067,24 +2111,24 @@ msgstr "Ändern"
msgid "Spelling Dictionary:"
msgstr "Wörterbuch Rechtschreibprüfung:"
-#: lib/option.tcl:216
+#: lib/option.tcl:254
msgid "Change Font"
msgstr "Schriftart ändern"
-#: lib/option.tcl:220
+#: lib/option.tcl:258
#, tcl-format
msgid "Choose %s"
msgstr "%s wählen"
-#: lib/option.tcl:226
+#: lib/option.tcl:264
msgid "pt."
msgstr "pt."
-#: lib/option.tcl:240
+#: lib/option.tcl:278
msgid "Preferences"
msgstr "Einstellungen"
-#: lib/option.tcl:275
+#: lib/option.tcl:314
msgid "Failed to completely save options:"
msgstr "Optionen konnten nicht gespeichert werden:"
@@ -2096,7 +2140,7 @@ msgstr "Anderes Archiv hinzufügen"
msgid "Add New Remote"
msgstr "Neues anderes Archiv hinzufügen"
-#: lib/remote_add.tcl:28
+#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
msgid "Add"
msgstr "Hinzufügen"
@@ -2151,8 +2195,7 @@ msgstr "»%s« anfordern"
#: lib/remote_add.tcl:157
#, tcl-format
msgid "Do not know how to initialize repository at location '%s'."
-msgstr ""
-"Initialisieren eines anderen Archivs an Adresse »%s« ist nicht möglich."
+msgstr "Initialisieren eines anderen Archivs an Adresse »%s« ist nicht möglich."
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
#: lib/transport.tcl:81
@@ -2173,11 +2216,11 @@ msgstr "Zweig in anderem Archiv löschen"
msgid "From Repository"
msgstr "In Projektarchiv"
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
msgid "Remote:"
msgstr "Anderes Archiv:"
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
msgid "Arbitrary Location:"
msgstr "Adresse:"
@@ -2193,10 +2236,6 @@ msgstr "Nur löschen, wenn"
msgid "Merged Into:"
msgstr "Zusammengeführt mit:"
-#: lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
-msgstr "Immer (Keine Zusammenführungsprüfung)"
-
#: lib/remote_branch_delete.tcl:152
msgid "A branch is required for 'Merged Into'."
msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden."
@@ -2226,27 +2265,16 @@ msgstr ""
msgid "Please select one or more branches to delete."
msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll."
-#: lib/remote_branch_delete.tcl:216
-msgid ""
-"Recovering deleted branches is difficult.\n"
-"\n"
-"Delete the selected branches?"
-msgstr ""
-"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand "
-"möglich.\n"
-"\n"
-"Sollen die ausgewählten Zweige gelöscht werden?"
-
#: lib/remote_branch_delete.tcl:226
#, tcl-format
msgid "Deleting branches from %s"
msgstr "Zweige auf »%s« werden gelöscht"
-#: lib/remote_branch_delete.tcl:286
+#: lib/remote_branch_delete.tcl:292
msgid "No repository selected."
msgstr "Kein Projektarchiv ausgewählt."
-#: lib/remote_branch_delete.tcl:291
+#: lib/remote_branch_delete.tcl:297
#, tcl-format
msgid "Scanning %s..."
msgstr "»%s« laden..."
@@ -2259,11 +2287,11 @@ msgstr "Anderes Archiv entfernen"
msgid "Prune from"
msgstr "Aufräumen von"
-#: lib/remote.tcl:170
+#: lib/remote.tcl:173
msgid "Fetch from"
msgstr "Anfordern von"
-#: lib/remote.tcl:213
+#: lib/remote.tcl:215
msgid "Push to"
msgstr "Versenden nach"
@@ -2271,11 +2299,11 @@ msgstr "Versenden nach"
msgid "Find:"
msgstr "Suchen:"
-#: lib/search.tcl:22
+#: lib/search.tcl:23
msgid "Next"
msgstr "Nächster"
-#: lib/search.tcl:23
+#: lib/search.tcl:24
msgid "Prev"
msgstr "Voriger"
@@ -2283,11 +2311,11 @@ msgstr "Voriger"
msgid "Case-Sensitive"
msgstr "Groß-/Kleinschreibung unterscheiden"
-#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
msgid "Cannot write shortcut:"
msgstr "Fehler beim Schreiben der Verknüpfung:"
-#: lib/shortcut.tcl:136
+#: lib/shortcut.tcl:137
msgid "Cannot write icon:"
msgstr "Fehler beim Erstellen des Icons:"
@@ -2316,15 +2344,15 @@ msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen"
msgid "Unrecognized spell checker"
msgstr "Unbekanntes Rechtschreibprüfungsprogramm"
-#: lib/spellcheck.tcl:180
+#: lib/spellcheck.tcl:186
msgid "No Suggestions"
msgstr "Keine Vorschläge"
-#: lib/spellcheck.tcl:381
+#: lib/spellcheck.tcl:388
msgid "Unexpected EOF from spell checker"
msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm"
-#: lib/spellcheck.tcl:385
+#: lib/spellcheck.tcl:392
msgid "Spell Checker Failed"
msgstr "Rechtschreibprüfung fehlgeschlagen"
@@ -2534,31 +2562,31 @@ msgstr "Spiegeln nach %s"
msgid "Pushing %s %s to %s"
msgstr "%s %s nach %s versenden"
-#: lib/transport.tcl:89
+#: lib/transport.tcl:100
msgid "Push Branches"
msgstr "Zweige versenden"
-#: lib/transport.tcl:103
+#: lib/transport.tcl:114
msgid "Source Branches"
msgstr "Lokale Zweige"
-#: lib/transport.tcl:120
+#: lib/transport.tcl:131
msgid "Destination Repository"
msgstr "Ziel-Projektarchiv"
-#: lib/transport.tcl:158
+#: lib/transport.tcl:169
msgid "Transfer Options"
msgstr "Netzwerk-Einstellungen"
-#: lib/transport.tcl:160
+#: lib/transport.tcl:171
msgid "Force overwrite existing branch (may discard changes)"
msgstr ""
"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
-#: lib/transport.tcl:164
+#: lib/transport.tcl:175
msgid "Use thin pack (for slow network connections)"
msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
-#: lib/transport.tcl:168
+#: lib/transport.tcl:179
msgid "Include tags"
msgstr "Mit Markierungen übertragen"
--
1.6.3.3
^ permalink raw reply related
* Re: [PATCH v2] Fix remote.<remote>.vcs
From: Junio C Hamano @ 2010-01-27 19:13 UTC (permalink / raw)
To: Daniel Barkalow; +Cc: Ilari Liusvaara, git, Tor Arvid Lund
In-Reply-To: <alpine.LNX.2.00.1001271335140.14365@iabervon.org>
Daniel Barkalow <barkalow@iabervon.org> writes:
> Except that you missed the "remote == NULL" case (noted below), this is
> what I was thinking of.
>
> Acked-by: Daniel Barkalow <barkalow@iabervon.org>
>> if (!remote)
>> die("No remote provided to transport_get()");
>>
>> ret->remote = remote;
>> + helper = remote->foreign_vcs;
>
> Needs to be "helper = remote ? remote->foreign_vcs : NULL", for the same
> reason that the test below had been "remote && remote->foreign_vcs".
Even in the presense of "if remote is NULL then we die" in the context
above?
>>
>> if (!url && remote && remote->url)
>> url = remote->url[0];
>> ret->url = url;
>>
>> - /* In case previous URL had helper forced, reset it. */
>> - remote->foreign_vcs = NULL;
>> -
>> /* maybe it is a foreign URL? */
>> if (url) {
>> const char *p = url;
>> @@ -933,11 +932,11 @@ struct transport *transport_get(struct remote *remote, const char *url)
>> while (isalnum(*p))
>> p++;
>> if (!prefixcmp(p, "::"))
>> - remote->foreign_vcs = xstrndup(url, p - url);
>> + helper = xstrndup(url, p - url);
>> }
>>
>> - if (remote && remote->foreign_vcs) {
>> - transport_helper_init(ret, remote->foreign_vcs);
>> + if (helper) {
>> + transport_helper_init(ret, helper);
>> } else if (!prefixcmp(url, "rsync:")) {
>> ret->get_refs_list = get_refs_via_rsync;
>> ret->fetch = fetch_objs_via_rsync;
>> --
>> 1.7.0.rc0.19.gb557e6
>>
>>
^ permalink raw reply
* Re: [PATCH] fix portability issues with $ in double quotes
From: Junio C Hamano @ 2010-01-27 19:16 UTC (permalink / raw)
To: Stephen Boyd; +Cc: Johannes Sixt, git
In-Reply-To: <4B608A3C.7090106@gmail.com>
Stephen Boyd <bebarino@gmail.com> writes:
> On 01/26/2010 11:53 PM, Johannes Sixt wrote:
>> The instances you changed look good. I didn't check whether you missed
>> some. Was this some sort of mechanical change?
>
> Not really mechanical. I just grepped for sed and grep expressions and
> then went through the results by hand looking for unescaped dollar
> signs.
Thanks; with this (and my earlier rant on bash refusing to redirect with
'cmd <$variable' when $variable has $IFS character and is not quoted), the
result seem to make my OpenBSD build pass all the tests ;-)
^ permalink raw reply
* [PATCH] gitk: Update German translation.
From: Christian Stimming @ 2010-01-27 19:30 UTC (permalink / raw)
To: Paul Mackerras; +Cc: git
[-- Attachment #1: Type: Text/Plain, Size: 35618 bytes --]
Signed-off-by: Christian Stimming <stimming@tuhh.de>
---
Patch inline below, and additionally attached just in case the mailer
messes up the whitespace. Thanks!
po/de.po | 741 ++++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 432 insertions(+), 309 deletions(-)
diff --git a/po/de.po b/po/de.po
index e224595..c79aa9c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,33 +8,33 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-12 21:55+0200\n"
-"PO-Revision-Date: 2009-05-12 22:18+0200\n"
+"POT-Creation-Date: 2010-01-27 20:21+0100\n"
+"PO-Revision-Date: 2010-01-27 20:27+0100\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: gitk:113
+#: gitk:115
msgid "Couldn't get list of unmerged files:"
msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:"
-#: gitk:268
+#: gitk:274
msgid "Error parsing revisions:"
msgstr "Fehler beim Laden der Versionen:"
-#: gitk:323
+#: gitk:329
msgid "Error executing --argscmd command:"
msgstr "Fehler beim Ausführen des --argscmd-Kommandos:"
-#: gitk:336
+#: gitk:342
msgid "No files selected: --merge specified but no files are unmerged."
msgstr ""
"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren "
"keine nicht zusammengeführten Dateien."
-#: gitk:339
+#: gitk:345
msgid ""
"No files selected: --merge specified but no unmerged files are within file "
"limit."
@@ -42,719 +42,801 @@ msgstr ""
"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine "
"nicht zusammengeführten Dateien in der Dateiauswahl."
-#: gitk:361 gitk:508
+#: gitk:367 gitk:514
msgid "Error executing git log:"
msgstr "Fehler beim Ausführen von »git log«:"
-#: gitk:379 gitk:524
+#: gitk:385 gitk:530
msgid "Reading"
msgstr "Lesen"
-#: gitk:439 gitk:4061
+#: gitk:445 gitk:4261
msgid "Reading commits..."
msgstr "Versionen werden gelesen ..."
-#: gitk:442 gitk:1560 gitk:4064
+#: gitk:448 gitk:1578 gitk:4264
msgid "No commits selected"
msgstr "Keine Versionen ausgewählt"
-#: gitk:1436
+#: gitk:1454
msgid "Can't parse git log output:"
msgstr "Ausgabe von »git log« kann nicht erkannt werden:"
-#: gitk:1656
+#: gitk:1674
msgid "No commit information available"
msgstr "Keine Versionsinformation verfügbar"
-#: gitk:1791 gitk:1815 gitk:3854 gitk:8714 gitk:10250 gitk:10422
+#: gitk:1816
+msgid "mc"
+msgstr "mc"
+
+#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804
msgid "OK"
msgstr "Ok"
-#: gitk:1817 gitk:3856 gitk:8311 gitk:8385 gitk:8495 gitk:8544 gitk:8716
-#: gitk:10251 gitk:10423
+#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046
+#: gitk:10586 gitk:10805
msgid "Cancel"
msgstr "Abbrechen"
-#: gitk:1917
+#: gitk:1975
msgid "Update"
msgstr "Aktualisieren"
-#: gitk:1918
+#: gitk:1976
msgid "Reload"
msgstr "Neu laden"
-#: gitk:1919
+#: gitk:1977
msgid "Reread references"
msgstr "Zweige neu laden"
-#: gitk:1920
+#: gitk:1978
msgid "List references"
msgstr "Zweige/Markierungen auflisten"
-#: gitk:1922
+#: gitk:1980
msgid "Start git gui"
msgstr "»git gui« starten"
-#: gitk:1924
+#: gitk:1982
msgid "Quit"
msgstr "Beenden"
-#: gitk:1916
+#: gitk:1974
msgid "File"
msgstr "Datei"
-#: gitk:1928
+#: gitk:1986
msgid "Preferences"
msgstr "Einstellungen"
-#: gitk:1927
+#: gitk:1985
msgid "Edit"
msgstr "Bearbeiten"
-#: gitk:1932
+#: gitk:1990
msgid "New view..."
msgstr "Neue Ansicht ..."
-#: gitk:1933
+#: gitk:1991
msgid "Edit view..."
msgstr "Ansicht bearbeiten ..."
-#: gitk:1934
+#: gitk:1992
msgid "Delete view"
msgstr "Ansicht entfernen"
-#: gitk:1936
+#: gitk:1994
msgid "All files"
msgstr "Alle Dateien"
-#: gitk:1931 gitk:3666
+#: gitk:1989 gitk:3808
msgid "View"
msgstr "Ansicht"
-#: gitk:1941 gitk:1951 gitk:2650
+#: gitk:1999 gitk:2009 gitk:2780
msgid "About gitk"
msgstr "Über gitk"
-#: gitk:1942 gitk:1956
+#: gitk:2000 gitk:2014
msgid "Key bindings"
msgstr "Tastenkürzel"
-#: gitk:1940 gitk:1955
+#: gitk:1998 gitk:2013
msgid "Help"
msgstr "Hilfe"
-#: gitk:2016
-msgid "SHA1 ID: "
-msgstr "SHA1:"
+#: gitk:2091 gitk:8110
+msgid "SHA1 ID:"
+msgstr "SHA1 ID:"
-#: gitk:2047
+#: gitk:2122
msgid "Row"
msgstr "Zeile"
-#: gitk:2078
+#: gitk:2160
msgid "Find"
msgstr "Suche"
-#: gitk:2079
+#: gitk:2161
msgid "next"
msgstr "nächste"
-#: gitk:2080
+#: gitk:2162
msgid "prev"
msgstr "vorige"
-#: gitk:2081
+#: gitk:2163
msgid "commit"
msgstr "Version nach"
-#: gitk:2084 gitk:2086 gitk:4222 gitk:4245 gitk:4269 gitk:6210 gitk:6282
-#: gitk:6366
+#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482
+#: gitk:6566
msgid "containing:"
msgstr "Beschreibung:"
-#: gitk:2087 gitk:3158 gitk:3163 gitk:4297
+#: gitk:2169 gitk:3290 gitk:3295 gitk:4497
msgid "touching paths:"
msgstr "Dateien:"
-#: gitk:2088 gitk:4302
+#: gitk:2170 gitk:4502
msgid "adding/removing string:"
msgstr "Änderungen:"
-#: gitk:2097 gitk:2099
+#: gitk:2179 gitk:2181
msgid "Exact"
msgstr "Exakt"
-#: gitk:2099 gitk:4377 gitk:6178
+#: gitk:2181 gitk:4577 gitk:6378
msgid "IgnCase"
msgstr "Kein Groß/Klein"
-#: gitk:2099 gitk:4271 gitk:4375 gitk:6174
+#: gitk:2181 gitk:4471 gitk:4575 gitk:6374
msgid "Regexp"
msgstr "Regexp"
-#: gitk:2101 gitk:2102 gitk:4396 gitk:4426 gitk:4433 gitk:6302 gitk:6370
+#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570
msgid "All fields"
msgstr "Alle Felder"
-#: gitk:2102 gitk:4394 gitk:4426 gitk:6241
+#: gitk:2184 gitk:4594 gitk:4626 gitk:6441
msgid "Headline"
msgstr "Überschrift"
-#: gitk:2103 gitk:4394 gitk:6241 gitk:6370 gitk:6804
+#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003
msgid "Comments"
msgstr "Beschreibung"
-#: gitk:2103 gitk:4394 gitk:4398 gitk:4433 gitk:6241 gitk:6739 gitk:7991
-#: gitk:8006
+#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285
+#: gitk:8300
msgid "Author"
msgstr "Autor"
-#: gitk:2103 gitk:4394 gitk:6241 gitk:6741
+#: gitk:2185 gitk:4594 gitk:6441 gitk:6940
msgid "Committer"
msgstr "Eintragender"
-#: gitk:2132
+#: gitk:2216
msgid "Search"
msgstr "Suchen"
-#: gitk:2139
+#: gitk:2224
msgid "Diff"
msgstr "Vergleich"
-#: gitk:2141
+#: gitk:2226
msgid "Old version"
msgstr "Alte Version"
-#: gitk:2143
+#: gitk:2228
msgid "New version"
msgstr "Neue Version"
-#: gitk:2145
+#: gitk:2230
msgid "Lines of context"
msgstr "Kontextzeilen"
-#: gitk:2155
+#: gitk:2240
msgid "Ignore space change"
msgstr "Leerzeichenänderungen ignorieren"
-#: gitk:2213
+#: gitk:2299
msgid "Patch"
msgstr "Patch"
-#: gitk:2215
+#: gitk:2301
msgid "Tree"
msgstr "Baum"
-#: gitk:2359 gitk:2376
+#: gitk:2456 gitk:2473
msgid "Diff this -> selected"
msgstr "Vergleich: diese -> gewählte"
-#: gitk:2360 gitk:2377
+#: gitk:2457 gitk:2474
msgid "Diff selected -> this"
msgstr "Vergleich: gewählte -> diese"
-#: gitk:2361 gitk:2378
+#: gitk:2458 gitk:2475
msgid "Make patch"
msgstr "Patch erstellen"
-#: gitk:2362 gitk:8369
+#: gitk:2459 gitk:8692
msgid "Create tag"
msgstr "Markierung erstellen"
-#: gitk:2363 gitk:8475
+#: gitk:2460 gitk:8808
msgid "Write commit to file"
msgstr "Version in Datei schreiben"
-#: gitk:2364 gitk:8532
+#: gitk:2461 gitk:8865
msgid "Create new branch"
msgstr "Neuen Zweig erstellen"
-#: gitk:2365
+#: gitk:2462
msgid "Cherry-pick this commit"
msgstr "Diese Version pflücken"
-#: gitk:2366
+#: gitk:2463
msgid "Reset HEAD branch to here"
msgstr "HEAD-Zweig auf diese Version zurücksetzen"
-#: gitk:2367
+#: gitk:2464
msgid "Mark this commit"
msgstr "Lesezeichen setzen"
-#: gitk:2368
+#: gitk:2465
msgid "Return to mark"
msgstr "Zum Lesezeichen"
-#: gitk:2369
+#: gitk:2466
msgid "Find descendant of this and mark"
msgstr "Abkömmling von Lesezeichen und dieser Version finden"
-#: gitk:2370
+#: gitk:2467
msgid "Compare with marked commit"
msgstr "Mit Lesezeichen vergleichen"
-#: gitk:2384
+#: gitk:2481
msgid "Check out this branch"
msgstr "Auf diesen Zweig umstellen"
-#: gitk:2385
+#: gitk:2482
msgid "Remove this branch"
msgstr "Zweig löschen"
-#: gitk:2392
+#: gitk:2489
msgid "Highlight this too"
msgstr "Diesen auch hervorheben"
-#: gitk:2393
+#: gitk:2490
msgid "Highlight this only"
msgstr "Nur diesen hervorheben"
-#: gitk:2394
+#: gitk:2491
msgid "External diff"
msgstr "Externes Diff-Programm"
-#: gitk:2395
+#: gitk:2492
msgid "Blame parent commit"
msgstr "Annotieren der Elternversion"
-#: gitk:2402
+#: gitk:2499
msgid "Show origin of this line"
msgstr "Herkunft dieser Zeile anzeigen"
-#: gitk:2403
+#: gitk:2500
msgid "Run git gui blame on this line"
msgstr "Diese Zeile annotieren (»git gui blame«)"
-#: gitk:2652
+#: gitk:2782
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
-"Copyright © 2005-2008 Paul Mackerras\n"
+"Copyright ©9 2005-2009 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - eine Visualisierung der Git-Historie\n"
"\n"
-"Copyright © 2005-2008 Paul Mackerras\n"
+"Copyright © 2005-2009 Paul Mackerras\n"
"\n"
-"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
-"License"
+"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License"
-#: gitk:2660 gitk:2722 gitk:8897
+#: gitk:2790 gitk:2854 gitk:9230
msgid "Close"
msgstr "Schließen"
-#: gitk:2679
+#: gitk:2811
msgid "Gitk key bindings"
msgstr "Gitk-Tastaturbelegung"
-#: gitk:2682
+#: gitk:2814
msgid "Gitk key bindings:"
msgstr "Gitk-Tastaturbelegung:"
-#: gitk:2684
+#: gitk:2816
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tBeenden"
-#: gitk:2685
+#: gitk:2817
msgid "<Home>\t\tMove to first commit"
msgstr "<Pos1>\t\tZur neuesten Version springen"
-#: gitk:2686
+#: gitk:2818
msgid "<End>\t\tMove to last commit"
msgstr "<Ende>\t\tZur ältesten Version springen"
-#: gitk:2687
+#: gitk:2819
msgid "<Up>, p, i\tMove up one commit"
msgstr "<Hoch>, p, i\tNächste neuere Version"
-#: gitk:2688
+#: gitk:2820
msgid "<Down>, n, k\tMove down one commit"
msgstr "<Runter>, n, k\tNächste ältere Version"
-#: gitk:2689
+#: gitk:2821
msgid "<Left>, z, j\tGo back in history list"
msgstr "<Links>, z, j\tEine Version zurückgehen"
-#: gitk:2690
+#: gitk:2822
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Rechts>, x, l\tEine Version weitergehen"
-#: gitk:2691
+#: gitk:2823
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<BildHoch>\tEine Seite nach oben blättern"
-#: gitk:2692
+#: gitk:2824
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<BildRunter>\tEine Seite nach unten blättern"
-#: gitk:2693
+#: gitk:2825
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
-#: gitk:2694
+#: gitk:2826
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
-#: gitk:2695
+#: gitk:2827
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
-#: gitk:2696
+#: gitk:2828
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
-#: gitk:2697
+#: gitk:2829
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern"
-#: gitk:2698
+#: gitk:2830
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
-#: gitk:2699
+#: gitk:2831
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
-#: gitk:2700
+#: gitk:2832
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
-#: gitk:2701
+#: gitk:2833
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
-#: gitk:2702
+#: gitk:2834
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
-#: gitk:2703
+#: gitk:2835
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
-#: gitk:2704
+#: gitk:2836
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern"
-#: gitk:2705
+#: gitk:2837
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern"
-#: gitk:2706
+#: gitk:2838
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tSuchen"
-#: gitk:2707
+#: gitk:2839
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tWeitersuchen"
-#: gitk:2708
+#: gitk:2840
msgid "<Return>\tMove to next find hit"
msgstr "<Eingabetaste>\tWeitersuchen"
-#: gitk:2709
+#: gitk:2841
msgid "/\t\tFocus the search box"
msgstr "/\t\tTastaturfokus ins Suchfeld"
-#: gitk:2710
+#: gitk:2842
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tRückwärts weitersuchen"
-#: gitk:2711
+#: gitk:2843
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tVergleich zur nächsten Datei blättern"
-#: gitk:2712
+#: gitk:2844
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
-#: gitk:2713
+#: gitk:2845
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich"
-#: gitk:2714
+#: gitk:2846
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern"
-#: gitk:2715
+#: gitk:2847
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-Plus>\tSchrift vergrößern"
-#: gitk:2716
+#: gitk:2848
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-Nummernblock-Minus> Schrift verkleinern"
-#: gitk:2717
+#: gitk:2849
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-Minus>\tSchrift verkleinern"
-#: gitk:2718
+#: gitk:2850
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tAktualisieren"
-#: gitk:3173
-#, tcl-format
-msgid "Error getting \"%s\" from %s:"
-msgstr "Fehler beim Holen von »%s« von »%s«:"
-
-#: gitk:3230 gitk:3239
+#: gitk:3305 gitk:3314
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:"
-#: gitk:3251
+#: gitk:3327
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Fehler beim Holen von »%s« von »%s«:"
+
+#: gitk:3390
msgid "command failed:"
msgstr "Kommando fehlgeschlagen:"
-#: gitk:3397
+#: gitk:3539
msgid "No such commit"
msgstr "Version nicht gefunden"
-#: gitk:3411
+#: gitk:3553
msgid "git gui blame: command failed:"
msgstr "git gui blame: Kommando fehlgeschlagen:"
-#: gitk:3442
+#: gitk:3584
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s"
-#: gitk:3450
+#: gitk:3592
#, tcl-format
msgid "Error reading index: %s"
msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s"
-#: gitk:3475
+#: gitk:3617
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "»git blame« konnte nicht gestartet werden: %s"
-#: gitk:3478 gitk:6209
+#: gitk:3620 gitk:6409
msgid "Searching"
msgstr "Suchen"
-#: gitk:3510
+#: gitk:3652
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Fehler beim Ausführen von »git blame«: %s"
-#: gitk:3538
+#: gitk:3680
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr ""
"Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird"
-#: gitk:3552
+#: gitk:3694
msgid "External diff viewer failed:"
msgstr "Externes Diff-Programm fehlgeschlagen:"
-#: gitk:3670
+#: gitk:3812
msgid "Gitk view definition"
msgstr "Gitk-Ansichten"
-#: gitk:3674
+#: gitk:3816
msgid "Remember this view"
msgstr "Diese Ansicht speichern"
-#: gitk:3675
-msgid "Commits to include (arguments to git log):"
-msgstr "Versionen anzeigen (Argumente von git log):"
+#: gitk:3817
+msgid "References (space separated list):"
+msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):"
-#: gitk:3676
-msgid "Use all refs"
-msgstr "Alle Zweige verwenden"
+#: gitk:3818
+msgid "Branches & tags:"
+msgstr "Zweige/Markierungen:"
-#: gitk:3677
-msgid "Strictly sort by date"
-msgstr "Streng nach Datum sortieren"
+#: gitk:3819
+msgid "All refs"
+msgstr "Alle Markierungen und Zweige"
-#: gitk:3678
-msgid "Mark branch sides"
-msgstr "Zweig-Seiten markieren"
+#: gitk:3820
+msgid "All (local) branches"
+msgstr "Alle (lokalen) Zweige"
-#: gitk:3679
-msgid "Since date:"
-msgstr "Von Datum:"
+#: gitk:3821
+msgid "All tags"
+msgstr "Alle Markierungen"
-#: gitk:3680
-msgid "Until date:"
-msgstr "Bis Datum:"
+#: gitk:3822
+msgid "All remote-tracking branches"
+msgstr "Alle Übernahmezweige"
+
+#: gitk:3823
+msgid "Commit Info (regular expressions):"
+msgstr "Versionsinformationen (reguläre Ausdrücke):"
+
+#: gitk:3824
+msgid "Author:"
+msgstr "Autor:"
+
+#: gitk:3825
+msgid "Committer:"
+msgstr "Eintragender:"
+
+#: gitk:3826
+msgid "Commit Message:"
+msgstr "Versionsbeschreibung:"
-#: gitk:3681
-msgid "Max count:"
-msgstr "Max. Anzahl:"
+#: gitk:3827
+msgid "Matches all Commit Info criteria"
+msgstr "Alle Versionsinformationen-Kriterien erfüllen"
-#: gitk:3682
-msgid "Skip:"
+#: gitk:3828
+msgid "Changes to Files:"
+msgstr "Dateien:"
+
+#: gitk:3829
+msgid "Fixed String"
+msgstr "Zeichenkette"
+
+#: gitk:3830
+msgid "Regular Expression"
+msgstr "Regulärer Ausdruck"
+
+#: gitk:3831
+msgid "Search string:"
+msgstr "Suchausdruck:"
+
+#: gitk:3832
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)"
+
+#: gitk:3833
+msgid "Since:"
+msgstr "Von:"
+
+#: gitk:3834
+msgid "Until:"
+msgstr "Bis:"
+
+#: gitk:3835
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):"
+
+#: gitk:3836
+msgid "Number to show:"
+msgstr "Anzeigen:"
+
+#: gitk:3837
+msgid "Number to skip:"
msgstr "Überspringen:"
-#: gitk:3683
+#: gitk:3838
+msgid "Miscellaneous options:"
+msgstr "Sonstiges:"
+
+#: gitk:3839
+msgid "Strictly sort by date"
+msgstr "Streng nach Datum sortieren"
+
+#: gitk:3840
+msgid "Mark branch sides"
+msgstr "Zweig-Seiten markieren"
+
+#: gitk:3841
msgid "Limit to first parent"
msgstr "Auf erste Elternversion beschränken"
-#: gitk:3684
+#: gitk:3842
+msgid "Simple history"
+msgstr "Einfache Historie"
+
+#: gitk:3843
+msgid "Additional arguments to git log:"
+msgstr "Zusätzliche Argumente für »git log«:"
+
+#: gitk:3844
+msgid "Enter files and directories to include, one per line:"
+msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
+
+#: gitk:3845
msgid "Command to generate more commits to include:"
msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
-#: gitk:3780
+#: gitk:3967
msgid "Gitk: edit view"
msgstr "Gitk: Ansicht bearbeiten"
-#: gitk:3793
-msgid "Name"
-msgstr "Name"
+#: gitk:3975
+msgid "-- criteria for selecting revisions"
+msgstr "-- Auswahl der angezeigten Versionen"
-#: gitk:3841
-msgid "Enter files and directories to include, one per line:"
-msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
+#: gitk:3980
+msgid "View Name"
+msgstr "Ansichtsname"
-#: gitk:3855
+#: gitk:4055
msgid "Apply (F5)"
msgstr "Anwenden (F5)"
-#: gitk:3893
+#: gitk:4093
msgid "Error in commit selection arguments:"
msgstr "Fehler in den ausgewählten Versionen:"
-#: gitk:3946 gitk:3998 gitk:4446 gitk:4460 gitk:5721 gitk:11114 gitk:11115
+#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535
msgid "None"
msgstr "Keine"
-#: gitk:4394 gitk:6241 gitk:7993 gitk:8008
+#: gitk:4594 gitk:6441 gitk:8287 gitk:8302
msgid "Date"
msgstr "Datum"
-#: gitk:4394 gitk:6241
+#: gitk:4594 gitk:6441
msgid "CDate"
msgstr "Eintragedatum"
-#: gitk:4543 gitk:4548
+#: gitk:4743 gitk:4748
msgid "Descendant"
msgstr "Abkömmling"
-#: gitk:4544
+#: gitk:4744
msgid "Not descendant"
msgstr "Kein Abkömmling"
-#: gitk:4551 gitk:4556
+#: gitk:4751 gitk:4756
msgid "Ancestor"
msgstr "Vorgänger"
-#: gitk:4552
+#: gitk:4752
msgid "Not ancestor"
msgstr "Kein Vorgänger"
-#: gitk:4842
+#: gitk:5042
msgid "Local changes checked in to index but not committed"
msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
-#: gitk:4878
+#: gitk:5078
msgid "Local uncommitted changes, not checked in to index"
msgstr "Lokale Änderungen, nicht bereitgestellt"
-#: gitk:6559
+#: gitk:6759
msgid "many"
msgstr "viele"
-#: gitk:6743
+#: gitk:6942
msgid "Tags:"
msgstr "Markierungen:"
-#: gitk:6760 gitk:6766 gitk:7986
+#: gitk:6959 gitk:6965 gitk:8280
msgid "Parent"
msgstr "Eltern"
-#: gitk:6771
+#: gitk:6970
msgid "Child"
msgstr "Kind"
-#: gitk:6780
+#: gitk:6979
msgid "Branch"
msgstr "Zweig"
-#: gitk:6783
+#: gitk:6982
msgid "Follows"
msgstr "Folgt auf"
-#: gitk:6786
+#: gitk:6985
msgid "Precedes"
msgstr "Vorgänger von"
-#: gitk:7279
+#: gitk:7522
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Fehler beim Laden des Vergleichs: %s"
-#: gitk:7819
+#: gitk:8108
msgid "Goto:"
msgstr "Gehe zu:"
-#: gitk:7821
-msgid "SHA1 ID:"
-msgstr "SHA1 ID:"
-
-#: gitk:7840
+#: gitk:8129
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
-#: gitk:7852
+#: gitk:8136
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "Version »%s« ist unbekannt"
+
+#: gitk:8146
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "SHA1-Hashwert »%s« ist unbekannt"
-#: gitk:7854
+#: gitk:8148
#, tcl-format
-msgid "Tag/Head %s is not known"
-msgstr "Markierung/Zweig »%s« ist unbekannt"
+msgid "Revision %s is not in the current view"
+msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt"
-#: gitk:7996
+#: gitk:8290
msgid "Children"
msgstr "Kinder"
-#: gitk:8053
+#: gitk:8348
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Zweig »%s« hierher zurücksetzen"
-#: gitk:8055
+#: gitk:8350
msgid "Detached head: can't reset"
msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
-#: gitk:8164 gitk:8170
+#: gitk:8459 gitk:8465
msgid "Skipping merge commit "
msgstr "Überspringe Zusammenführungs-Version "
-#: gitk:8179 gitk:8184
+#: gitk:8474 gitk:8479
msgid "Error getting patch ID for "
msgstr "Fehler beim Holen der Patch-ID für "
-#: gitk:8180 gitk:8185
+#: gitk:8475 gitk:8480
msgid " - stopping\n"
msgstr " - Abbruch.\n"
-#: gitk:8190 gitk:8193 gitk:8201 gitk:8211 gitk:8220
+#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519
msgid "Commit "
msgstr "Version "
-#: gitk:8194
+#: gitk:8489
msgid ""
" is the same patch as\n"
" "
@@ -762,7 +844,7 @@ msgstr ""
" ist das gleiche Patch wie\n"
" "
-#: gitk:8202
+#: gitk:8497
msgid ""
" differs from\n"
" "
@@ -770,117 +852,138 @@ msgstr ""
" ist unterschiedlich von\n"
" "
-#: gitk:8204
-msgid "- stopping\n"
-msgstr "- Abbruch.\n"
+#: gitk:8499
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+"Vergleich der Versionen:\n"
+"\n"
-#: gitk:8212 gitk:8221
+#: gitk:8511 gitk:8520
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " hat %s Kinder. Abbruch\n"
-#: gitk:8252
+#: gitk:8539
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Fehler beim Schreiben der Version in Datei: %s"
+
+#: gitk:8545
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Fehler beim Vergleichen der Versionen: %s"
+
+#: gitk:8575
msgid "Top"
msgstr "Oben"
-#: gitk:8253
+#: gitk:8576
msgid "From"
msgstr "Von"
-#: gitk:8258
+#: gitk:8581
msgid "To"
msgstr "bis"
-#: gitk:8282
+#: gitk:8605
msgid "Generate patch"
msgstr "Patch erstellen"
-#: gitk:8284
+#: gitk:8607
msgid "From:"
msgstr "Von:"
-#: gitk:8293
+#: gitk:8616
msgid "To:"
msgstr "bis:"
-#: gitk:8302
+#: gitk:8625
msgid "Reverse"
msgstr "Umgekehrt"
-#: gitk:8304 gitk:8489
+#: gitk:8627 gitk:8822
msgid "Output file:"
msgstr "Ausgabedatei:"
-#: gitk:8310
+#: gitk:8633
msgid "Generate"
msgstr "Erzeugen"
-#: gitk:8348
+#: gitk:8671
msgid "Error creating patch:"
msgstr "Fehler beim Erzeugen des Patches:"
-#: gitk:8371 gitk:8477 gitk:8534
+#: gitk:8694 gitk:8810 gitk:8867
msgid "ID:"
msgstr "ID:"
-#: gitk:8380
+#: gitk:8703
msgid "Tag name:"
msgstr "Markierungsname:"
-#: gitk:8384 gitk:8543
+#: gitk:8706
+msgid "Tag message is optional"
+msgstr "Eine Markierungsbeschreibung ist optional"
+
+#: gitk:8708
+msgid "Tag message:"
+msgstr "Markierungsbeschreibung:"
+
+#: gitk:8712 gitk:8876
msgid "Create"
msgstr "Erstellen"
-#: gitk:8401
+#: gitk:8730
msgid "No tag name specified"
msgstr "Kein Markierungsname angegeben"
-#: gitk:8405
+#: gitk:8734
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Markierung »%s« existiert bereits."
-#: gitk:8411
+#: gitk:8744
msgid "Error creating tag:"
msgstr "Fehler beim Erstellen der Markierung:"
-#: gitk:8486
+#: gitk:8819
msgid "Command:"
msgstr "Kommando:"
-#: gitk:8494
+#: gitk:8827
msgid "Write"
msgstr "Schreiben"
-#: gitk:8512
+#: gitk:8845
msgid "Error writing commit:"
msgstr "Fehler beim Schreiben der Version:"
-#: gitk:8539
+#: gitk:8872
msgid "Name:"
msgstr "Name:"
-#: gitk:8562
+#: gitk:8895
msgid "Please specify a name for the new branch"
msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
-#: gitk:8567
+#: gitk:8900
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?"
-#: gitk:8633
+#: gitk:8966
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
-"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
-"eintragen?"
+"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut eintragen?"
-#: gitk:8638
+#: gitk:8971
msgid "Cherry-picking"
msgstr "Version pflücken"
-#: gitk:8647
+#: gitk:8980
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
@@ -890,7 +993,7 @@ msgstr ""
"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
"zwischenspeichern (»git stash«) und dann erneut versuchen."
-#: gitk:8653
+#: gitk:8986
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
@@ -899,34 +1002,34 @@ msgstr ""
"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
"werden, um diesen Konflikt aufzulösen?"
-#: gitk:8669
+#: gitk:9002
msgid "No changes committed"
msgstr "Keine Änderungen eingetragen"
-#: gitk:8695
+#: gitk:9028
msgid "Confirm reset"
msgstr "Zurücksetzen bestätigen"
-#: gitk:8697
+#: gitk:9030
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Zweig »%s« auf »%s« zurücksetzen?"
-#: gitk:8701
+#: gitk:9032
msgid "Reset type:"
msgstr "Art des Zurücksetzens:"
-#: gitk:8705
+#: gitk:9035
msgid "Soft: Leave working tree and index untouched"
msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
-#: gitk:8708
+#: gitk:9038
msgid "Mixed: Leave working tree untouched, reset index"
msgstr ""
"Gemischt: Arbeitskopie unverändert,\n"
"Bereitstellung zurückgesetzt"
-#: gitk:8711
+#: gitk:9041
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
@@ -934,21 +1037,21 @@ msgstr ""
"Hart: Arbeitskopie und Bereitstellung\n"
"(Alle lokalen Änderungen werden gelöscht)"
-#: gitk:8728
+#: gitk:9058
msgid "Resetting"
msgstr "Zurücksetzen"
-#: gitk:8785
+#: gitk:9118
msgid "Checking out"
msgstr "Umstellen"
-#: gitk:8838
+#: gitk:9171
msgid "Cannot delete the currently checked-out branch"
msgstr ""
"Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
"gelöscht werden."
-#: gitk:8844
+#: gitk:9177
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@@ -957,16 +1060,16 @@ msgstr ""
"Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
"Zweig »%s« trotzdem löschen?"
-#: gitk:8875
+#: gitk:9208
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Markierungen und Zweige: %s"
-#: gitk:8890
+#: gitk:9223
msgid "Filter"
msgstr "Filtern"
-#: gitk:9185
+#: gitk:9518
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@@ -974,182 +1077,202 @@ msgstr ""
"Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu "
"Vorgänger/Nachfolger werden unvollständig sein."
-#: gitk:10171
+#: gitk:10504
msgid "Tag"
msgstr "Markierung"
-#: gitk:10171
+#: gitk:10504
msgid "Id"
msgstr "Id"
-#: gitk:10219
+#: gitk:10554
msgid "Gitk font chooser"
msgstr "Gitk-Schriften wählen"
-#: gitk:10236
+#: gitk:10571
msgid "B"
msgstr "F"
-#: gitk:10239
+#: gitk:10574
msgid "I"
msgstr "K"
-#: gitk:10334
+#: gitk:10692
msgid "Gitk preferences"
msgstr "Gitk-Einstellungen"
-#: gitk:10336
+#: gitk:10694
msgid "Commit list display options"
msgstr "Anzeige der Versionsliste"
-#: gitk:10339
+#: gitk:10697
msgid "Maximum graph width (lines)"
msgstr "Maximale Graphenbreite (Zeilen)"
-#: gitk:10343
+#: gitk:10700
#, tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Maximale Graphenbreite (% des Fensters)"
-#: gitk:10347
+#: gitk:10703
msgid "Show local changes"
msgstr "Lokale Änderungen anzeigen"
-#: gitk:10350
+#: gitk:10706
msgid "Auto-select SHA1"
msgstr "SHA1-Hashwert automatisch auswählen"
-#: gitk:10354
+#: gitk:10709
+msgid "Hide remote refs"
+msgstr "Entfernte Zweige/Markierungen ausblenden"
+
+#: gitk:10713
msgid "Diff display options"
msgstr "Anzeige des Vergleichs"
-#: gitk:10356
+#: gitk:10715
msgid "Tab spacing"
msgstr "Tabulatorbreite"
-#: gitk:10359
+#: gitk:10718
msgid "Display nearby tags"
msgstr "Naheliegende Markierungen anzeigen"
-#: gitk:10362
+#: gitk:10721
msgid "Limit diffs to listed paths"
msgstr "Vergleich nur für angezeigte Pfade"
-#: gitk:10365
+#: gitk:10724
msgid "Support per-file encodings"
msgstr "Zeichenkodierung pro Datei ermitteln"
-#: gitk:10371 gitk:10436
+#: gitk:10730 gitk:10819
msgid "External diff tool"
msgstr "Externes Diff-Programm"
-#: gitk:10373
+#: gitk:10731
msgid "Choose..."
msgstr "Wählen ..."
-#: gitk:10378
+#: gitk:10736
+msgid "General options"
+msgstr "Allgemeine Optionen"
+
+#: gitk:10739
+msgid "Use themed widgets"
+msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen"
+
+#: gitk:10741
+msgid "(change requires restart)"
+msgstr "(Änderungen werden erst nach Neustart wirksam)"
+
+#: gitk:10743
+msgid "(currently unavailable)"
+msgstr "(Momentan nicht verfügbar)"
+
+#: gitk:10747
msgid "Colors: press to choose"
msgstr "Farben: Klicken zum Wählen"
-#: gitk:10381
+#: gitk:10750
+msgid "Interface"
+msgstr "Benutzeroberfläche"
+
+#: gitk:10751
+msgid "interface"
+msgstr "Benutzeroberfläche"
+
+#: gitk:10754
msgid "Background"
msgstr "Hintergrund"
-#: gitk:10382 gitk:10412
+#: gitk:10755 gitk:10785
msgid "background"
msgstr "Hintergrund"
-#: gitk:10385
+#: gitk:10758
msgid "Foreground"
msgstr "Vordergrund"
-#: gitk:10386
+#: gitk:10759
msgid "foreground"
msgstr "Vordergrund"
-#: gitk:10389
+#: gitk:10762
msgid "Diff: old lines"
msgstr "Vergleich: Alte Zeilen"
-#: gitk:10390
+#: gitk:10763
msgid "diff old lines"
msgstr "Vergleich - Alte Zeilen"
-#: gitk:10394
+#: gitk:10767
msgid "Diff: new lines"
msgstr "Vergleich: Neue Zeilen"
-#: gitk:10395
+#: gitk:10768
msgid "diff new lines"
msgstr "Vergleich - Neue Zeilen"
-#: gitk:10399
+#: gitk:10772
msgid "Diff: hunk header"
msgstr "Vergleich: Änderungstitel"
-#: gitk:10401
+#: gitk:10774
msgid "diff hunk header"
msgstr "Vergleich - Änderungstitel"
-#: gitk:10405
+#: gitk:10778
msgid "Marked line bg"
msgstr "Hintergrund für markierte Zeile"
-#: gitk:10407
+#: gitk:10780
msgid "marked line background"
msgstr "Hintergrund für markierte Zeile"
-#: gitk:10411
+#: gitk:10784
msgid "Select bg"
msgstr "Hintergrundfarbe auswählen"
-#: gitk:10415
+#: gitk:10788
msgid "Fonts: press to choose"
msgstr "Schriftart: Klicken zum Wählen"
-#: gitk:10417
+#: gitk:10790
msgid "Main font"
msgstr "Programmschriftart"
-#: gitk:10418
+#: gitk:10791
msgid "Diff display font"
msgstr "Schriftart für Vergleich"
-#: gitk:10419
+#: gitk:10792
msgid "User interface font"
msgstr "Beschriftungen"
-#: gitk:10446
+#: gitk:10829
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: Farbe wählen für %s"
-#: gitk:10893
-msgid ""
-"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
-" Gitk requires at least Tcl/Tk 8.4."
-msgstr ""
-"Gitk läuft nicht mit dieser Version von Tcl/Tk.\n"
-"Gitk benötigt mindestens Tcl/Tk 8.4."
-
-#: gitk:11020
+#: gitk:11433
msgid "Cannot find a git repository here."
msgstr "Kein Git-Projektarchiv gefunden."
-#: gitk:11024
+#: gitk:11437
#, tcl-format
msgid "Cannot find the git directory \"%s\"."
msgstr "Git-Verzeichnis »%s« wurde nicht gefunden."
-#: gitk:11071
+#: gitk:11484
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
-#: gitk:11083
+#: gitk:11496
msgid "Bad arguments to gitk:"
msgstr "Falsche Kommandozeilen-Parameter für gitk:"
-#: gitk:11167
+#: gitk:11587
msgid "Command line"
msgstr "Kommandozeile"
--
1.6.3.3
[-- Attachment #2: 0001-gitk-Update-German-translation.patch --]
[-- Type: text/x-patch, Size: 35926 bytes --]
From a8264b64382a350dca0b4efb04e3e99a6b2d25bb Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Wed, 27 Jan 2010 20:28:47 +0100
Subject: [PATCH] gitk: Update German translation.
Signed-off-by: Christian Stimming <stimming@tuhh.de>
---
po/de.po | 741 ++++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 432 insertions(+), 309 deletions(-)
diff --git a/po/de.po b/po/de.po
index e224595..c79aa9c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,33 +8,33 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-12 21:55+0200\n"
-"PO-Revision-Date: 2009-05-12 22:18+0200\n"
+"POT-Creation-Date: 2010-01-27 20:21+0100\n"
+"PO-Revision-Date: 2010-01-27 20:27+0100\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: gitk:113
+#: gitk:115
msgid "Couldn't get list of unmerged files:"
msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:"
-#: gitk:268
+#: gitk:274
msgid "Error parsing revisions:"
msgstr "Fehler beim Laden der Versionen:"
-#: gitk:323
+#: gitk:329
msgid "Error executing --argscmd command:"
msgstr "Fehler beim Ausführen des --argscmd-Kommandos:"
-#: gitk:336
+#: gitk:342
msgid "No files selected: --merge specified but no files are unmerged."
msgstr ""
"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren "
"keine nicht zusammengeführten Dateien."
-#: gitk:339
+#: gitk:345
msgid ""
"No files selected: --merge specified but no unmerged files are within file "
"limit."
@@ -42,719 +42,801 @@ msgstr ""
"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine "
"nicht zusammengeführten Dateien in der Dateiauswahl."
-#: gitk:361 gitk:508
+#: gitk:367 gitk:514
msgid "Error executing git log:"
msgstr "Fehler beim Ausführen von »git log«:"
-#: gitk:379 gitk:524
+#: gitk:385 gitk:530
msgid "Reading"
msgstr "Lesen"
-#: gitk:439 gitk:4061
+#: gitk:445 gitk:4261
msgid "Reading commits..."
msgstr "Versionen werden gelesen ..."
-#: gitk:442 gitk:1560 gitk:4064
+#: gitk:448 gitk:1578 gitk:4264
msgid "No commits selected"
msgstr "Keine Versionen ausgewählt"
-#: gitk:1436
+#: gitk:1454
msgid "Can't parse git log output:"
msgstr "Ausgabe von »git log« kann nicht erkannt werden:"
-#: gitk:1656
+#: gitk:1674
msgid "No commit information available"
msgstr "Keine Versionsinformation verfügbar"
-#: gitk:1791 gitk:1815 gitk:3854 gitk:8714 gitk:10250 gitk:10422
+#: gitk:1816
+msgid "mc"
+msgstr "mc"
+
+#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804
msgid "OK"
msgstr "Ok"
-#: gitk:1817 gitk:3856 gitk:8311 gitk:8385 gitk:8495 gitk:8544 gitk:8716
-#: gitk:10251 gitk:10423
+#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046
+#: gitk:10586 gitk:10805
msgid "Cancel"
msgstr "Abbrechen"
-#: gitk:1917
+#: gitk:1975
msgid "Update"
msgstr "Aktualisieren"
-#: gitk:1918
+#: gitk:1976
msgid "Reload"
msgstr "Neu laden"
-#: gitk:1919
+#: gitk:1977
msgid "Reread references"
msgstr "Zweige neu laden"
-#: gitk:1920
+#: gitk:1978
msgid "List references"
msgstr "Zweige/Markierungen auflisten"
-#: gitk:1922
+#: gitk:1980
msgid "Start git gui"
msgstr "»git gui« starten"
-#: gitk:1924
+#: gitk:1982
msgid "Quit"
msgstr "Beenden"
-#: gitk:1916
+#: gitk:1974
msgid "File"
msgstr "Datei"
-#: gitk:1928
+#: gitk:1986
msgid "Preferences"
msgstr "Einstellungen"
-#: gitk:1927
+#: gitk:1985
msgid "Edit"
msgstr "Bearbeiten"
-#: gitk:1932
+#: gitk:1990
msgid "New view..."
msgstr "Neue Ansicht ..."
-#: gitk:1933
+#: gitk:1991
msgid "Edit view..."
msgstr "Ansicht bearbeiten ..."
-#: gitk:1934
+#: gitk:1992
msgid "Delete view"
msgstr "Ansicht entfernen"
-#: gitk:1936
+#: gitk:1994
msgid "All files"
msgstr "Alle Dateien"
-#: gitk:1931 gitk:3666
+#: gitk:1989 gitk:3808
msgid "View"
msgstr "Ansicht"
-#: gitk:1941 gitk:1951 gitk:2650
+#: gitk:1999 gitk:2009 gitk:2780
msgid "About gitk"
msgstr "Über gitk"
-#: gitk:1942 gitk:1956
+#: gitk:2000 gitk:2014
msgid "Key bindings"
msgstr "Tastenkürzel"
-#: gitk:1940 gitk:1955
+#: gitk:1998 gitk:2013
msgid "Help"
msgstr "Hilfe"
-#: gitk:2016
-msgid "SHA1 ID: "
-msgstr "SHA1:"
+#: gitk:2091 gitk:8110
+msgid "SHA1 ID:"
+msgstr "SHA1 ID:"
-#: gitk:2047
+#: gitk:2122
msgid "Row"
msgstr "Zeile"
-#: gitk:2078
+#: gitk:2160
msgid "Find"
msgstr "Suche"
-#: gitk:2079
+#: gitk:2161
msgid "next"
msgstr "nächste"
-#: gitk:2080
+#: gitk:2162
msgid "prev"
msgstr "vorige"
-#: gitk:2081
+#: gitk:2163
msgid "commit"
msgstr "Version nach"
-#: gitk:2084 gitk:2086 gitk:4222 gitk:4245 gitk:4269 gitk:6210 gitk:6282
-#: gitk:6366
+#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482
+#: gitk:6566
msgid "containing:"
msgstr "Beschreibung:"
-#: gitk:2087 gitk:3158 gitk:3163 gitk:4297
+#: gitk:2169 gitk:3290 gitk:3295 gitk:4497
msgid "touching paths:"
msgstr "Dateien:"
-#: gitk:2088 gitk:4302
+#: gitk:2170 gitk:4502
msgid "adding/removing string:"
msgstr "Änderungen:"
-#: gitk:2097 gitk:2099
+#: gitk:2179 gitk:2181
msgid "Exact"
msgstr "Exakt"
-#: gitk:2099 gitk:4377 gitk:6178
+#: gitk:2181 gitk:4577 gitk:6378
msgid "IgnCase"
msgstr "Kein Groß/Klein"
-#: gitk:2099 gitk:4271 gitk:4375 gitk:6174
+#: gitk:2181 gitk:4471 gitk:4575 gitk:6374
msgid "Regexp"
msgstr "Regexp"
-#: gitk:2101 gitk:2102 gitk:4396 gitk:4426 gitk:4433 gitk:6302 gitk:6370
+#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570
msgid "All fields"
msgstr "Alle Felder"
-#: gitk:2102 gitk:4394 gitk:4426 gitk:6241
+#: gitk:2184 gitk:4594 gitk:4626 gitk:6441
msgid "Headline"
msgstr "Überschrift"
-#: gitk:2103 gitk:4394 gitk:6241 gitk:6370 gitk:6804
+#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003
msgid "Comments"
msgstr "Beschreibung"
-#: gitk:2103 gitk:4394 gitk:4398 gitk:4433 gitk:6241 gitk:6739 gitk:7991
-#: gitk:8006
+#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285
+#: gitk:8300
msgid "Author"
msgstr "Autor"
-#: gitk:2103 gitk:4394 gitk:6241 gitk:6741
+#: gitk:2185 gitk:4594 gitk:6441 gitk:6940
msgid "Committer"
msgstr "Eintragender"
-#: gitk:2132
+#: gitk:2216
msgid "Search"
msgstr "Suchen"
-#: gitk:2139
+#: gitk:2224
msgid "Diff"
msgstr "Vergleich"
-#: gitk:2141
+#: gitk:2226
msgid "Old version"
msgstr "Alte Version"
-#: gitk:2143
+#: gitk:2228
msgid "New version"
msgstr "Neue Version"
-#: gitk:2145
+#: gitk:2230
msgid "Lines of context"
msgstr "Kontextzeilen"
-#: gitk:2155
+#: gitk:2240
msgid "Ignore space change"
msgstr "Leerzeichenänderungen ignorieren"
-#: gitk:2213
+#: gitk:2299
msgid "Patch"
msgstr "Patch"
-#: gitk:2215
+#: gitk:2301
msgid "Tree"
msgstr "Baum"
-#: gitk:2359 gitk:2376
+#: gitk:2456 gitk:2473
msgid "Diff this -> selected"
msgstr "Vergleich: diese -> gewählte"
-#: gitk:2360 gitk:2377
+#: gitk:2457 gitk:2474
msgid "Diff selected -> this"
msgstr "Vergleich: gewählte -> diese"
-#: gitk:2361 gitk:2378
+#: gitk:2458 gitk:2475
msgid "Make patch"
msgstr "Patch erstellen"
-#: gitk:2362 gitk:8369
+#: gitk:2459 gitk:8692
msgid "Create tag"
msgstr "Markierung erstellen"
-#: gitk:2363 gitk:8475
+#: gitk:2460 gitk:8808
msgid "Write commit to file"
msgstr "Version in Datei schreiben"
-#: gitk:2364 gitk:8532
+#: gitk:2461 gitk:8865
msgid "Create new branch"
msgstr "Neuen Zweig erstellen"
-#: gitk:2365
+#: gitk:2462
msgid "Cherry-pick this commit"
msgstr "Diese Version pflücken"
-#: gitk:2366
+#: gitk:2463
msgid "Reset HEAD branch to here"
msgstr "HEAD-Zweig auf diese Version zurücksetzen"
-#: gitk:2367
+#: gitk:2464
msgid "Mark this commit"
msgstr "Lesezeichen setzen"
-#: gitk:2368
+#: gitk:2465
msgid "Return to mark"
msgstr "Zum Lesezeichen"
-#: gitk:2369
+#: gitk:2466
msgid "Find descendant of this and mark"
msgstr "Abkömmling von Lesezeichen und dieser Version finden"
-#: gitk:2370
+#: gitk:2467
msgid "Compare with marked commit"
msgstr "Mit Lesezeichen vergleichen"
-#: gitk:2384
+#: gitk:2481
msgid "Check out this branch"
msgstr "Auf diesen Zweig umstellen"
-#: gitk:2385
+#: gitk:2482
msgid "Remove this branch"
msgstr "Zweig löschen"
-#: gitk:2392
+#: gitk:2489
msgid "Highlight this too"
msgstr "Diesen auch hervorheben"
-#: gitk:2393
+#: gitk:2490
msgid "Highlight this only"
msgstr "Nur diesen hervorheben"
-#: gitk:2394
+#: gitk:2491
msgid "External diff"
msgstr "Externes Diff-Programm"
-#: gitk:2395
+#: gitk:2492
msgid "Blame parent commit"
msgstr "Annotieren der Elternversion"
-#: gitk:2402
+#: gitk:2499
msgid "Show origin of this line"
msgstr "Herkunft dieser Zeile anzeigen"
-#: gitk:2403
+#: gitk:2500
msgid "Run git gui blame on this line"
msgstr "Diese Zeile annotieren (»git gui blame«)"
-#: gitk:2652
+#: gitk:2782
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
-"Copyright © 2005-2008 Paul Mackerras\n"
+"Copyright ©9 2005-2009 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - eine Visualisierung der Git-Historie\n"
"\n"
-"Copyright © 2005-2008 Paul Mackerras\n"
+"Copyright © 2005-2009 Paul Mackerras\n"
"\n"
-"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
-"License"
+"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License"
-#: gitk:2660 gitk:2722 gitk:8897
+#: gitk:2790 gitk:2854 gitk:9230
msgid "Close"
msgstr "Schließen"
-#: gitk:2679
+#: gitk:2811
msgid "Gitk key bindings"
msgstr "Gitk-Tastaturbelegung"
-#: gitk:2682
+#: gitk:2814
msgid "Gitk key bindings:"
msgstr "Gitk-Tastaturbelegung:"
-#: gitk:2684
+#: gitk:2816
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tBeenden"
-#: gitk:2685
+#: gitk:2817
msgid "<Home>\t\tMove to first commit"
msgstr "<Pos1>\t\tZur neuesten Version springen"
-#: gitk:2686
+#: gitk:2818
msgid "<End>\t\tMove to last commit"
msgstr "<Ende>\t\tZur ältesten Version springen"
-#: gitk:2687
+#: gitk:2819
msgid "<Up>, p, i\tMove up one commit"
msgstr "<Hoch>, p, i\tNächste neuere Version"
-#: gitk:2688
+#: gitk:2820
msgid "<Down>, n, k\tMove down one commit"
msgstr "<Runter>, n, k\tNächste ältere Version"
-#: gitk:2689
+#: gitk:2821
msgid "<Left>, z, j\tGo back in history list"
msgstr "<Links>, z, j\tEine Version zurückgehen"
-#: gitk:2690
+#: gitk:2822
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Rechts>, x, l\tEine Version weitergehen"
-#: gitk:2691
+#: gitk:2823
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<BildHoch>\tEine Seite nach oben blättern"
-#: gitk:2692
+#: gitk:2824
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<BildRunter>\tEine Seite nach unten blättern"
-#: gitk:2693
+#: gitk:2825
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
-#: gitk:2694
+#: gitk:2826
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
-#: gitk:2695
+#: gitk:2827
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
-#: gitk:2696
+#: gitk:2828
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
-#: gitk:2697
+#: gitk:2829
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern"
-#: gitk:2698
+#: gitk:2830
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
-#: gitk:2699
+#: gitk:2831
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
-#: gitk:2700
+#: gitk:2832
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
-#: gitk:2701
+#: gitk:2833
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
-#: gitk:2702
+#: gitk:2834
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
-#: gitk:2703
+#: gitk:2835
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
-#: gitk:2704
+#: gitk:2836
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern"
-#: gitk:2705
+#: gitk:2837
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern"
-#: gitk:2706
+#: gitk:2838
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tSuchen"
-#: gitk:2707
+#: gitk:2839
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tWeitersuchen"
-#: gitk:2708
+#: gitk:2840
msgid "<Return>\tMove to next find hit"
msgstr "<Eingabetaste>\tWeitersuchen"
-#: gitk:2709
+#: gitk:2841
msgid "/\t\tFocus the search box"
msgstr "/\t\tTastaturfokus ins Suchfeld"
-#: gitk:2710
+#: gitk:2842
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tRückwärts weitersuchen"
-#: gitk:2711
+#: gitk:2843
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tVergleich zur nächsten Datei blättern"
-#: gitk:2712
+#: gitk:2844
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
-#: gitk:2713
+#: gitk:2845
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich"
-#: gitk:2714
+#: gitk:2846
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern"
-#: gitk:2715
+#: gitk:2847
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-Plus>\tSchrift vergrößern"
-#: gitk:2716
+#: gitk:2848
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-Nummernblock-Minus> Schrift verkleinern"
-#: gitk:2717
+#: gitk:2849
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-Minus>\tSchrift verkleinern"
-#: gitk:2718
+#: gitk:2850
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tAktualisieren"
-#: gitk:3173
-#, tcl-format
-msgid "Error getting \"%s\" from %s:"
-msgstr "Fehler beim Holen von »%s« von »%s«:"
-
-#: gitk:3230 gitk:3239
+#: gitk:3305 gitk:3314
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:"
-#: gitk:3251
+#: gitk:3327
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Fehler beim Holen von »%s« von »%s«:"
+
+#: gitk:3390
msgid "command failed:"
msgstr "Kommando fehlgeschlagen:"
-#: gitk:3397
+#: gitk:3539
msgid "No such commit"
msgstr "Version nicht gefunden"
-#: gitk:3411
+#: gitk:3553
msgid "git gui blame: command failed:"
msgstr "git gui blame: Kommando fehlgeschlagen:"
-#: gitk:3442
+#: gitk:3584
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s"
-#: gitk:3450
+#: gitk:3592
#, tcl-format
msgid "Error reading index: %s"
msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s"
-#: gitk:3475
+#: gitk:3617
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "»git blame« konnte nicht gestartet werden: %s"
-#: gitk:3478 gitk:6209
+#: gitk:3620 gitk:6409
msgid "Searching"
msgstr "Suchen"
-#: gitk:3510
+#: gitk:3652
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Fehler beim Ausführen von »git blame«: %s"
-#: gitk:3538
+#: gitk:3680
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr ""
"Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird"
-#: gitk:3552
+#: gitk:3694
msgid "External diff viewer failed:"
msgstr "Externes Diff-Programm fehlgeschlagen:"
-#: gitk:3670
+#: gitk:3812
msgid "Gitk view definition"
msgstr "Gitk-Ansichten"
-#: gitk:3674
+#: gitk:3816
msgid "Remember this view"
msgstr "Diese Ansicht speichern"
-#: gitk:3675
-msgid "Commits to include (arguments to git log):"
-msgstr "Versionen anzeigen (Argumente von git log):"
+#: gitk:3817
+msgid "References (space separated list):"
+msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):"
-#: gitk:3676
-msgid "Use all refs"
-msgstr "Alle Zweige verwenden"
+#: gitk:3818
+msgid "Branches & tags:"
+msgstr "Zweige/Markierungen:"
-#: gitk:3677
-msgid "Strictly sort by date"
-msgstr "Streng nach Datum sortieren"
+#: gitk:3819
+msgid "All refs"
+msgstr "Alle Markierungen und Zweige"
-#: gitk:3678
-msgid "Mark branch sides"
-msgstr "Zweig-Seiten markieren"
+#: gitk:3820
+msgid "All (local) branches"
+msgstr "Alle (lokalen) Zweige"
-#: gitk:3679
-msgid "Since date:"
-msgstr "Von Datum:"
+#: gitk:3821
+msgid "All tags"
+msgstr "Alle Markierungen"
-#: gitk:3680
-msgid "Until date:"
-msgstr "Bis Datum:"
+#: gitk:3822
+msgid "All remote-tracking branches"
+msgstr "Alle Übernahmezweige"
+
+#: gitk:3823
+msgid "Commit Info (regular expressions):"
+msgstr "Versionsinformationen (reguläre Ausdrücke):"
+
+#: gitk:3824
+msgid "Author:"
+msgstr "Autor:"
+
+#: gitk:3825
+msgid "Committer:"
+msgstr "Eintragender:"
+
+#: gitk:3826
+msgid "Commit Message:"
+msgstr "Versionsbeschreibung:"
-#: gitk:3681
-msgid "Max count:"
-msgstr "Max. Anzahl:"
+#: gitk:3827
+msgid "Matches all Commit Info criteria"
+msgstr "Alle Versionsinformationen-Kriterien erfüllen"
-#: gitk:3682
-msgid "Skip:"
+#: gitk:3828
+msgid "Changes to Files:"
+msgstr "Dateien:"
+
+#: gitk:3829
+msgid "Fixed String"
+msgstr "Zeichenkette"
+
+#: gitk:3830
+msgid "Regular Expression"
+msgstr "Regulärer Ausdruck"
+
+#: gitk:3831
+msgid "Search string:"
+msgstr "Suchausdruck:"
+
+#: gitk:3832
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)"
+
+#: gitk:3833
+msgid "Since:"
+msgstr "Von:"
+
+#: gitk:3834
+msgid "Until:"
+msgstr "Bis:"
+
+#: gitk:3835
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):"
+
+#: gitk:3836
+msgid "Number to show:"
+msgstr "Anzeigen:"
+
+#: gitk:3837
+msgid "Number to skip:"
msgstr "Überspringen:"
-#: gitk:3683
+#: gitk:3838
+msgid "Miscellaneous options:"
+msgstr "Sonstiges:"
+
+#: gitk:3839
+msgid "Strictly sort by date"
+msgstr "Streng nach Datum sortieren"
+
+#: gitk:3840
+msgid "Mark branch sides"
+msgstr "Zweig-Seiten markieren"
+
+#: gitk:3841
msgid "Limit to first parent"
msgstr "Auf erste Elternversion beschränken"
-#: gitk:3684
+#: gitk:3842
+msgid "Simple history"
+msgstr "Einfache Historie"
+
+#: gitk:3843
+msgid "Additional arguments to git log:"
+msgstr "Zusätzliche Argumente für »git log«:"
+
+#: gitk:3844
+msgid "Enter files and directories to include, one per line:"
+msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
+
+#: gitk:3845
msgid "Command to generate more commits to include:"
msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
-#: gitk:3780
+#: gitk:3967
msgid "Gitk: edit view"
msgstr "Gitk: Ansicht bearbeiten"
-#: gitk:3793
-msgid "Name"
-msgstr "Name"
+#: gitk:3975
+msgid "-- criteria for selecting revisions"
+msgstr "-- Auswahl der angezeigten Versionen"
-#: gitk:3841
-msgid "Enter files and directories to include, one per line:"
-msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
+#: gitk:3980
+msgid "View Name"
+msgstr "Ansichtsname"
-#: gitk:3855
+#: gitk:4055
msgid "Apply (F5)"
msgstr "Anwenden (F5)"
-#: gitk:3893
+#: gitk:4093
msgid "Error in commit selection arguments:"
msgstr "Fehler in den ausgewählten Versionen:"
-#: gitk:3946 gitk:3998 gitk:4446 gitk:4460 gitk:5721 gitk:11114 gitk:11115
+#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535
msgid "None"
msgstr "Keine"
-#: gitk:4394 gitk:6241 gitk:7993 gitk:8008
+#: gitk:4594 gitk:6441 gitk:8287 gitk:8302
msgid "Date"
msgstr "Datum"
-#: gitk:4394 gitk:6241
+#: gitk:4594 gitk:6441
msgid "CDate"
msgstr "Eintragedatum"
-#: gitk:4543 gitk:4548
+#: gitk:4743 gitk:4748
msgid "Descendant"
msgstr "Abkömmling"
-#: gitk:4544
+#: gitk:4744
msgid "Not descendant"
msgstr "Kein Abkömmling"
-#: gitk:4551 gitk:4556
+#: gitk:4751 gitk:4756
msgid "Ancestor"
msgstr "Vorgänger"
-#: gitk:4552
+#: gitk:4752
msgid "Not ancestor"
msgstr "Kein Vorgänger"
-#: gitk:4842
+#: gitk:5042
msgid "Local changes checked in to index but not committed"
msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
-#: gitk:4878
+#: gitk:5078
msgid "Local uncommitted changes, not checked in to index"
msgstr "Lokale Änderungen, nicht bereitgestellt"
-#: gitk:6559
+#: gitk:6759
msgid "many"
msgstr "viele"
-#: gitk:6743
+#: gitk:6942
msgid "Tags:"
msgstr "Markierungen:"
-#: gitk:6760 gitk:6766 gitk:7986
+#: gitk:6959 gitk:6965 gitk:8280
msgid "Parent"
msgstr "Eltern"
-#: gitk:6771
+#: gitk:6970
msgid "Child"
msgstr "Kind"
-#: gitk:6780
+#: gitk:6979
msgid "Branch"
msgstr "Zweig"
-#: gitk:6783
+#: gitk:6982
msgid "Follows"
msgstr "Folgt auf"
-#: gitk:6786
+#: gitk:6985
msgid "Precedes"
msgstr "Vorgänger von"
-#: gitk:7279
+#: gitk:7522
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Fehler beim Laden des Vergleichs: %s"
-#: gitk:7819
+#: gitk:8108
msgid "Goto:"
msgstr "Gehe zu:"
-#: gitk:7821
-msgid "SHA1 ID:"
-msgstr "SHA1 ID:"
-
-#: gitk:7840
+#: gitk:8129
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
-#: gitk:7852
+#: gitk:8136
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "Version »%s« ist unbekannt"
+
+#: gitk:8146
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "SHA1-Hashwert »%s« ist unbekannt"
-#: gitk:7854
+#: gitk:8148
#, tcl-format
-msgid "Tag/Head %s is not known"
-msgstr "Markierung/Zweig »%s« ist unbekannt"
+msgid "Revision %s is not in the current view"
+msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt"
-#: gitk:7996
+#: gitk:8290
msgid "Children"
msgstr "Kinder"
-#: gitk:8053
+#: gitk:8348
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Zweig »%s« hierher zurücksetzen"
-#: gitk:8055
+#: gitk:8350
msgid "Detached head: can't reset"
msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
-#: gitk:8164 gitk:8170
+#: gitk:8459 gitk:8465
msgid "Skipping merge commit "
msgstr "Überspringe Zusammenführungs-Version "
-#: gitk:8179 gitk:8184
+#: gitk:8474 gitk:8479
msgid "Error getting patch ID for "
msgstr "Fehler beim Holen der Patch-ID für "
-#: gitk:8180 gitk:8185
+#: gitk:8475 gitk:8480
msgid " - stopping\n"
msgstr " - Abbruch.\n"
-#: gitk:8190 gitk:8193 gitk:8201 gitk:8211 gitk:8220
+#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519
msgid "Commit "
msgstr "Version "
-#: gitk:8194
+#: gitk:8489
msgid ""
" is the same patch as\n"
" "
@@ -762,7 +844,7 @@ msgstr ""
" ist das gleiche Patch wie\n"
" "
-#: gitk:8202
+#: gitk:8497
msgid ""
" differs from\n"
" "
@@ -770,117 +852,138 @@ msgstr ""
" ist unterschiedlich von\n"
" "
-#: gitk:8204
-msgid "- stopping\n"
-msgstr "- Abbruch.\n"
+#: gitk:8499
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+"Vergleich der Versionen:\n"
+"\n"
-#: gitk:8212 gitk:8221
+#: gitk:8511 gitk:8520
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " hat %s Kinder. Abbruch\n"
-#: gitk:8252
+#: gitk:8539
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Fehler beim Schreiben der Version in Datei: %s"
+
+#: gitk:8545
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Fehler beim Vergleichen der Versionen: %s"
+
+#: gitk:8575
msgid "Top"
msgstr "Oben"
-#: gitk:8253
+#: gitk:8576
msgid "From"
msgstr "Von"
-#: gitk:8258
+#: gitk:8581
msgid "To"
msgstr "bis"
-#: gitk:8282
+#: gitk:8605
msgid "Generate patch"
msgstr "Patch erstellen"
-#: gitk:8284
+#: gitk:8607
msgid "From:"
msgstr "Von:"
-#: gitk:8293
+#: gitk:8616
msgid "To:"
msgstr "bis:"
-#: gitk:8302
+#: gitk:8625
msgid "Reverse"
msgstr "Umgekehrt"
-#: gitk:8304 gitk:8489
+#: gitk:8627 gitk:8822
msgid "Output file:"
msgstr "Ausgabedatei:"
-#: gitk:8310
+#: gitk:8633
msgid "Generate"
msgstr "Erzeugen"
-#: gitk:8348
+#: gitk:8671
msgid "Error creating patch:"
msgstr "Fehler beim Erzeugen des Patches:"
-#: gitk:8371 gitk:8477 gitk:8534
+#: gitk:8694 gitk:8810 gitk:8867
msgid "ID:"
msgstr "ID:"
-#: gitk:8380
+#: gitk:8703
msgid "Tag name:"
msgstr "Markierungsname:"
-#: gitk:8384 gitk:8543
+#: gitk:8706
+msgid "Tag message is optional"
+msgstr "Eine Markierungsbeschreibung ist optional"
+
+#: gitk:8708
+msgid "Tag message:"
+msgstr "Markierungsbeschreibung:"
+
+#: gitk:8712 gitk:8876
msgid "Create"
msgstr "Erstellen"
-#: gitk:8401
+#: gitk:8730
msgid "No tag name specified"
msgstr "Kein Markierungsname angegeben"
-#: gitk:8405
+#: gitk:8734
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Markierung »%s« existiert bereits."
-#: gitk:8411
+#: gitk:8744
msgid "Error creating tag:"
msgstr "Fehler beim Erstellen der Markierung:"
-#: gitk:8486
+#: gitk:8819
msgid "Command:"
msgstr "Kommando:"
-#: gitk:8494
+#: gitk:8827
msgid "Write"
msgstr "Schreiben"
-#: gitk:8512
+#: gitk:8845
msgid "Error writing commit:"
msgstr "Fehler beim Schreiben der Version:"
-#: gitk:8539
+#: gitk:8872
msgid "Name:"
msgstr "Name:"
-#: gitk:8562
+#: gitk:8895
msgid "Please specify a name for the new branch"
msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
-#: gitk:8567
+#: gitk:8900
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?"
-#: gitk:8633
+#: gitk:8966
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
-"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
-"eintragen?"
+"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut eintragen?"
-#: gitk:8638
+#: gitk:8971
msgid "Cherry-picking"
msgstr "Version pflücken"
-#: gitk:8647
+#: gitk:8980
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
@@ -890,7 +993,7 @@ msgstr ""
"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
"zwischenspeichern (»git stash«) und dann erneut versuchen."
-#: gitk:8653
+#: gitk:8986
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
@@ -899,34 +1002,34 @@ msgstr ""
"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
"werden, um diesen Konflikt aufzulösen?"
-#: gitk:8669
+#: gitk:9002
msgid "No changes committed"
msgstr "Keine Änderungen eingetragen"
-#: gitk:8695
+#: gitk:9028
msgid "Confirm reset"
msgstr "Zurücksetzen bestätigen"
-#: gitk:8697
+#: gitk:9030
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Zweig »%s« auf »%s« zurücksetzen?"
-#: gitk:8701
+#: gitk:9032
msgid "Reset type:"
msgstr "Art des Zurücksetzens:"
-#: gitk:8705
+#: gitk:9035
msgid "Soft: Leave working tree and index untouched"
msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
-#: gitk:8708
+#: gitk:9038
msgid "Mixed: Leave working tree untouched, reset index"
msgstr ""
"Gemischt: Arbeitskopie unverändert,\n"
"Bereitstellung zurückgesetzt"
-#: gitk:8711
+#: gitk:9041
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
@@ -934,21 +1037,21 @@ msgstr ""
"Hart: Arbeitskopie und Bereitstellung\n"
"(Alle lokalen Änderungen werden gelöscht)"
-#: gitk:8728
+#: gitk:9058
msgid "Resetting"
msgstr "Zurücksetzen"
-#: gitk:8785
+#: gitk:9118
msgid "Checking out"
msgstr "Umstellen"
-#: gitk:8838
+#: gitk:9171
msgid "Cannot delete the currently checked-out branch"
msgstr ""
"Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
"gelöscht werden."
-#: gitk:8844
+#: gitk:9177
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@@ -957,16 +1060,16 @@ msgstr ""
"Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
"Zweig »%s« trotzdem löschen?"
-#: gitk:8875
+#: gitk:9208
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Markierungen und Zweige: %s"
-#: gitk:8890
+#: gitk:9223
msgid "Filter"
msgstr "Filtern"
-#: gitk:9185
+#: gitk:9518
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@@ -974,182 +1077,202 @@ msgstr ""
"Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu "
"Vorgänger/Nachfolger werden unvollständig sein."
-#: gitk:10171
+#: gitk:10504
msgid "Tag"
msgstr "Markierung"
-#: gitk:10171
+#: gitk:10504
msgid "Id"
msgstr "Id"
-#: gitk:10219
+#: gitk:10554
msgid "Gitk font chooser"
msgstr "Gitk-Schriften wählen"
-#: gitk:10236
+#: gitk:10571
msgid "B"
msgstr "F"
-#: gitk:10239
+#: gitk:10574
msgid "I"
msgstr "K"
-#: gitk:10334
+#: gitk:10692
msgid "Gitk preferences"
msgstr "Gitk-Einstellungen"
-#: gitk:10336
+#: gitk:10694
msgid "Commit list display options"
msgstr "Anzeige der Versionsliste"
-#: gitk:10339
+#: gitk:10697
msgid "Maximum graph width (lines)"
msgstr "Maximale Graphenbreite (Zeilen)"
-#: gitk:10343
+#: gitk:10700
#, tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Maximale Graphenbreite (% des Fensters)"
-#: gitk:10347
+#: gitk:10703
msgid "Show local changes"
msgstr "Lokale Änderungen anzeigen"
-#: gitk:10350
+#: gitk:10706
msgid "Auto-select SHA1"
msgstr "SHA1-Hashwert automatisch auswählen"
-#: gitk:10354
+#: gitk:10709
+msgid "Hide remote refs"
+msgstr "Entfernte Zweige/Markierungen ausblenden"
+
+#: gitk:10713
msgid "Diff display options"
msgstr "Anzeige des Vergleichs"
-#: gitk:10356
+#: gitk:10715
msgid "Tab spacing"
msgstr "Tabulatorbreite"
-#: gitk:10359
+#: gitk:10718
msgid "Display nearby tags"
msgstr "Naheliegende Markierungen anzeigen"
-#: gitk:10362
+#: gitk:10721
msgid "Limit diffs to listed paths"
msgstr "Vergleich nur für angezeigte Pfade"
-#: gitk:10365
+#: gitk:10724
msgid "Support per-file encodings"
msgstr "Zeichenkodierung pro Datei ermitteln"
-#: gitk:10371 gitk:10436
+#: gitk:10730 gitk:10819
msgid "External diff tool"
msgstr "Externes Diff-Programm"
-#: gitk:10373
+#: gitk:10731
msgid "Choose..."
msgstr "Wählen ..."
-#: gitk:10378
+#: gitk:10736
+msgid "General options"
+msgstr "Allgemeine Optionen"
+
+#: gitk:10739
+msgid "Use themed widgets"
+msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen"
+
+#: gitk:10741
+msgid "(change requires restart)"
+msgstr "(Änderungen werden erst nach Neustart wirksam)"
+
+#: gitk:10743
+msgid "(currently unavailable)"
+msgstr "(Momentan nicht verfügbar)"
+
+#: gitk:10747
msgid "Colors: press to choose"
msgstr "Farben: Klicken zum Wählen"
-#: gitk:10381
+#: gitk:10750
+msgid "Interface"
+msgstr "Benutzeroberfläche"
+
+#: gitk:10751
+msgid "interface"
+msgstr "Benutzeroberfläche"
+
+#: gitk:10754
msgid "Background"
msgstr "Hintergrund"
-#: gitk:10382 gitk:10412
+#: gitk:10755 gitk:10785
msgid "background"
msgstr "Hintergrund"
-#: gitk:10385
+#: gitk:10758
msgid "Foreground"
msgstr "Vordergrund"
-#: gitk:10386
+#: gitk:10759
msgid "foreground"
msgstr "Vordergrund"
-#: gitk:10389
+#: gitk:10762
msgid "Diff: old lines"
msgstr "Vergleich: Alte Zeilen"
-#: gitk:10390
+#: gitk:10763
msgid "diff old lines"
msgstr "Vergleich - Alte Zeilen"
-#: gitk:10394
+#: gitk:10767
msgid "Diff: new lines"
msgstr "Vergleich: Neue Zeilen"
-#: gitk:10395
+#: gitk:10768
msgid "diff new lines"
msgstr "Vergleich - Neue Zeilen"
-#: gitk:10399
+#: gitk:10772
msgid "Diff: hunk header"
msgstr "Vergleich: Änderungstitel"
-#: gitk:10401
+#: gitk:10774
msgid "diff hunk header"
msgstr "Vergleich - Änderungstitel"
-#: gitk:10405
+#: gitk:10778
msgid "Marked line bg"
msgstr "Hintergrund für markierte Zeile"
-#: gitk:10407
+#: gitk:10780
msgid "marked line background"
msgstr "Hintergrund für markierte Zeile"
-#: gitk:10411
+#: gitk:10784
msgid "Select bg"
msgstr "Hintergrundfarbe auswählen"
-#: gitk:10415
+#: gitk:10788
msgid "Fonts: press to choose"
msgstr "Schriftart: Klicken zum Wählen"
-#: gitk:10417
+#: gitk:10790
msgid "Main font"
msgstr "Programmschriftart"
-#: gitk:10418
+#: gitk:10791
msgid "Diff display font"
msgstr "Schriftart für Vergleich"
-#: gitk:10419
+#: gitk:10792
msgid "User interface font"
msgstr "Beschriftungen"
-#: gitk:10446
+#: gitk:10829
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: Farbe wählen für %s"
-#: gitk:10893
-msgid ""
-"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
-" Gitk requires at least Tcl/Tk 8.4."
-msgstr ""
-"Gitk läuft nicht mit dieser Version von Tcl/Tk.\n"
-"Gitk benötigt mindestens Tcl/Tk 8.4."
-
-#: gitk:11020
+#: gitk:11433
msgid "Cannot find a git repository here."
msgstr "Kein Git-Projektarchiv gefunden."
-#: gitk:11024
+#: gitk:11437
#, tcl-format
msgid "Cannot find the git directory \"%s\"."
msgstr "Git-Verzeichnis »%s« wurde nicht gefunden."
-#: gitk:11071
+#: gitk:11484
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
-#: gitk:11083
+#: gitk:11496
msgid "Bad arguments to gitk:"
msgstr "Falsche Kommandozeilen-Parameter für gitk:"
-#: gitk:11167
+#: gitk:11587
msgid "Command line"
msgstr "Kommandozeile"
--
1.6.3.3
^ permalink raw reply related
* Re: git notes: notes
From: Christian Couder @ 2010-01-27 20:01 UTC (permalink / raw)
To: john.koleszar
Cc: Johan Herland, Joey Hess, git@vger.kernel.org,
Johannes.Schindelin@gmx.de
In-Reply-To: <1264442884.14641.33.camel@cp-jk-linux.corp.on2.com>
On lundi 25 janvier 2010, John Koleszar wrote:
> On Wed, 2010-01-20 at 21:05 -0500, Johan Herland wrote:
> > On Wednesday 20 January 2010, Joey Hess wrote:
>
> > In any case, I would not use "git notes" to maintain the bisect hints.
> > Rather, I'd add subcommands to "git bisect" that would take care of
> > maintaining the notes tree @ "refs/notes/bisect". Much more
> > user-friendly than telling the user to write their own bisect-notes by
> > hand.
>
> I haven't read up on notes more than enough to know its in the pipe, but
> I had a similar idea for using them to store bisect hints. I've been
> doing a lot of bisecting lately into a range that had a couple dormant
> bugs where I'm trying to bisect bug B but bug A prevents me from making
> a determination. Rather than skip what I know is an interesting commit,
> I cherry-pick the bugfix commit(s) A' and test that, then reset and
> continue bisecting.
>
> Teaching bisect to consistently skip a commit, or to automatically
> squash in A' if we have A and not A', would be a desirable feature. I
> will have to read up some more on notes.
Perhaps you can read about "git replace" in my article:
http://www.kernel.org/pub/software/scm/git/docs/git-bisect-lk2009.html
and/or my related presentation:
http://www.linux-kongress.org/2009/slides/fighting_regressions_with_git_bisect_christian_couder.pdf
I think in the long run it's much better to use git replace rather than
notes, especially as replace refs for bisecting could be in their own
refs/replace/bisect namespace. I may take the time to implement that soon
if you or other people are interested.
Regards,
Christian.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox