* [PATCH 1/2] instaweb: allow for use of auto-generated scripts
From: mike @ 2007-10-06 17:29 UTC (permalink / raw)
To: normalperson, gitster; +Cc: git, Mike Dalessio
In-Reply-To: <7vodfztviv.fsf@gitster.siamese.dyndns.org>
this patch allows scripts that reside in $fqgitdir/gitweb to be used
for firing up an instaweb server. this lays the groundwork for
extending instaweb support to non-standard web servers, which may
require a script for proper invocation.
Signed-off-by: Mike Dalessio <mike@csa.net>
---
git-instaweb.sh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/git-instaweb.sh b/git-instaweb.sh
index b79c6b6..42d9c34 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -37,7 +37,9 @@ start_httpd () {
else
# many httpds are installed in /usr/sbin or /usr/local/sbin
# these days and those are not in most users $PATHs
- for i in /usr/local/sbin /usr/sbin
+ # in addition, we may have generated a server script
+ # in $fqgitdir/gitweb.
+ for i in /usr/local/sbin /usr/sbin "$fqgitdir/gitweb"
do
if test -x "$i/$httpd_only"
then
--
1.5.2.5
^ permalink raw reply related
* A message from the human patch-queue
From: Lars Hjemli @ 2007-10-06 17:18 UTC (permalink / raw)
To: git@vger.kernel.org; +Cc: Junio C Hamano
Hi
I've been collecting patches from the list for the last couple of days
and published them as topic-branches on http://hjemli.net/git/git (see
http://article.gmane.org/gmane.comp.version-control.git/60023 if you
wonder _why_ I've done this ;-)
All topic-branches are prefixed with 'q/' and the authors initials,
they're all based on current master
(58ba4f6ac828606fc206cfd5cec412a6974c91a1), and I've run 'make test'
successfully on all topics with code changes. There is also a list of
topics with links to the relevant postings at
http://hjemli.net/git/git/tree/branches?h=q/meta
Please let me know if I've your patches are missing, and I'll swiftly add them.
--
larsh
^ permalink raw reply
* Re: Question about "git commit -a"
From: Linus Torvalds @ 2007-10-06 16:13 UTC (permalink / raw)
To: Andy Parkins
Cc: git, Marko Macek, Kristian H?gsberg, Andreas Ericsson,
Paolo Ciarrocchi, Johannes Schindelin, Nguyen Thai Ngoc Duy,
Wincent Colaiuta
In-Reply-To: <200710060843.38567.andyparkins@gmail.com>
On Sat, 6 Oct 2007, Andy Parkins wrote:
>
> Who cares? Commits that build isn't the only reason for small commits.
More importantly, while it's true that you should always test all your
changes, quite often they really *are* obviously separate.
I've mentioned this as an example lots of times, but I often tend to have
multiple independent things in my tree at the same time. One of the
"clearly independent" ones is the fact that I historically tended to
update my Makefile for the next version number several days before I do
the actual release, just to remind me (I used to forget to bump the
version number, so..).
So I often have a dirty main makefile, but that doesn't mean that I'm
going to commit it until I'm ready. I want to (no - *need* to) be able to
pull and apply patches from other people despite the fact that I have some
dirty state.
[ It's not just the makefile: almost all of what I do these days is pull
and apply patches, but I also send out suggestions to other developers
by email, and I often end up keeping my suggestion around in my tree as
dirty state. I could use a topic branch, but the thing is, I don't
actually want to save it - but not only do I actually like seeing the
"couldn't merge due to dirty state" because that tells me I got the fix
back, but I like just eatign my dogfood and compiling the kernel with
the suggestions I sent out ]
So it's quite ok to have multiple independent changes going on it the
tree, and there's absolutely *zero* reason to think you should commit them
together (quite the reverse). Maybe this isn't all that common for a
*small* thing, but I pretty much guarantee that large projects always end
up doing somethng like this.
And making the *default* workflow do something bad - namely commit
everything blindly - is not a good idea. I'd rather have the normal
workflow basically try to encourage many small commits, because while it's
true that they may not have been tested individually, 99% of the time any
linkages are pretty obvious.
(Side note: the *most* common failure to check stuff in completely tends
to be one that other SCM's also have, for all the same reasons: forgetting
to *add* a new file. I suspect the git model of "add all new changes"
whether new files or old, actually _helps_ avoid that error, but quite
frankly, I don't think we'll ever get away from it. It's just too easy a
mistake to do).
Linus
^ permalink raw reply
* git-push [--all] and tags
From: martin f krafft @ 2007-10-06 16:05 UTC (permalink / raw)
To: git discussion list
[-- Attachment #1: Type: text/plain, Size: 1037 bytes --]
Hello people,
`git-push --all --tags` does not work because git-push ends up
calling git-send-pack --all refs/tags/*, which the latter does not
deal with.
Looking at the code, it seems that previously, --all would push
everything, not just refs/heads/*. What's the reason that this was
changed? Why aren't tags considered part of --all?
If I wanted to fix this, so that --all pushes heads and --all --tags
pushes heads and tags, I could do so in two ways:
1. instead of --all, pass refs/heads/* to git-send-pack
2. add --tags to git-send-pack
which of these two would you prefer and why?
Thanks,
--
martin; (greetings from the heart of the sun.)
\____ echo mailto: !#^."<*>"|tr "<*> mailto:" net@madduck
"imagine if every thursday your shoes exploded if you
tied them the usual way. this happens to us all the time
with computers, and nobody thinks of complaining."
-- jeff raskin
spamtraps: madduck.bogus@madduck.net
[-- Attachment #2: Digital signature (see http://martin-krafft.net/gpg/) --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [PATCH] makefile: Add a cscope target
From: Kristof Provost @ 2007-10-06 14:24 UTC (permalink / raw)
To: Frank Lichtenheld; +Cc: git, Alex Riesen
In-Reply-To: <20071006010437.GS31659@planck.djpig.de>
[-- Attachment #1: Type: text/plain, Size: 1934 bytes --]
On 2007-10-06 03:04:37 (+0200), Frank Lichtenheld <frank@lichtenheld.de> wrote:
> On Sat, Oct 06, 2007 at 12:33:36AM +0200, Kristof Provost wrote:
> > +cscope:
> > + $(RM) cscope*
> > + $(FIND) . -name '*.hcS]' -print | xargs cscope -b
>
>
> missing [
Well, that will teach me to post patches after midnight.
Here's a fixed version. I've also added cscope* to the .gitignore file.
For some reason tags and TAGS weren't in there either so I've added them
too.
Signed-off-by: Kristof Provost <Kristof@provost-engineering.be>
---
diff --git a/.gitignore b/.gitignore
index e0b91be..62afef2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -171,3 +171,6 @@ config.status
config.mak.autogen
config.mak.append
configure
+tags
+TAGS
+cscope*
diff --git a/Makefile b/Makefile
index 8db4dbe..e2790c8 100644
--- a/Makefile
+++ b/Makefile
@@ -947,6 +947,10 @@ tags:
$(RM) tags
$(FIND) . -name '*.[hcS]' -print | xargs ctags -a
+cscope:
+ $(RM) cscope*
+ $(FIND) . -name '*.[hcS]' -print | xargs cscope -b
+
### Detect prefix changes
TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
$(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
@@ -1093,7 +1097,7 @@ clean:
$(LIB_FILE) $(XDIFF_LIB)
$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS)
- $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
+ $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
$(RM) -r autom4te.cache
$(RM) configure config.log config.mak.autogen config.mak.append config.status config.cache
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
@@ -1111,7 +1115,7 @@ endif
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS
.PHONY: all install clean strip
-.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags .FORCE-GIT-CFLAGS
+.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS
### Check documentation
#
--
Kristof
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply related
* [PATCH] git-gui: accept versions containing text annotations, like 1.5.3.mingw.1
From: Steffen Prohaska @ 2007-10-06 13:27 UTC (permalink / raw)
To: git, Shawn O. Pearce; +Cc: Steffen Prohaska
This commit teaches git-gui to accept versions with annotations
that start with text and optionally end with a dot followed by
a number.
This is needed by the current versioning scheme of msysgit,
which uses versions like 1.5.3.mingw.1. However, the changes
is not limited to this use case. Any version of the form
<numeric version>.<anytext>.<number> would be parsed and only
the starting <numeric version> used for validation.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
git-gui/git-gui.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index bb1e7f3..f671eea 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -666,6 +666,7 @@ regsub -- {-dirty$} $_git_version {} _git_version
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
regsub {\.rc[0-9]+$} $_git_version {} _git_version
regsub {\.GIT$} $_git_version {} _git_version
+regsub {\.[a-zA-Z]+(\.[0-9]+)$} $_git_version {} _git_version
if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
catch {wm withdraw .}
--
1.5.3.mingw.1.106.g1610f-dirty
^ permalink raw reply related
* [PATCH] git-gui: try to locate git in same directory as git-gui (on Windows)
From: Steffen Prohaska @ 2007-10-06 9:36 UTC (permalink / raw)
To: git; +Cc: Steffen Prohaska
This commit adds another guess where git might be located.
After searching PATH the last fallback is the directory
in which git-gui is installed. This is a good guess for
a sane installation.
Even if git is not included in PATH, git-gui is now able
to locate it. Hence git-gui can be passed to wish
as an absolute path without caring about the environment.
PATH is searched first and the location of git-gui only
as a last resort. Maybe the order should be reversed?
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
git-gui/git-gui.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 3f5927f..bb1e7f3 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -344,6 +344,7 @@ proc _which {what} {
set _search_exe .exe
} elseif {[is_Windows]} {
set _search_path [split $env(PATH) {;}]
+ lappend _search_path [file dirname [info script]]
set _search_exe .exe
} else {
set _search_path [split $env(PATH) :]
--
1.5.3.mingw.1.105.ga0fd0
^ permalink raw reply related
* Re: [PATCH 1/2] Have a filter_start/filter_end API.
From: Alex Riesen @ 2007-10-06 9:06 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: Linus Torvalds, Junio C Hamano, git
In-Reply-To: <1191615571-15946-2-git-send-email-madcoder@debian.org>
Pierre Habouzit, Fri, Oct 05, 2007 22:19:30 +0200:
> Those are helpers to build functions that transform a buffer into a
> strbuf, allowing the "buffer" to be taken from the destination buffer.
They are horrible. And very specialized for these "filter" routines.
To the point where I would move them into the file where they are used
(convert.c only, isn't it?)
If you continue to insist the code is generic enough to justify its
residence in strbuf.c, continue reading.
First off, what was wrong with dumb
void strbuf_make_room(struct strbuf *, size_t newsize);
again?
> +void *strbuf_start_filter(struct strbuf *sb, const char *src, ssize_t hint)
> +{
> + if (src < sb->buf || src >= sb->buf + sb->alloc) {
> + if (hint > 0 && (size_t)hint >= sb->alloc)
> + strbuf_grow(sb, hint - sb->len);
> + return NULL;
> + }
> +
> + if (hint < 0)
> + return strbuf_detach(sb, NULL);
what is that for? Why can't the caller just use strbuf_detach? (He
already has to pass negative hint somehow, which should be a concious
action).
> +
trailing space (two HTs)
> + if ((size_t)hint >= sb->alloc) {
> + void *tmp = strbuf_detach(sb, NULL);
> + strbuf_grow(sb, hint);
> + return tmp;
> + }
> +
> + return NULL;
> +}
How can one know when it sb is safe to use after strbuf_end_filter?
It is for the first "if", for example. free() wont free the buf in sb.
Oh, right, one can check if returned pointer !NULL. Which just adds
more code to handle your API.
What actually happens to sb? Is it detached? Is it reallocated?
When it is detached and when it is reallocated?
Why is the returned pointer useful only for giving it to
strbuf_end_filter?
Take for example your change in crlf_to_git:
@@ -85,6 +85,7 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
{
struct text_stat stats;
char *dst;
+ void *tmp;
if ((action == CRLF_BINARY) || !auto_crlf || !len)
return 0;
@@ -110,9 +111,7 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
return 0;
}
- /* only grow if not in place */
- if (strbuf_avail(buf) + buf->len < len)
- strbuf_grow(buf, len - buf->len);
+ tmp = strbuf_start_filter(buf, src, len);
dst = buf->buf;
if (action == CRLF_GUESS) {
/*
@@ -133,13 +132,14 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
} while (--len);
}
strbuf_setlen(buf, dst - buf->buf);
+ strbuf_end_filter(tmp);
return 1;
}
And try to rewrite it with the strbuf_make_room:
@@ -110,9 +111,7 @@ static int crlf_to_git(const char *path, const char *src, size_t len,
return 0;
}
- /* only grow if not in place */
- if (strbuf_avail(buf) + buf->len < len)
- strbuf_grow(buf, len - buf->len);
+ strbuf_make_room(buf, len);
dst = buf->buf;
if (action == CRLF_GUESS) {
/*
The change looks rather simple
> +/*----- filter API -----*/
> +extern void *strbuf_start_filter(struct strbuf *, const char *, ssize_t);
> +extern void strbuf_end_filter(void *p);
I find the naming very confusing: what filtering takes place where?
If strbuf_end_filter is just free, why is it needed at all? For the
sake of wrapping free()?
^ permalink raw reply
* Re: Many gits are offline this week
From: Lars Hjemli @ 2007-10-06 9:05 UTC (permalink / raw)
To: Shawn O. Pearce, Junio C Hamano; +Cc: git
In-Reply-To: <20071005010448.GQ2137@spearce.org>
On 10/5/07, Shawn O. Pearce <spearce@spearce.org> wrote:
> With three gits offline for at least the next few days perhaps
> someone would be willing to step up and collect patches so that Junio
> has a reasonable place to pick up from when he can get back online?
I'll collect patches from the list for a few days and put them into
topic-branches on git://hjemli.net/pub/git/git.
--
larsh
^ permalink raw reply
* Re: [ALTERNATE PATCH] Add a simple option parser.
From: Sven Verdoolaege @ 2007-10-06 8:46 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: David Kastrup, git
In-Reply-To: <20071005163846.GE20305@artemis.corp>
On Fri, Oct 05, 2007 at 06:38:46PM +0200, Pierre Habouzit wrote:
> The real issue is dependency and bloat. getopt_long would need the GNU
> implementation, That I believe depends upon gettext, and argp is just
> bloated, and I'm not even sure it's distributed outside from the glibc
> anyways.
It's part of gnulib (http://savannah.gnu.org/git/?group=gnulib).
Including argp (and all its dependencies) is as easy as running some
gnulib command.
It does have some bloat, but for my project it was definitely more
convenient to include it than to write my own parser and the bloat
is still acceptable I suppose...
bash-3.00$ du lib m4
572 lib
208 m4
bash-3.00$ du -s .
20348 .
(In a source tree without the git repo.)
skimo
^ permalink raw reply
* Re: [PATCH] makefile: Add a cscope target
From: Alex Riesen @ 2007-10-06 8:23 UTC (permalink / raw)
To: Kristof Provost; +Cc: git
In-Reply-To: <20071005223336.GA4556@luggage>
Kristof Provost, Sat, Oct 06, 2007 00:33:36 +0200:
> +cscope:
> + $(RM) cscope*
You may want to add the cscope* to .gitignore
^ permalink raw reply
* Re: [PATCH 2/2] Run garbage collection with loose object pruning after svn dcommit
From: Peter Baumann @ 2007-10-06 8:15 UTC (permalink / raw)
To: Steven Grimm; +Cc: Eric Wong, git
In-Reply-To: <470678ED.8050407@midwinter.com>
On Fri, Oct 05, 2007 at 10:48:29AM -0700, Steven Grimm wrote:
> Peter Baumann wrote:
>> That's new to me. Glancing over git-commit.sh, I could only find a
>> 'git-gc --auto', but no prune. I am not against doing a 'git gc --auto',
>> but I am against the --prune, because this could make shared
>> repositories unfunctional.
>>
>
> Does anyone run "git svn dcommit" from a shared repository? That is the
> only command that will trigger this code path.
>
> Given that you lose all the svn metadata if you do "git clone" (or "git
> clone -s") on a git-svn-managed repository, it's not clear to me that
> anyone would ever be bitten by this. Counterexamples welcome, of course.
>
> How would you feel about a separate config option to specifically enable
> auto-pruning, and having "git svn clone" set that option by default?
> Presumably anyone who is setting up a shared git-svn repository will be up
> to the task of disabling the option.
>
Sorry, I looked at 'git commit' (as you said in your mail) and not
'git-svn dcommit'. Looking now at git-svn, I could see the there is only
done a git-repack if the user *explicitly* asked for it on the cmdline
specifying --repack. For this repack run, the default parameter includes
-d and no --prune, so I do not think that we are doing a --prune run if
we where not _explicitly_ asked for it. As I said, I am totaly fine with
doing a 'git-gc --auto', but I am a little worried about the --prune.
We advertise everywhere that GIT adds only new content/objects/data to the
repository and *never* deletes anything itself in the repo and now you
want to do a --prune, wich obviously *does* delete data behind the users
back in a dcommit/fetch operation, which no one would think of that these
commands do have anything in common with deleting data. And this worries me.
-Peter
^ permalink raw reply
* Re: Question about "git commit -a"
From: Andy Parkins @ 2007-10-06 7:43 UTC (permalink / raw)
To: git
Cc: Marko Macek, Kristian Høgsberg, Andreas Ericsson,
Paolo Ciarrocchi, Johannes Schindelin, Nguyen Thai Ngoc Duy,
Wincent Colaiuta
In-Reply-To: <47067F68.2080709@gmx.net>
On Friday 2007, October 05, Marko Macek wrote:
> In CVS and subversion (which has nicer working-copy command line
> interface IMHO), I simply make a copy of the working copy, revert the
> non-commitable parts, build, commit the minor changes, and then update
> the first copy. For larger projects, where this can be slow, I use
> diff/revert/patch.
>
> Small checkins are nice for git-bisect, but if they don't build...
Who cares? Commits that build isn't the only reason for small commits.
git-bisect is nice and small buildable commits is something to aim for.
However, there is more to software history that buildable commits.
I hardly ever git-bisect, and I hardly ever checkout old revisions, however
I read the log _all the time_. The smaller the commit and the better the
log message the more quickly I'll understand what was going on. In the end
even if the commit doesn't build as long as the log message is a good
description of what the commit does and that thing is an isolated change
then the revision has achieved its goal for me.
Andy
--
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com
^ permalink raw reply
* Re: [PATCH] makefile: Add a cscope target
From: Frank Lichtenheld @ 2007-10-06 1:04 UTC (permalink / raw)
To: Kristof Provost; +Cc: git
In-Reply-To: <20071005223336.GA4556@luggage>
On Sat, Oct 06, 2007 at 12:33:36AM +0200, Kristof Provost wrote:
> +cscope:
> + $(RM) cscope*
> + $(FIND) . -name '*.hcS]' -print | xargs cscope -b
missing [
Gruesse,
--
Frank Lichtenheld <frank@lichtenheld.de>
www: http://www.djpig.de/
^ permalink raw reply
* Re: [PATCH 2/2] Run garbage collection with loose object pruning after svn dcommit
From: Eric Wong @ 2007-10-05 23:54 UTC (permalink / raw)
To: Steven Grimm; +Cc: git
In-Reply-To: <20071005001528.GA13029@midwinter.com>
Steven Grimm <koreth@midwinter.com> wrote:
> git-svn dcommit, by virtue of rewriting history to insert svn revision IDs,
> leaves old commits dangling. Since dcommit is already unsafe to run
> concurrently with other git commands, no additional risk is introduced
> by making it prune those old objects as needed.
>
> Signed-off-by: Steven Grimm <koreth@midwinter.com>
> ---
>
> This is in response to a colleague who complained that, after I
> installed the latest git release, he was getting lots of "too many
> unreachable loose objects" errors from the new "git gc --auto" run.
> Those objects turned out to be dangling commits from a year's worth of
> git-svn usage, since every git-svn commit will abandon at least one
> existing commit in order to rewrite it with the svn version data.
I'm not a fan of automatic gc in general, but I understand it can
help new users. So as long as clueful users can easily disable it,
then it's fine by me...
> git-svn.perl | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/git-svn.perl b/git-svn.perl
> index 777e436..be62ee1 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -441,6 +441,12 @@ sub cmd_dcommit {
> }
> command_noisy(@finish, $gs->refname);
> $last_rev = $cmt_rev;
> +
> + # rebase will have made the just-committed revisions
> + # unreachable; over time that can build up lots of
> + # loose objects in the repo. prune is unsafe to run
> + # concurrently but so is dcommit.
> + command_noisy(qw/gc --auto --prune/);
> }
> }
> }
This is better called outside of this loop. We now do a rebase after
every revision committed (which gets us even more dangling commits);
but we only want to call git-gc after everything is committed.
It'll be faster since git-gc is only invoked once, and if git-gc takes a
very long time to repack, we won't have to worry about timing out a SVN
network connection. It'll also reduce the window for somebody else to
commit a conflicting change that'll cause dcommit to fail midway
through.
As far as Peter's concerns for shared repositories go, I'm not sure...
I've never been comfortable with shared repositories myself (even in a
pure git environment without git-svn) and always just preferred using
full clones or copies[1] myself so I could rm -r any working directory
and not worry about any other repositories relying on it.
[1] - I usually go about using cp -al + libflcow :)
--
Eric Wong
^ permalink raw reply
* Re: git-svn, svn:externals, git-submodules?
From: Eric Wong @ 2007-10-05 23:14 UTC (permalink / raw)
To: Benoit SIGOURE; +Cc: git list
In-Reply-To: <DEC49034-D594-4F4E-89E6-B98A3D4A8825@lrde.epita.fr>
Benoit SIGOURE <tsuna@lrde.epita.fr> wrote:
> Hello,
> is there any plan to support svn:externals in git-svn with git-
> submodules? If yes, where can we see the on-going work? If no, is
> anyone already planning to implement this? If no, has anyone
> anything to say about the idea? I could give it a try as I really
> need this feature to properly interoperate with SVN repositories.
> Many of my friends and co-workers also need it.
I hope to support it at some point, but some point could be anywhere
from days to months away depending on other things I'm working on...
I've barely looked at git-submodules myself. To my knowledge there's no
on-going work for it.
--
Eric Wong
^ permalink raw reply
* [PATCH] makefile: Add a cscope target
From: Kristof Provost @ 2007-10-05 22:33 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]
The current makefile supports ctags but not cscope. Some people prefer
cscope (I do), so this patch adds a cscope target.
Signed-off-by: Kristof Provost <Kristof@provost-engineering.be>
---
diff --git a/Makefile b/Makefile
index 8db4dbe..42c9e94 100644
--- a/Makefile
+++ b/Makefile
@@ -947,6 +947,10 @@ tags:
$(RM) tags
$(FIND) . -name '*.[hcS]' -print | xargs ctags -a
+cscope:
+ $(RM) cscope*
+ $(FIND) . -name '*.hcS]' -print | xargs cscope -b
+
### Detect prefix changes
TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
$(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
@@ -1093,7 +1097,7 @@ clean:
$(LIB_FILE) $(XDIFF_LIB)
$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS)
- $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
+ $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
$(RM) -r autom4te.cache
$(RM) configure config.log config.mak.autogen config.mak.append config.status config.cache
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
@@ -1111,7 +1115,7 @@ endif
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS
.PHONY: all install clean strip
-.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags .FORCE-GIT-CFLAGS
+.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS
### Check documentation
#
--
Kristof
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply related
* Re: Question about "git commit -a"
From: Dmitry Potapov @ 2007-10-05 21:10 UTC (permalink / raw)
To: Kristian Høgsberg
Cc: Andreas Ericsson, Paolo Ciarrocchi, Johannes Schindelin,
Nguyen Thai Ngoc Duy, Wincent Colaiuta, Git Mailing List
In-Reply-To: <1191599763.7117.18.camel@hinata.boston.redhat.com>
On Fri, Oct 05, 2007 at 11:56:03AM -0400, Kristian Høgsberg wrote:
> I understand why people like staging and commit without -a, seeing how
> it's faster and all, but I have a serious problem with this practice
> that I haven't seen brought up on the list. How do you know what you
> commit actually works or even compiles?
You don't. Even with 'commit -a' there is no guarantee that the
result will compile, because you can forget to add a new file.
IMHO, the best practice is to recompile everything step-wise in
a clean directory before you are going to publish your changes.
It can be done automatically by script, while you do something
useful, like reading this mailing-list :)
Dmitry
^ permalink raw reply
* [StGIT PATCH] Better diagnostic for wrong branch configuration.
From: Yann Dirson @ 2007-10-05 20:44 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
If the branch.*.merge parameter does not name a valid remote head,
stgit would not rebase after a fetch, and would write instead
'Rebasing to "None" ... done'.
This patch makes this situation an error and tells the user what
to fix in his repo configuration.
---
stgit/commands/pull.py | 9 ++++++++-
stgit/git.py | 5 ++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 052ea2b..070db99 100644
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -90,7 +90,14 @@ def func(parser, options, args):
elif policy == 'fetch-rebase':
out.info('Fetching from "%s"' % repository)
git.fetch(repository)
- rebase(git.fetch_head())
+ try:
+ target = git.fetch_head()
+ except git.GitException:
+ out.error('Could not find the remote head to rebase onto, pushing any patches back...')
+ post_rebase(applied, False, False)
+ raise CmdException, 'Could not find the remote head to rebase onto - fix branch.%s.merge in .git/config' % crt_series.get_name()
+
+ rebase(target)
elif policy == 'rebase':
rebase(crt_series.get_parent_branch())
diff --git a/stgit/git.py b/stgit/git.py
index 9e0f771..a0493bc 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -1003,11 +1003,14 @@ def fetch_head():
m = re.match('^([^\t]*)\t\t', line)
if m:
if fetch_head:
- raise GitException, "StGit does not support multiple FETCH_HEAD"
+ raise GitException, 'StGit does not support multiple FETCH_HEAD'
else:
fetch_head=m.group(1)
stream.close()
+ if not fetch_head:
+ raise GitException, 'No for-merge remote head found in FETCH_HEAD'
+
# here we are sure to have a single fetch_head
return fetch_head
^ permalink raw reply related
* git-svn, svn:externals, git-submodules?
From: Benoit SIGOURE @ 2007-10-05 20:37 UTC (permalink / raw)
To: git list
[-- Attachment #1: Type: text/plain, Size: 475 bytes --]
Hello,
is there any plan to support svn:externals in git-svn with git-
submodules? If yes, where can we see the on-going work? If no, is
anyone already planning to implement this? If no, has anyone
anything to say about the idea? I could give it a try as I really
need this feature to properly interoperate with SVN repositories.
Many of my friends and co-workers also need it.
Cheers,
--
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 186 bytes --]
^ permalink raw reply
* Re: Many gits are offline this week
From: Pierre Habouzit @ 2007-10-05 20:26 UTC (permalink / raw)
To: Frank Lichtenheld; +Cc: Shawn O. Pearce, git
In-Reply-To: <20071005151355.GO31659@planck.djpig.de>
[-- Attachment #1: Type: text/plain, Size: 976 bytes --]
On Fri, Oct 05, 2007 at 03:13:55PM +0000, Frank Lichtenheld wrote:
> On Thu, Oct 04, 2007 at 09:04:48PM -0400, Shawn O. Pearce wrote:
> > With three gits offline for at least the next few days perhaps
> > someone would be willing to step up and collect patches so that Junio
> > has a reasonable place to pick up from when he can get back online?
>
> While I have neither the time nor the abilities to do this I
> will at least accumulate the various cvsserver patches floating
> around the last few days so that I can submit them to Junio in one
> batch.
I won't have the time either, though even if I keep posting patches on
the list, I'll resubmit a digest of mines when Junio will be back
online. (or share a public git repository so that he can directly fetch
from there).
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* strbuf `filter' API
From: Pierre Habouzit @ 2007-10-05 20:19 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
Ooookay,
I wasn't more thrilled about the previous patch than linus is. Here is
a possible API to hide the muck in the strbuf.c module, and have a way
nicer to read code in convert.c.
It remais as efficient as the previous code, tries to reuse the buffer
as much as possible to avoid reallocations, and deal with even more
cases (it's possible to have the "source" buffer be inside the
destination strbuf now, which could sometimes help a lot).
I based this on top of master (because it's where my previous patch
was) but it should apply on next properly. It depends upon the previous
patch though.
I'd say that the previous patch should go in master ASAP, and that
those two could be considered for next (having merged master in it first
btw).
Cheers,
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
^ permalink raw reply
* [PATCH 4/4] git-gui i18n: Update German translation, including latest glossary changes.
From: Christian Stimming @ 2007-10-05 20:41 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Shawn Pearce, git
In-Reply-To: <200710052240.40591.stimming@tuhh.de>
Signed-off-by: Christian Stimming <stimming@tuhh.de>
---
po/de.po | 798 +++++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 633 insertions(+), 165 deletions(-)
diff --git a/po/de.po b/po/de.po
index ee69d66..60b9ea5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,23 +7,41 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 17:28+0200\n"
-"PO-Revision-Date: 2007-10-05 22:00+0200\n"
+"POT-Creation-Date: 2007-10-05 22:01+0200\n"
+"PO-Revision-Date: 2007-10-05 22:27+0200\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:531
+#: git-gui.sh:41 git-gui.sh:631 git-gui.sh:645 git-gui.sh:658 git-gui.sh:740
+#: git-gui.sh:759
+msgid "git-gui: fatal error"
+msgstr "git-gui: Programmfehler"
+
+#: git-gui.sh:592
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "Ungültige Zeichensatz-Angabe in %s:"
+
+#: git-gui.sh:617
+msgid "Main Font"
+msgstr "Programmschriftart"
+
+#: git-gui.sh:618
+msgid "Diff/Console Font"
+msgstr "Vergleich-Schriftart"
+
+#: git-gui.sh:632
msgid "Cannot find git in PATH."
msgstr "Git kann im PATH nicht gefunden werden."
-#: git-gui.sh:550
+#: git-gui.sh:659
msgid "Cannot parse Git version string:"
msgstr "Git Versionsangabe kann nicht erkannt werden:"
-#: git-gui.sh:567
+#: git-gui.sh:676
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -42,79 +60,79 @@ msgstr ""
"\n"
"Soll angenommen werden, »%s« sei Version 1.5.0?\n"
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
-msgstr "Git-Verzeichnis kann nicht gefunden werden:"
-
-#: git-gui.sh:697
+#: git-gui.sh:849
msgid "Git directory not found:"
msgstr "Git-Verzeichnis nicht gefunden:"
-#: git-gui.sh:703
+#: git-gui.sh:856
+msgid "Cannot move to top of working directory:"
+msgstr "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt werden:"
+
+#: git-gui.sh:863
msgid "Cannot use funny .git directory:"
msgstr "Unerwartete Struktur des .git Verzeichnis:"
-#: git-gui.sh:708
+#: git-gui.sh:868
msgid "No working directory"
msgstr "Kein Arbeitsverzeichnis"
-#: git-gui.sh:854
+#: git-gui.sh:1015
msgid "Refreshing file status..."
msgstr "Dateistatus aktualisieren..."
-#: git-gui.sh:891
+#: git-gui.sh:1080
msgid "Scanning for modified files ..."
msgstr "Nach geänderten Dateien suchen..."
-#: git-gui.sh:1057 lib/browser.tcl:247
+#: git-gui.sh:1255 lib/browser.tcl:245
msgid "Ready."
msgstr "Bereit."
-#: git-gui.sh:1322
+#: git-gui.sh:1521
msgid "Unmodified"
msgstr "Unverändert"
-#: git-gui.sh:1324
+#: git-gui.sh:1523
msgid "Modified, not staged"
msgstr "Verändert, nicht bereitgestellt"
-#: git-gui.sh:1325 git-gui.sh:1330
+#: git-gui.sh:1524 git-gui.sh:1529
msgid "Staged for commit"
msgstr "Bereitgestellt zum Eintragen"
-#: git-gui.sh:1326 git-gui.sh:1331
+#: git-gui.sh:1525 git-gui.sh:1530
msgid "Portions staged for commit"
msgstr "Teilweise bereitgestellt zum Eintragen"
-#: git-gui.sh:1327 git-gui.sh:1332
+#: git-gui.sh:1526 git-gui.sh:1531
msgid "Staged for commit, missing"
msgstr "Bereitgestellt zum Eintragen, fehlend"
-#: git-gui.sh:1329
+#: git-gui.sh:1528
msgid "Untracked, not staged"
msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
-#: git-gui.sh:1334
+#: git-gui.sh:1533
msgid "Missing"
msgstr "Fehlend"
-#: git-gui.sh:1335
+#: git-gui.sh:1534
msgid "Staged for removal"
msgstr "Bereitgestellt zum Löschen"
-#: git-gui.sh:1336
+#: git-gui.sh:1535
msgid "Staged for removal, still present"
msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
+#: git-gui.sh:1537 git-gui.sh:1538 git-gui.sh:1539 git-gui.sh:1540
msgid "Requires merge resolution"
msgstr "Konfliktauflösung nötig"
-#: git-gui.sh:1383
+#: git-gui.sh:1575
msgid "Starting gitk... please wait..."
msgstr "Gitk wird gestartet... bitte warten."
-#: git-gui.sh:1392
+#: git-gui.sh:1584
#, tcl-format
msgid ""
"Unable to start gitk:\n"
@@ -125,293 +143,319 @@ msgstr ""
"\n"
"%s existiert nicht"
-#: git-gui.sh:1609
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr "Ungültige Zeichensatz-Angabe in gui.%s:"
-
-#: git-gui.sh:1634
-msgid "Main Font"
-msgstr "Programmschriftart"
-
-#: git-gui.sh:1635
-msgid "Diff/Console Font"
-msgstr "Vergleich-Schriftart"
-
-#: git-gui.sh:1649
+#: git-gui.sh:1784 lib/choose_repository.tcl:64
msgid "Repository"
msgstr "Projektarchiv"
-#: git-gui.sh:1650
+#: git-gui.sh:1785
msgid "Edit"
msgstr "Bearbeiten"
-#: git-gui.sh:1652
+#: git-gui.sh:1787 lib/choose_rev.tcl:560
msgid "Branch"
msgstr "Zweig"
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
-msgid "Commit"
-msgstr "Eintragen"
+#: git-gui.sh:1790 lib/choose_rev.tcl:547
+msgid "Commit@@noun"
+msgstr "Version"
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1793 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
msgid "Merge"
msgstr "Zusammenführen"
-#: git-gui.sh:1659
+#: git-gui.sh:1794
msgid "Fetch"
msgstr "Anfordern"
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
+#: git-gui.sh:1795 git-gui.sh:2294 lib/transport.tcl:93 lib/transport.tcl:182
msgid "Push"
msgstr "Ausliefern"
-#: git-gui.sh:1669
+#: git-gui.sh:1804
msgid "Browse Current Branch's Files"
msgstr "Aktuellen Zweig durchblättern"
-#: git-gui.sh:1673
+#: git-gui.sh:1808
msgid "Browse Branch Files..."
msgstr "Einen Zweig durchblättern..."
-#: git-gui.sh:1678
+#: git-gui.sh:1813
msgid "Visualize Current Branch's History"
msgstr "Aktuellen Zweig darstellen"
-#: git-gui.sh:1682
+#: git-gui.sh:1817
msgid "Visualize All Branch History"
msgstr "Alle Zweige darstellen"
-#: git-gui.sh:1689
+#: git-gui.sh:1824
#, tcl-format
msgid "Browse %s's Files"
msgstr "Zweig »%s« durchblättern"
-#: git-gui.sh:1691
+#: git-gui.sh:1826
#, tcl-format
msgid "Visualize %s's History"
msgstr "Historie von »%s« darstellen"
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1831 lib/database.tcl:27 lib/database.tcl:67
msgid "Database Statistics"
msgstr "Datenbankstatistik"
-#: git-gui.sh:1699 lib/database.tcl:34
+#: git-gui.sh:1834 lib/database.tcl:34
msgid "Compress Database"
msgstr "Datenbank komprimieren"
-#: git-gui.sh:1702
+#: git-gui.sh:1837
msgid "Verify Database"
msgstr "Datenbank überprüfen"
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
+#: git-gui.sh:1844 git-gui.sh:1848 git-gui.sh:1852 lib/shortcut.tcl:9
#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
msgid "Create Desktop Icon"
msgstr "Desktop-Icon erstellen"
-#: git-gui.sh:1722
+#: git-gui.sh:1857 lib/choose_repository.tcl:68 lib/choose_repository.tcl:132
msgid "Quit"
msgstr "Beenden"
-#: git-gui.sh:1729
+#: git-gui.sh:1864
msgid "Undo"
msgstr "Rückgängig"
-#: git-gui.sh:1732
+#: git-gui.sh:1867
msgid "Redo"
msgstr "Wiederholen"
-#: git-gui.sh:1736 git-gui.sh:2222
+#: git-gui.sh:1871 git-gui.sh:2358
msgid "Cut"
msgstr "Ausschneiden"
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
-#: lib/console.tcl:69
+#: git-gui.sh:1874 git-gui.sh:2361 git-gui.sh:2432 git-gui.sh:2504
+#: lib/console.tcl:67
msgid "Copy"
msgstr "Kopieren"
-#: git-gui.sh:1742 git-gui.sh:2228
+#: git-gui.sh:1877 git-gui.sh:2364
msgid "Paste"
msgstr "Einfügen"
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
+#: git-gui.sh:1880 git-gui.sh:2367 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr "Löschen"
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
+#: git-gui.sh:1884 git-gui.sh:2371 git-gui.sh:2508 lib/console.tcl:69
msgid "Select All"
msgstr "Alle auswählen"
-#: git-gui.sh:1758
+#: git-gui.sh:1893
msgid "Create..."
msgstr "Erstellen..."
-#: git-gui.sh:1764
+#: git-gui.sh:1899
msgid "Checkout..."
-msgstr "Arbeitskopie erstellen..."
+msgstr "Umstellen..."
-#: git-gui.sh:1770
+#: git-gui.sh:1905
msgid "Rename..."
msgstr "Umbenennen..."
-#: git-gui.sh:1775 git-gui.sh:1873
+#: git-gui.sh:1910 git-gui.sh:2008
msgid "Delete..."
msgstr "Löschen..."
-#: git-gui.sh:1780
+#: git-gui.sh:1915
msgid "Reset..."
msgstr "Zurücksetzen..."
-#: git-gui.sh:1792 git-gui.sh:2169
+#: git-gui.sh:1927 git-gui.sh:2305
msgid "New Commit"
msgstr "Neue Version"
-#: git-gui.sh:1800 git-gui.sh:2176
+#: git-gui.sh:1935 git-gui.sh:2312
msgid "Amend Last Commit"
msgstr "Letzte Version nachbessern"
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:1944 git-gui.sh:2272 lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr "Neu laden"
-#: git-gui.sh:1815
+#: git-gui.sh:1950
msgid "Stage To Commit"
msgstr "Zum Eintragen bereitstellen"
-#: git-gui.sh:1820
+#: git-gui.sh:1955
msgid "Stage Changed Files To Commit"
msgstr "Geänderte Dateien zum Eintragen bereitstellen"
-#: git-gui.sh:1826
+#: git-gui.sh:1961
msgid "Unstage From Commit"
msgstr "Aus der Bereitstellung herausnehmen"
-#: git-gui.sh:1831 lib/index.tcl:376
+#: git-gui.sh:1966 lib/index.tcl:382
msgid "Revert Changes"
msgstr "Änderungen revidieren"
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
+#: git-gui.sh:1973 git-gui.sh:2284 git-gui.sh:2382
msgid "Sign Off"
msgstr "Abzeichnen"
-#: git-gui.sh:1853
+#: git-gui.sh:1977 git-gui.sh:2288
+msgid "Commit@@verb"
+msgstr "Eintragen"
+
+#: git-gui.sh:1988
msgid "Local Merge..."
msgstr "Lokales Zusammenführen..."
-#: git-gui.sh:1858
+#: git-gui.sh:1993
msgid "Abort Merge..."
msgstr "Zusammenführen abbrechen..."
-#: git-gui.sh:1870
+#: git-gui.sh:2005
msgid "Push..."
msgstr "Ausliefern..."
-#: git-gui.sh:1880
+#: git-gui.sh:2015 lib/choose_repository.tcl:73
msgid "Apple"
msgstr "Apple"
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
+#: git-gui.sh:2018 git-gui.sh:2036 lib/choose_repository.tcl:76
+#: lib/choose_repository.tcl:82 lib/option.tcl:65
#, tcl-format
msgid "About %s"
msgstr "Über %s"
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
+#: git-gui.sh:2020 git-gui.sh:2026 git-gui.sh:2550
msgid "Options..."
msgstr "Optionen..."
-#: git-gui.sh:1897
+#: git-gui.sh:2032 lib/choose_repository.tcl:79
msgid "Help"
msgstr "Hilfe"
-#: git-gui.sh:1938
+#: git-gui.sh:2073
msgid "Online Documentation"
msgstr "Online-Dokumentation"
-#: git-gui.sh:2054
+#: git-gui.sh:2157
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2190
msgid "Current Branch:"
msgstr "Aktueller Zweig:"
-#: git-gui.sh:2075
+#: git-gui.sh:2211
msgid "Staged Changes (Will Be Committed)"
msgstr "Bereitgestellte Änderungen (werden eingetragen)"
-#: git-gui.sh:2095
+#: git-gui.sh:2231
msgid "Unstaged Changes (Will Not Be Committed)"
msgstr "Nicht bereitgestellte Änderungen (werden nicht eingetragen)"
-#: git-gui.sh:2142
+#: git-gui.sh:2278
msgid "Stage Changed"
msgstr "Geänderte bereitstellen"
-#: git-gui.sh:2188
+#: git-gui.sh:2324
msgid "Initial Commit Message:"
msgstr "Beschreibung der ersten Version:"
-#: git-gui.sh:2189
+#: git-gui.sh:2325
msgid "Amended Commit Message:"
msgstr "Beschreibung der nachgebesserten Version:"
-#: git-gui.sh:2190
+#: git-gui.sh:2326
msgid "Amended Initial Commit Message:"
msgstr "Beschreibung der nachgebesserten ersten Version:"
-#: git-gui.sh:2191
+#: git-gui.sh:2327
msgid "Amended Merge Commit Message:"
msgstr "Beschreibung der nachgebesserten Zusammenführungs-Version:"
-#: git-gui.sh:2192
+#: git-gui.sh:2328
msgid "Merge Commit Message:"
msgstr "Beschreibung der Zusammenführungs-Version:"
-#: git-gui.sh:2193
+#: git-gui.sh:2329
msgid "Commit Message:"
msgstr "Versionsbeschreibung:"
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
+#: git-gui.sh:2374 git-gui.sh:2512 lib/console.tcl:71
msgid "Copy All"
msgstr "Alle kopieren"
-#: git-gui.sh:2262 lib/blame.tcl:104
+#: git-gui.sh:2398 lib/blame.tcl:104
msgid "File:"
msgstr "Datei:"
-#: git-gui.sh:2364
+#: git-gui.sh:2500
msgid "Refresh"
msgstr "Aktualisieren"
-#: git-gui.sh:2385
+#: git-gui.sh:2521
msgid "Apply/Reverse Hunk"
msgstr "Änderung anwenden/umkehren"
-#: git-gui.sh:2391
+#: git-gui.sh:2527
msgid "Decrease Font Size"
msgstr "Schriftgröße verkleinern"
-#: git-gui.sh:2395
+#: git-gui.sh:2531
msgid "Increase Font Size"
msgstr "Schriftgröße vergrößern"
-#: git-gui.sh:2400
+#: git-gui.sh:2536
msgid "Show Less Context"
msgstr "Weniger Kontext anzeigen"
-#: git-gui.sh:2407
+#: git-gui.sh:2543
msgid "Show More Context"
msgstr "Mehr Kontext anzeigen"
-#: git-gui.sh:2422
+#: git-gui.sh:2557
msgid "Unstage Hunk From Commit"
msgstr "Aus der Bereitstellung herausnehmen"
-#: git-gui.sh:2426 git-gui.sh:2430
+#: git-gui.sh:2559
msgid "Stage Hunk For Commit"
msgstr "In die Bereitstellung hinzufügen"
-#: git-gui.sh:2440
+#: git-gui.sh:2578
msgid "Initializing..."
msgstr "Initialisieren..."
+#: git-gui.sh:2669
+#, tcl-format
+msgid ""
+"Possible environment issues exist.\n"
+"\n"
+"The following environment variables are probably\n"
+"going to be ignored by any Git subprocess run\n"
+"by %s:\n"
+"\n"
+msgstr ""
+
+#: git-gui.sh:2699
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2704
+#, tcl-format
+msgid ""
+"\n"
+"\n"
+"A good replacement for %s\n"
+"is placing values for the user.name and\n"
+"user.email settings into your personal\n"
+"~/.gitconfig file.\n"
+msgstr ""
+
#: lib/blame.tcl:77
msgid "File Viewer"
msgstr "Datei-Browser"
@@ -429,6 +473,50 @@ msgstr "Version kopieren"
msgid "Reading %s..."
msgstr "%s lesen..."
+#: lib/blame.tcl:473
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:493
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:674
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:677
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:731
+msgid "Loading annotation..."
+msgstr "Annotierung laden..."
+
+#: lib/blame.tcl:787
+msgid "Author:"
+msgstr "Autor:"
+
+#: lib/blame.tcl:791
+msgid "Committer:"
+msgstr "Eintragender:"
+
+#: lib/blame.tcl:796
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:910
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:916
+msgid "In File:"
+msgstr "In Datei:"
+
+#: lib/blame.tcl:921
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
msgid "Checkout Branch"
msgstr "Zweig umstellen"
@@ -438,18 +526,18 @@ msgid "Checkout"
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:283
-#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/option.tcl:172 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
msgid "Cancel"
msgstr "Abbrechen"
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
msgid "Revision"
msgstr "Version"
#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
-#: lib/option.tcl:274
+#: lib/option.tcl:280
msgid "Options"
msgstr "Optionen"
@@ -469,7 +557,7 @@ msgstr "Zweig erstellen"
msgid "Create New Branch"
msgstr "Neuen Zweig erstellen"
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:236
msgid "Create"
msgstr "Erstellen"
@@ -609,20 +697,22 @@ msgstr "Starten..."
msgid "File Browser"
msgstr "Datei-Browser"
-#: lib/browser.tcl:127 lib/browser.tcl:144
+#: lib/browser.tcl:125 lib/browser.tcl:142
#, tcl-format
msgid "Loading %s..."
msgstr "%s laden..."
-#: lib/browser.tcl:188
+#: lib/browser.tcl:186
msgid "[Up To Parent]"
msgstr "[Nach oben]"
-#: lib/browser.tcl:268 lib/browser.tcl:274
+#: lib/browser.tcl:266 lib/browser.tcl:272
msgid "Browse Branch Files"
msgstr "Dateien des Zweigs durchblättern"
-#: lib/browser.tcl:279
+#: lib/browser.tcl:277 lib/choose_repository.tcl:252
+#: lib/choose_repository.tcl:342 lib/choose_repository.tcl:352
+#: lib/choose_repository.tcl:848
msgid "Browse"
msgstr "Blättern"
@@ -631,7 +721,12 @@ msgstr "Blättern"
msgid "Fetching %s from %s"
msgstr "Änderungen »%s« von »%s« anfordern"
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:127
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
msgid "Close"
msgstr "Schließen"
@@ -683,10 +778,17 @@ msgstr ""
"\n"
"Es wird gleich neu geladen.\n"
+#: lib/checkout_op.tcl:322
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "Arbeitskopie umstellen auf »%s«..."
+
#: lib/checkout_op.tcl:353
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
-msgstr "Zweig umstellen von »%s« abgebrochen (Zusammenführen der Dateien ist notwendig)."
+msgstr ""
+"Zweig umstellen von »%s« abgebrochen (Zusammenführen der Dateien ist "
+"notwendig)."
#: lib/checkout_op.tcl:354
msgid "File level merge required."
@@ -706,7 +808,13 @@ msgid ""
msgstr ""
"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n"
"\n"
-"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«."
+"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
+#, tcl-format
+msgid "Checked out '%s'."
+msgstr "Umgestellt auf »%s«."
#: lib/checkout_op.tcl:478
#, tcl-format
@@ -746,6 +854,236 @@ msgstr ""
"\n"
"Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen."
+#: lib/choose_font.tcl:39
+msgid "Select"
+msgstr "Auswählen"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr "Schriftfamilie"
+
+#: lib/choose_font.tcl:73
+msgid "Font Size"
+msgstr "Schriftgröße"
+
+#: lib/choose_font.tcl:90
+msgid "Font Example"
+msgstr "Schriftbeispiel"
+
+#: lib/choose_font.tcl:101
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+"Dies ist ein Beispieltext.\n"
+"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
+
+#: lib/choose_repository.tcl:57
+msgid "Git Gui"
+msgstr "Git Gui"
+
+#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:241
+msgid "Create New Repository"
+msgstr "Neues Projektarchiv"
+
+#: lib/choose_repository.tcl:111 lib/choose_repository.tcl:328
+msgid "Clone Existing Repository"
+msgstr "Projektarchiv kopieren"
+
+#: lib/choose_repository.tcl:116 lib/choose_repository.tcl:837
+msgid "Open Existing Repository"
+msgstr "Projektarchiv öffnen"
+
+#: lib/choose_repository.tcl:128
+msgid "Next >"
+msgstr "Weiter >"
+
+#: lib/choose_repository.tcl:189
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "Projektarchiv »%s« existiert bereits."
+
+#: lib/choose_repository.tcl:195 lib/choose_repository.tcl:202
+#: lib/choose_repository.tcl:209
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
+
+#: lib/choose_repository.tcl:246 lib/choose_repository.tcl:346
+msgid "Directory:"
+msgstr "Verzeichnis:"
+
+#: lib/choose_repository.tcl:275 lib/choose_repository.tcl:400
+#: lib/choose_repository.tcl:871
+msgid "Git Repository"
+msgstr "Git Projektarchiv"
+
+#: lib/choose_repository.tcl:290 lib/choose_repository.tcl:297
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr "Verzeichnis »%s« existiert bereits."
+
+#: lib/choose_repository.tcl:302
+#, tcl-format
+msgid "File %s already exists."
+msgstr "Datei »%s« existiert bereits."
+
+#: lib/choose_repository.tcl:323
+msgid "Clone"
+msgstr "Kopieren"
+
+#: lib/choose_repository.tcl:336
+msgid "URL:"
+msgstr "URL:"
+
+#: lib/choose_repository.tcl:356
+msgid "Clone Type:"
+msgstr "Art der Kopie:"
+
+#: lib/choose_repository.tcl:362
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:368
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:374
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:406 lib/choose_repository.tcl:455
+#: lib/choose_repository.tcl:597 lib/choose_repository.tcl:667
+#: lib/choose_repository.tcl:877 lib/choose_repository.tcl:885
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "Kein Git-Projektarchiv in »%s« gefunden."
+
+#: lib/choose_repository.tcl:442
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:446
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:476
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:488
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:489
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:513
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:549
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Von »%s« konnte nichts kopiert werden."
+
+#: lib/choose_repository.tcl:551 lib/choose_repository.tcl:765
+#: lib/choose_repository.tcl:777
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:564
+msgid "Hardlinks are unavailable. Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:576
+#, tcl-format
+msgid "Cloning from %s"
+msgstr "Kopieren von »%s«"
+
+#: lib/choose_repository.tcl:607
+msgid "Copying objects"
+msgstr "Objektdatenbank kopieren"
+
+#: lib/choose_repository.tcl:608
+msgid "KiB"
+msgstr "KB"
+
+#: lib/choose_repository.tcl:632
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr "Objekt kann nicht kopiert werden: %s"
+
+#: lib/choose_repository.tcl:642
+msgid "Linking objects"
+msgstr "Objekte verlinken"
+
+#: lib/choose_repository.tcl:643
+msgid "objects"
+msgstr "Objekte"
+
+#: lib/choose_repository.tcl:651
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr "Objekt kann nicht hartverlinkt werden: %s"
+
+#: lib/choose_repository.tcl:706
+msgid "Cannot fetch branches and objects. See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:717
+msgid "Cannot fetch tags. See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:741
+msgid "Cannot determine HEAD. See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:750
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:756
+msgid "Clone failed."
+msgstr "Kopieren fehlgeschlagen."
+
+#: lib/choose_repository.tcl:763
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:774
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:786
+msgid "Creating working directory"
+msgstr "Arbeitskopie erstellen"
+
+#: lib/choose_repository.tcl:787
+msgid "files"
+msgstr "Dateien"
+
+#: lib/choose_repository.tcl:816
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:832
+msgid "Open"
+msgstr "Öffnen"
+
+#: lib/choose_repository.tcl:842
+msgid "Repository:"
+msgstr "Projektarchiv:"
+
+#: lib/choose_repository.tcl:891
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
+
#: lib/choose_rev.tcl:53
msgid "This Detached Checkout"
msgstr "Abgetrennte Arbeitskopie-Version"
@@ -762,7 +1100,7 @@ msgstr "Lokaler Zweig"
msgid "Tracking Branch"
msgstr "Übernahmezweig"
-#: lib/choose_rev.tcl:84
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
msgid "Tag"
msgstr "Markierung"
@@ -779,6 +1117,18 @@ msgstr "Keine Version ausgewählt."
msgid "Revision expression is empty."
msgstr "Versions-Ausdruck ist leer."
+#: lib/choose_rev.tcl:530
+msgid "Updated"
+msgstr "Aktualisiert"
+
+#: lib/choose_rev.tcl:556
+msgid "Remote"
+msgstr "Gegenseite"
+
+#: lib/choose_rev.tcl:558
+msgid "URL"
+msgstr "URL"
+
#: lib/commit.tcl:9
msgid ""
"There is nothing to amend.\n"
@@ -829,7 +1179,8 @@ msgid ""
msgstr ""
"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
"\n"
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
+"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
+"geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
"\n"
"Es wird gleich neu geladen.\n"
@@ -843,7 +1194,8 @@ msgid ""
msgstr ""
"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n"
"\n"
-"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie müssen diese Konflikte auflösen, bevor Sie eintragen können.\n"
+"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
#, tcl-format
@@ -890,6 +1242,11 @@ msgstr ""
msgid "write-tree failed:"
msgstr "write-tree fehlgeschlagen:"
+#: lib/commit.tcl:275
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr "Version »%s« scheint beschädigt zu sein"
+
#: lib/commit.tcl:279
msgid ""
"No changes to commit.\n"
@@ -900,7 +1257,8 @@ msgid ""
msgstr ""
"Keine Änderungen einzutragen.\n"
"\n"
-"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts zusammengeführt.\n"
+"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts "
+"zusammengeführt.\n"
"\n"
"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
@@ -908,6 +1266,11 @@ msgstr ""
msgid "No changes to commit."
msgstr "Keine Änderungen, die eingetragen werden können."
+#: lib/commit.tcl:303
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
#: lib/commit.tcl:317
msgid "commit-tree failed:"
msgstr "commit-tree fehlgeschlagen:"
@@ -921,15 +1284,15 @@ msgstr "update-ref fehlgeschlagen:"
msgid "Created commit %s: %s"
msgstr "Version %s übertragen: %s"
-#: lib/console.tcl:55
+#: lib/console.tcl:57
msgid "Working... please wait..."
msgstr "Verarbeitung. Bitte warten..."
-#: lib/console.tcl:184
+#: lib/console.tcl:183
msgid "Success"
msgstr "Erfolgreich"
-#: lib/console.tcl:194
+#: lib/console.tcl:196
msgid "Error: Command Failed"
msgstr "Fehler: Kommando fehlgeschlagen"
@@ -969,6 +1332,27 @@ msgstr "Objektdatenbank komprimieren"
msgid "Verifying the object database with fsck-objects"
msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen"
+#: lib/database.tcl:108
+#, 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"
+"\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"
+"\n"
+"Soll die Datenbank jetzt komprimiert werden?"
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Ungültiges Datum von Git: %s"
+
#: lib/diff.tcl:42
#, tcl-format
msgid ""
@@ -991,19 +1375,37 @@ msgstr ""
"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen "
"Dateien zu prüfen."
-#: lib/diff.tcl:97
+#: lib/diff.tcl:81
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Vergleich von »%s« laden..."
+
+#: lib/diff.tcl:114 lib/diff.tcl:184
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "Datei »%s« kann nicht angezeigt werden"
+
+#: lib/diff.tcl:115
msgid "Error loading file:"
msgstr "Fehler beim Laden der Datei:"
-#: lib/diff.tcl:162
+#: lib/diff.tcl:122
+msgid "Git Repository (subproject)"
+msgstr "Git-Projektarchiv (Unterprojekt)"
+
+#: lib/diff.tcl:134
+msgid "* Binary file (not showing content)."
+msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
+
+#: lib/diff.tcl:185
msgid "Error loading diff:"
msgstr "Fehler beim Laden des Vergleichs:"
-#: lib/diff.tcl:278
+#: lib/diff.tcl:302
msgid "Failed to unstage selected hunk."
msgstr "Fehler beim Herausnehmen der gewählten Dateien aus der Bereitstellung."
-#: lib/diff.tcl:285
+#: lib/diff.tcl:309
msgid "Failed to stage selected hunk."
msgstr "Fehler beim Bereitstellen der gewählten Dateien."
@@ -1017,24 +1419,35 @@ msgstr "Warnung"
#: lib/error.tcl:81
msgid "You must correct the above errors before committing."
-msgstr "Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
+msgstr ""
+"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
-#: lib/index.tcl:364
+#: lib/index.tcl:271
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
+
+#: lib/index.tcl:315
+#, tcl-format
+msgid "Adding %s"
+msgstr "»%s« hinzufügen..."
+
+#: lib/index.tcl:370
#, tcl-format
msgid "Revert changes in file %s?"
msgstr "Änderungen in Datei »%s« revidieren?"
-#: lib/index.tcl:366
+#: lib/index.tcl:372
#, tcl-format
msgid "Revert changes in these %i files?"
msgstr "Änderungen in den gewählten %i Dateien revidieren?"
-#: lib/index.tcl:372
+#: lib/index.tcl:378
msgid "Any unstaged changes will be permanently lost by the revert."
msgstr ""
"Alle nicht bereitgestellten Änderungen werden beim Revidieren verloren gehen."
-#: lib/index.tcl:375
+#: lib/index.tcl:381
msgid "Do Nothing"
msgstr "Nichts tun"
@@ -1046,7 +1459,8 @@ msgid ""
msgstr ""
"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n"
"\n"
-"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie zusammenführen können.\n"
+"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie "
+"zusammenführen können.\n"
#: lib/merge.tcl:27
msgid ""
@@ -1076,7 +1490,10 @@ msgid ""
msgstr ""
"Zusammenführung mit Konflikten.\n"
"\n"
-"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst danach kann eine neue Zusammenführung begonnen werden.\n"
+"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese "
+"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder "
+"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst "
+"danach kann eine neue Zusammenführung begonnen werden.\n"
#: lib/merge.tcl:54
#, tcl-format
@@ -1090,7 +1507,10 @@ msgid ""
msgstr ""
"Es liegen Änderungen vor.\n"
"\n"
-"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich einfacher beheben oder abbrechen.\n"
+"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte "
+"Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser "
+"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich "
+"einfacher beheben oder abbrechen.\n"
#: lib/merge.tcl:106
#, tcl-format
@@ -1139,7 +1559,8 @@ msgid ""
msgstr ""
"Zusammenführen abbrechen?\n"
"\n"
-"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen verloren.\n"
+"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen "
+"verloren.\n"
"\n"
"Zusammenführen jetzt abbrechen?"
@@ -1153,7 +1574,8 @@ msgid ""
msgstr ""
"Änderungen zurücksetzen?\n"
"\n"
-"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen verloren.\n"
+"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen "
+"verloren.\n"
"\n"
"Änderungen jetzt zurücksetzen?"
@@ -1230,7 +1652,20 @@ msgstr "Anzahl der Kontextzeilen beim Vergleich"
msgid "New Branch Name Template"
msgstr "Namensvorschlag für neue Zweige"
-#: lib/option.tcl:305
+#: lib/option.tcl:258
+msgid "Change Font"
+msgstr "Schriftart ändern"
+
+#: lib/option.tcl:262
+#, tcl-format
+msgid "Choose %s"
+msgstr "%s wählen"
+
+#: lib/option.tcl:268
+msgid "pt."
+msgstr "pt."
+
+#: lib/option.tcl:311
msgid "Failed to completely save options:"
msgstr "Optionen konnten nicht gespeichert werden:"
@@ -1242,11 +1677,11 @@ msgstr "Zweig im Projektarchiv der Gegenseite löschen"
msgid "From Repository"
msgstr "Von Projektarchiv"
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
msgid "Remote:"
msgstr "Gegenseite:"
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
msgid "Arbitrary URL:"
msgstr "Kommunikation mit URL:"
@@ -1270,12 +1705,26 @@ msgstr "Immer (Keine Zusammenführungsprüfung)"
msgid "A branch is required for 'Merged Into'."
msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden."
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n"
+"\n"
+" - %s"
+
#: lib/remote_branch_delete.tcl:189
#, tcl-format
msgid ""
"One or more of the merge tests failed because you have not fetched the "
"necessary commits. Try fetching from %s first."
-msgstr "Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, zuerst von »%s« anzufordern."
+msgstr ""
+"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die "
+"notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, "
+"zuerst von »%s« anzufordern."
#: lib/remote_branch_delete.tcl:207
msgid "Please select one or more branches to delete."
@@ -1304,22 +1753,22 @@ msgstr "Kein Projektarchiv ausgewählt."
#: lib/remote_branch_delete.tcl:291
#, tcl-format
msgid "Scanning %s..."
-msgstr "%s laden..."
+msgstr "»%s« laden..."
#: lib/remote.tcl:162
#, tcl-format
-msgid "Fetch from %s..."
-msgstr "Von »%s« anfordern..."
+msgid "Fetch from %s"
+msgstr "Von »%s« anfordern"
#: lib/remote.tcl:172
#, tcl-format
-msgid "Prune from %s..."
-msgstr "Löschen von »%s«..."
+msgid "Prune from %s"
+msgstr "Löschen von »%s«"
#: lib/remote.tcl:206
#, tcl-format
-msgid "Push to %s..."
-msgstr "Nach %s ausliefern..."
+msgid "Push to %s"
+msgstr "Nach »%s« ausliefern"
#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
msgid "Cannot write script:"
@@ -1329,51 +1778,70 @@ msgstr "Fehler beim Schreiben des Scripts:"
msgid "Cannot write icon:"
msgstr "Fehler beim Erstellen des Icons:"
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
msgstr "%s ... %*i von %*i %s (%3i%%)"
+#: lib/transport.tcl:6
+#, tcl-format
+msgid "fetch %s"
+msgstr "»%s« anfordern"
+
#: lib/transport.tcl:7
#, tcl-format
msgid "Fetching new changes from %s"
msgstr "Neue Änderungen von »%s« holen"
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr ""
+
#: lib/transport.tcl:19
#, tcl-format
msgid "Pruning tracking branches deleted from %s"
msgstr "Übernahmezweige löschen, die in »%s« gelöscht wurden"
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr "»%s« ausliefern..."
+
#: lib/transport.tcl:26
#, tcl-format
msgid "Pushing changes to %s"
-msgstr "Änderungen nach %s ausliefern"
+msgstr "Änderungen nach »%s« ausliefern"
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr "%s %s nach %s ausliefern"
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
msgid "Push Branches"
msgstr "Zweige ausliefern"
-#: lib/transport.tcl:98
+#: lib/transport.tcl:103
msgid "Source Branches"
msgstr "Herkunftszweige"
-#: lib/transport.tcl:115
+#: lib/transport.tcl:120
msgid "Destination Repository"
msgstr "Ziel-Projektarchiv"
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
msgid "Transfer Options"
msgstr "Netzwerk-Einstellungen"
-#: lib/transport.tcl:155
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr "Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
+
+#: lib/transport.tcl:164
msgid "Use thin pack (for slow network connections)"
msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
-#: lib/transport.tcl:159
+#: lib/transport.tcl:168
msgid "Include tags"
msgstr "Mit Markierungen übertragen"
--
1.5.3.rc2.6.g40240
^ permalink raw reply related
* [PATCH 3/4] git-gui i18n: Incorporate glossary changes into existing German translation.
From: Christian Stimming @ 2007-10-05 20:40 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Shawn Pearce, git
In-Reply-To: <200710052239.47628.stimming@tuhh.de>
Signed-off-by: Christian Stimming <stimming@tuhh.de>
---
po/de.po | 113 ++++++++++++++++++++++++++------------------------------------
1 files changed, 47 insertions(+), 66 deletions(-)
diff --git a/po/de.po b/po/de.po
index 94b7463..ee69d66 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-08-11 17:28+0200\n"
-"PO-Revision-Date: 2007-08-11 17:37+0200\n"
+"PO-Revision-Date: 2007-10-05 22:00+0200\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
@@ -80,15 +80,15 @@ msgstr "Verändert, nicht bereitgestellt"
#: git-gui.sh:1325 git-gui.sh:1330
msgid "Staged for commit"
-msgstr "Bereitgestellt zur Übertragung"
+msgstr "Bereitgestellt zum Eintragen"
#: git-gui.sh:1326 git-gui.sh:1331
msgid "Portions staged for commit"
-msgstr "Teilweise bereitgestellt zur Übertragung"
+msgstr "Teilweise bereitgestellt zum Eintragen"
#: git-gui.sh:1327 git-gui.sh:1332
msgid "Staged for commit, missing"
-msgstr "Bereitgestellt zur Übertragung, fehlend"
+msgstr "Bereitgestellt zum Eintragen, fehlend"
#: git-gui.sh:1329
msgid "Untracked, not staged"
@@ -152,7 +152,7 @@ msgstr "Zweig"
#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
msgid "Commit"
-msgstr "Übertragen"
+msgstr "Eintragen"
#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
msgid "Merge"
@@ -249,7 +249,7 @@ msgstr "Erstellen..."
#: git-gui.sh:1764
msgid "Checkout..."
-msgstr "Auschecken..."
+msgstr "Arbeitskopie erstellen..."
#: git-gui.sh:1770
msgid "Rename..."
@@ -265,11 +265,11 @@ msgstr "Zurücksetzen..."
#: git-gui.sh:1792 git-gui.sh:2169
msgid "New Commit"
-msgstr "Neu übertragen"
+msgstr "Neue Version"
#: git-gui.sh:1800 git-gui.sh:2176
msgid "Amend Last Commit"
-msgstr "Letzte Übertragung nachbessern"
+msgstr "Letzte Version nachbessern"
#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
msgid "Rescan"
@@ -277,11 +277,11 @@ msgstr "Neu laden"
#: git-gui.sh:1815
msgid "Stage To Commit"
-msgstr "Zur Übertragung bereitstellen"
+msgstr "Zum Eintragen bereitstellen"
#: git-gui.sh:1820
msgid "Stage Changed Files To Commit"
-msgstr "Geänderte Dateien zur Übertragung bereitstellen"
+msgstr "Geänderte Dateien zum Eintragen bereitstellen"
#: git-gui.sh:1826
msgid "Unstage From Commit"
@@ -334,11 +334,11 @@ msgstr "Aktueller Zweig:"
#: git-gui.sh:2075
msgid "Staged Changes (Will Be Committed)"
-msgstr "Bereitgestellte Änderungen (werden übertragen)"
+msgstr "Bereitgestellte Änderungen (werden eingetragen)"
#: git-gui.sh:2095
msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr "Nicht bereitgestellte Änderungen (werden nicht übertragen)"
+msgstr "Nicht bereitgestellte Änderungen (werden nicht eingetragen)"
#: git-gui.sh:2142
msgid "Stage Changed"
@@ -346,27 +346,27 @@ msgstr "Geänderte bereitstellen"
#: git-gui.sh:2188
msgid "Initial Commit Message:"
-msgstr "Erstmalige Übertragungsmeldung"
+msgstr "Beschreibung der ersten Version:"
#: git-gui.sh:2189
msgid "Amended Commit Message:"
-msgstr "Übertragungsmeldung mit Nachbesserung:"
+msgstr "Beschreibung der nachgebesserten Version:"
#: git-gui.sh:2190
msgid "Amended Initial Commit Message:"
-msgstr "Erstmalige Übertragungsmeldung mit Nachbesserung:"
+msgstr "Beschreibung der nachgebesserten ersten Version:"
#: git-gui.sh:2191
msgid "Amended Merge Commit Message:"
-msgstr "Zusammenführungs-Übertragungsmeldung mit Nachbesserung"
+msgstr "Beschreibung der nachgebesserten Zusammenführungs-Version:"
#: git-gui.sh:2192
msgid "Merge Commit Message:"
-msgstr "Übertragungsmeldung Zusammenführung:"
+msgstr "Beschreibung der Zusammenführungs-Version:"
#: git-gui.sh:2193
msgid "Commit Message:"
-msgstr "Übertragungsmeldung:"
+msgstr "Versionsbeschreibung:"
#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
msgid "Copy All"
@@ -418,11 +418,11 @@ msgstr "Datei-Browser"
#: lib/blame.tcl:81
msgid "Commit:"
-msgstr "Übertragung:"
+msgstr "Version:"
#: lib/blame.tcl:249
msgid "Copy Commit"
-msgstr "Übertragung kopieren"
+msgstr "Version kopieren"
#: lib/blame.tcl:369
#, tcl-format
@@ -431,11 +431,11 @@ msgstr "%s lesen..."
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
msgid "Checkout Branch"
-msgstr "Zweig auschecken"
+msgstr "Zweig umstellen"
#: lib/branch_checkout.tcl:23
msgid "Checkout"
-msgstr "Auschecken"
+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:283
@@ -507,7 +507,7 @@ msgstr "Zurücksetzen"
#: lib/branch_create.tcl:97
msgid "Checkout After Creation"
-msgstr "Auschecken nach Erstellen"
+msgstr "Arbeitskopie umstellen nach Erstellen"
#: lib/branch_create.tcl:131
msgid "Please select a tracking branch."
@@ -686,8 +686,7 @@ msgstr ""
#: lib/checkout_op.tcl:353
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
-msgstr ""
-"Auschecken von »%s« abgebrochen (Zusammenführen der Dateien ist notwendig)."
+msgstr "Zweig umstellen von »%s« abgebrochen (Zusammenführen der Dateien ist notwendig)."
#: lib/checkout_op.tcl:354
msgid "File level merge required."
@@ -707,8 +706,7 @@ msgid ""
msgstr ""
"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n"
"\n"
-"Wenn Sie auf einem Zwei arbeiten möchten, erstellen Sie bitte jetzt einen "
-"Zweig mit der Auswahl »Abgetrennte Auscheck-Version«."
+"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«."
#: lib/checkout_op.tcl:478
#, tcl-format
@@ -750,7 +748,7 @@ msgstr ""
#: lib/choose_rev.tcl:53
msgid "This Detached Checkout"
-msgstr "Abgetrennte Auscheck-Version"
+msgstr "Abgetrennte Arbeitskopie-Version"
#: lib/choose_rev.tcl:60
msgid "Revision Expression:"
@@ -831,8 +829,7 @@ msgid ""
msgstr ""
"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
"\n"
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
-"geändert. Vor einer neuen Übertragung muss neu geladen werden.\n"
+"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
"\n"
"Es wird gleich neu geladen.\n"
@@ -844,10 +841,9 @@ msgid ""
"File %s has merge conflicts. You must resolve them and stage the file "
"before committing.\n"
msgstr ""
-"Nicht zusammengeführte Dateien können nicht übertragen werden.\n"
+"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n"
"\n"
-"Die Datei %s hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie "
-"müssen diese Konflikte auflösen, bevor Sie übertragen können.\n"
+"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
#, tcl-format
@@ -858,7 +854,7 @@ msgid ""
msgstr ""
"Unbekannter Dateizustand »%s«.\n"
"\n"
-"Datei »%s« kann nicht übertragen werden.\n"
+"Datei »%s« kann nicht eingetragen werden.\n"
#: lib/commit.tcl:170
msgid ""
@@ -866,10 +862,9 @@ msgid ""
"\n"
"You must stage at least 1 file before you can commit.\n"
msgstr ""
-"Keine Änderungen vorhanden, die übertragen werden könnten.\n"
+"Keine Änderungen vorhanden, die eingetragen werden könnten.\n"
"\n"
-"Sie müssen mindestens eine Datei bereitstellen, bevor Sie übertragen "
-"können.\n"
+"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n"
#: lib/commit.tcl:183
msgid ""
@@ -881,16 +876,15 @@ msgid ""
"- Second line: Blank\n"
"- Remaining lines: Describe why this change is good.\n"
msgstr ""
-"Bitte geben Sie eine Übertragungsmeldung ein.\n"
+"Bitte geben Sie eine Versionsbeschreibung ein.\n"
"\n"
-"Eine gute Übertragungsmeldung enthält folgende Abschnitte:\n"
+"Eine gute Versionsbeschreibung enthält folgende Abschnitte:\n"
"\n"
"- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\n"
"\n"
"- Zweite Zeile: Leerzeile\n"
"\n"
-"- Rest der Meldung: Eine ausführliche Beschreibung, warum diese Änderung "
-"hilfreich ist.\n"
+"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n"
#: lib/commit.tcl:257
msgid "write-tree failed:"
@@ -904,16 +898,15 @@ msgid ""
"\n"
"A rescan will be automatically started now.\n"
msgstr ""
-"Keine Änderungen zu übertragen.\n"
+"Keine Änderungen einzutragen.\n"
"\n"
-"Es gibt keine geänderte Datei bei dieser Übertragung und es wurde auch "
-"nichts zusammengeführt.\n"
+"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts zusammengeführt.\n"
"\n"
"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
#: lib/commit.tcl:286
msgid "No changes to commit."
-msgstr "Keine Änderungen, die übertragen werden können."
+msgstr "Keine Änderungen, die eingetragen werden können."
#: lib/commit.tcl:317
msgid "commit-tree failed:"
@@ -1024,8 +1017,7 @@ msgstr "Warnung"
#: lib/error.tcl:81
msgid "You must correct the above errors before committing."
-msgstr ""
-"Sie müssen die obigen Fehler zuerst beheben, bevor Sie übertragen können."
+msgstr "Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
#: lib/index.tcl:364
#, tcl-format
@@ -1054,8 +1046,7 @@ msgid ""
msgstr ""
"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n"
"\n"
-"Sie müssen zuerst die Nachbesserungs-Übertragung abschließen, bevor Sie "
-"zusammenführen können.\n"
+"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie zusammenführen können.\n"
#: lib/merge.tcl:27
msgid ""
@@ -1085,10 +1076,7 @@ msgid ""
msgstr ""
"Zusammenführung mit Konflikten.\n"
"\n"
-"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese "
-"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder "
-"bereitstellen und übertragen, um die Zusammenführung abzuschließen. Erst "
-"danach kann eine neue Zusammenführung begonnen werden.\n"
+"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst danach kann eine neue Zusammenführung begonnen werden.\n"
#: lib/merge.tcl:54
#, tcl-format
@@ -1102,10 +1090,7 @@ msgid ""
msgstr ""
"Es liegen Änderungen vor.\n"
"\n"
-"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte "
-"Übertragung abschließen, bevor Sie eine Zusammenführung beginnen. Mit "
-"dieser Reihenfolge können Sie mögliche Konflikte beim Zusammenführen "
-"wesentlich einfacher beheben oder abbrechen.\n"
+"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich einfacher beheben oder abbrechen.\n"
#: lib/merge.tcl:106
#, tcl-format
@@ -1142,7 +1127,7 @@ msgid ""
msgstr ""
"Abbruch der Nachbesserung ist nicht möglich.\n"
"\n"
-"Sie müssen die Nachbesserung der Übertragung abschließen.\n"
+"Sie müssen die Nachbesserung der Version abschließen.\n"
#: lib/merge.tcl:222
msgid ""
@@ -1154,7 +1139,7 @@ msgid ""
msgstr ""
"Zusammenführen abbrechen?\n"
"\n"
-"Wenn Sie abbrechen, gehen alle noch nicht übertragenen Änderungen verloren.\n"
+"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen verloren.\n"
"\n"
"Zusammenführen jetzt abbrechen?"
@@ -1168,8 +1153,7 @@ msgid ""
msgstr ""
"Änderungen zurücksetzen?\n"
"\n"
-"Wenn Sie zurücksetzen, gehen alle noch nicht übertragenen Änderungen "
-"verloren.\n"
+"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen verloren.\n"
"\n"
"Änderungen jetzt zurücksetzen?"
@@ -1216,7 +1200,7 @@ msgstr "E-Mail-Adresse"
#: lib/option.tcl:188
msgid "Summarize Merge Commits"
-msgstr "Zusammenführungs-Übertragungen zusammenfassen"
+msgstr "Zusammenführungs-Versionen zusammenfassen"
#: lib/option.tcl:189
msgid "Merge Verbosity"
@@ -1291,10 +1275,7 @@ msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden."
msgid ""
"One or more of the merge tests failed because you have not fetched the "
"necessary commits. Try fetching from %s first."
-msgstr ""
-"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die "
-"notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, "
-"zuerst von »%s« anzufordern."
+msgstr "Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, zuerst von »%s« anzufordern."
#: lib/remote_branch_delete.tcl:207
msgid "Please select one or more branches to delete."
--
1.5.3.rc2.6.g40240
^ permalink raw reply related
* [PATCH 2/4] git-gui i18n: Update German glossary according to mailing list discussion.
From: Christian Stimming @ 2007-10-05 20:39 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Shawn Pearce, git
In-Reply-To: <200710052239.02492.stimming@tuhh.de>
Signed-off-by: Christian Stimming <stimming@tuhh.de>
---
po/glossary/de.po | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/po/glossary/de.po b/po/glossary/de.po
index aab3b22..054cf4d 100644
--- a/po/glossary/de.po
+++ b/po/glossary/de.po
@@ -6,7 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: git-gui glossary\n"
-"PO-Revision-Date: 2007-07-26 14:45+0200\n"
+"POT-Creation-Date: 2007-10-05 22:30+0200\n"
+"PO-Revision-Date: 2007-10-05 22:32+0200\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
@@ -19,11 +20,17 @@ msgid ""
msgstr ""
"Deutsche Übersetzung.\n"
"Andere deutsche SCM:\n"
-" http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po (username=guest, password empty, gut),\n"
-" http://msdn.microsoft.com/de-de/library/ms181038(vs.80).aspx (MS Visual Source Safe, kommerziell),\n"
-" http://cvsbook.red-bean.com/translations/german/Kap_06.html (mittelmäßig),\n"
-" http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/de_DE.po?view=markup (mittelmäßig),\n"
-" http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po (username=guest, password empty, schlecht)"
+" http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://"
+"tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po "
+"(username=guest, password empty, gut),\n"
+" http://msdn.microsoft.com/de-de/library/ms181038(vs.80).aspx (MS Visual "
+"Source Safe, kommerziell),\n"
+" http://cvsbook.red-bean.com/translations/german/Kap_06.html "
+"(mittelmäßig),\n"
+" http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/de_DE.po?"
+"view=markup (mittelmäßig),\n"
+" http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po "
+"(username=guest, password empty, schlecht)"
#. ""
msgid "amend"
@@ -43,19 +50,31 @@ msgstr "verzweigen"
#. ""
msgid "checkout [noun]"
-msgstr "Auscheck? Ausspielung? Abruf? (Source Safe: Auscheckvorgang)"
+msgstr ""
+"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? "
+"Source Safe: Auscheckvorgang)"
#. "The action of updating the working tree to a revision which was stored in the object database."
msgid "checkout [verb]"
-msgstr "auschecken? ausspielen? abrufen? (Source Safe: auschecken)"
+msgstr ""
+"Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? "
+"ausspielen? abrufen? Source Safe: auschecken)"
+
+#. ""
+msgid "clone [verb]"
+msgstr "kopieren"
#. "A single point in the git history."
msgid "commit [noun]"
-msgstr "Übertragung (Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)"
+msgstr ""
+"Version; Eintragung; Änderung (Buchung?, Eintragung?, Übertragung?, "
+"Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)"
#. "The action of storing a new snapshot of the project's state in the git history."
msgid "commit [verb]"
-msgstr "übertragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, übergeben?, einspielen?, einpflegen?, ablegen?)"
+msgstr ""
+"eintragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, "
+"übergeben?, einspielen?, einpflegen?, ablegen?)"
#. ""
msgid "diff [noun]"
@@ -87,7 +106,11 @@ msgstr "zusammenführen"
#. ""
msgid "message"
-msgstr "Meldung (Nachricht?; Source Safe: Kommentar)"
+msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
+
+#. ""
+msgid "prune"
+msgstr "löschen"
#. "Pulling a branch means to fetch it and merge it."
msgid "pull"
--
1.5.3.rc2.6.g40240
^ permalink raw reply related
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