* Re: [TopGit PATCH] tg patch: disable pager and colors for git-diff
From: Petr Baudis @ 2008-11-20 15:07 UTC (permalink / raw)
To: Jonas Fonseca; +Cc: madduck, git
In-Reply-To: <2c6b72b30811200655o770efd63u4101f44683f2bc0d@mail.gmail.com>
On Thu, Nov 20, 2008 at 03:55:47PM +0100, Jonas Fonseca wrote:
> On Thu, Nov 20, 2008 at 15:34, Petr Baudis <pasky@suse.cz> wrote:
> > On Thu, Nov 20, 2008 at 02:57:10PM +0100, Jonas Fonseca wrote:
> >> When output is not redirected to a file, git brings up the pager for
> >> only the diff, which can be confusing, so disable with --no-pager.
> >> git-diff is a porcelain command and thus subject to color options. Use
> >> --no-color, to avoid the patch being corrupted with terminal escape
> >> characters when color.diff=always.
> >>
> >> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
> >
> > I still don't understand how did that color thing happen - shouldn't
> > git diff avoid spewing out colors when the output is not a tty? And when
> > it is, I want the colors myself, too.
>
> As I wrote in the commit message, git diff always spews out colors
> with color.diff=always. This was what I for experimental reasons had
> in my .git/config (and forgotten all about) before sending the README
> update patch. Topgit could check the git color configuration but that
> seems more hacky.
This shows just that color.diff=always is asking for trouble. ;-)
I think we shouldn't try to outsmart the user if they _force_ that they
really always want the colors.
--
Petr "Pasky" Baudis
People who take cold baths never have rheumatism, but they have
cold baths.
^ permalink raw reply
* Re: [TopGit PATCH] tg patch: disable pager and colors for git-diff
From: Jonas Fonseca @ 2008-11-20 14:55 UTC (permalink / raw)
To: Petr Baudis; +Cc: madduck, git
In-Reply-To: <20081120143455.GH10544@machine.or.cz>
On Thu, Nov 20, 2008 at 15:34, Petr Baudis <pasky@suse.cz> wrote:
> On Thu, Nov 20, 2008 at 02:57:10PM +0100, Jonas Fonseca wrote:
>> When output is not redirected to a file, git brings up the pager for
>> only the diff, which can be confusing, so disable with --no-pager.
>> git-diff is a porcelain command and thus subject to color options. Use
>> --no-color, to avoid the patch being corrupted with terminal escape
>> characters when color.diff=always.
>>
>> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
>
> I still don't understand how did that color thing happen - shouldn't
> git diff avoid spewing out colors when the output is not a tty? And when
> it is, I want the colors myself, too.
As I wrote in the commit message, git diff always spews out colors
with color.diff=always. This was what I for experimental reasons had
in my .git/config (and forgotten all about) before sending the README
update patch. Topgit could check the git color configuration but that
seems more hacky.
> Good point with the --no-pager, but in that case, tg patch itself should
> by default invoke the pager, since it really is very desirable.
Yes, probably.
--
Jonas Fonseca
^ permalink raw reply
* Re: [PATCH] Allow help/--help/-h to be run outside of a TopGit repo
From: martin f krafft @ 2008-11-20 14:55 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
In-Reply-To: <20081120142702.GG10491@machine.or.cz>
[-- Attachment #1: Type: text/plain, Size: 844 bytes --]
also sprach Petr Baudis <pasky@suse.cz> [2008.11.20.1527 +0100]:
> Why is this so complicated? Can't you just do_help from
> should_do_help()?
Yes, I could, but that would be in conflict with my understanding of
the Law of Demeter.
> The overall semantics seems strange anyway, though - it seems that
> 'tg mail --help -r' will try to show help for '-r' instead of
> 'mail'.
True, but then we are parsing command lines. Would you be opposed to
a getopt (POSIX) approach to normalising/parsing the command line?
Cheers,
--
.''`. martin f. krafft <madduck@debian.org>
: :' : proud Debian developer, author, administrator, and user
`. `'` http://people.debian.org/~madduck - http://debiansystem.info
`- Debian - when you have better things to do than fixing systems
this space intentionally left occupied.
[-- Attachment #2: Digital signature (see http://martin-krafft.net/gpg/) --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: git and mtime
From: Andreas Ericsson @ 2008-11-20 14:50 UTC (permalink / raw)
To: Roger Leigh; +Cc: Christian MICHON, git
In-Reply-To: <20081120141533.GC6023@codelibre.net>
Roger Leigh wrote:
> On Thu, Nov 20, 2008 at 02:06:13PM +0100, Andreas Ericsson wrote:
>> Roger Leigh wrote:
>>> On Wed, Nov 19, 2008 at 05:18:16PM +0100, Christian MICHON wrote:
>>>> On Wed, Nov 19, 2008 at 12:37 PM, Roger Leigh <rleigh@codelibre.net> wrote:
>>>>> Would it be possible for git to store the mtime of files in the tree?
>>>>>
>>>>> This would make it possible to do this type of work in git, since it's
>>>>> currently a bit random as to whether it works or not. This only
>>>>> started when I upgraded to an amd64 architecture from powerpc32,
>>>>> I guess it's maybe using high-resolution timestamps.
>>>>>
>>>> beside the obvious answer it comes back often as a request, it is
>>>> possible in theory to create a shell script which, for each file
>>>> present in the sandbox in the current branch, would find the mtime of
>>>> the last commit on that file (quite an expensive operation) and apply
>>>> it.
>>> Surely this is only expensive because you're not already storing the
>>> information in the tree; if it was there, it would be (relatively)
>>> cheap?
>> No, it's because git is *snapshot* based and doesn't care about anything
>> but contents. Storing filestate information in the tree would be a
>> backwards incompatible change that would require a major version change.
>
> It's not strictly true that it's only caring about contents. The
> contents are of course in the blobs, but the tree is already
> effectively storing inode data, since it's a directory of
> filenames/subtrees, just one that only cares to store the
> permissions part of the total inode data.
>
> I understand that git stored the permissions tacked onto the hash;
> would it be feasable to tack on the other bits as well.
No, that would break backwards compatibility with cross-repo
transfers.
> If I understand correctly, it's binary encoded in the pack format,
> and that would require updating the format to hold the additional
> data?
>
>> Caring about meta-data the way you mean it would mean that
>>
>> git add foo.c; git commit -m "kapooie"; touch foo.c; git status
>>
>> would show "foo.c" as modified. How sane is that?
>
> I've never come close to suggesting we do anything so insane.
>
> What I am suggesting is that on add/commit, the inode metadata
> be recorded in the tree (like we already store perms), so that
> it can be (**optionally**) reused/restored on checkout.
>
> Whether it's stored in the tree or not is a separate concern from
> whether to *use* it or not. For most situations, it won't be
> useful, as has been made quite clear from all of the replies, and I
> don't disagree with this. However, for some, the ability to have
> this information to hand to make use of would be invaluable.
>
Then write a hook for it. You agree that for most users this will be
totally insane, and yet you request that it's added in a place where
everyone will have to pay the performance/diskspace penalty for it
but only a handful will get any benefits. That's patently absurd.
Especially since there are such easy workarounds that you can put in
place yourself instead.
>
> There have been quite a few suggestions to look into using hooks,
> and I'll investigate this. However, I do have some concerns
> about *where* I would store this "extended tree" data, since it
> is implicitly tied to a single tree object, and I wouldn't
> want to store it directly as content.
>
Store it as a blob targeted by a lightweight tag named
"metadata.$sha1" and you'll have the easiest time in the world when
writing the hooks. Also, the tags won't be propagated by default,
which is a good thing since your timestamps/uid's whatever almost
certainly will not work well on other developers repositories.
That's what I'd do anyways.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ permalink raw reply
* Re: [PATCH v2] Updated Swedish translation (514t0f0u).
From: Andreas Ericsson @ 2008-11-20 14:43 UTC (permalink / raw)
To: Peter Krefting; +Cc: Shawn O. Pearce, Git Mailing List, Mikael Magnusson
In-Reply-To: <Pine.LNX.4.64.0811201423291.1606@ds9.cixit.se>
Peter Krefting wrote:
> ---
>
>>> +msgid "Blame History Context Radius (days)"
>>> +msgstr "Historikkontextradie för klandring (dagar)"
>> At least a 100 points in scrabble for "historikkontextradie". How about
>> "Historikradie för klandring (dagar)"?
>
> I struggled with this one. I still haven't got the faintest clue what
> it is all about, but I have changed it as you suggested...
>
I *think* it's about how many days to go back when viewing blame output
for the selected file. Shawn, can you enlighten us here?
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ permalink raw reply
* Re: [TopGit PATCH] tg patch: disable pager and colors for git-diff
From: Petr Baudis @ 2008-11-20 14:34 UTC (permalink / raw)
To: Jonas Fonseca; +Cc: madduck, git
In-Reply-To: <20081120135710.GA16303@diku.dk>
On Thu, Nov 20, 2008 at 02:57:10PM +0100, Jonas Fonseca wrote:
> When output is not redirected to a file, git brings up the pager for
> only the diff, which can be confusing, so disable with --no-pager.
> git-diff is a porcelain command and thus subject to color options. Use
> --no-color, to avoid the patch being corrupted with terminal escape
> characters when color.diff=always.
>
> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
I still don't understand how did that color thing happen - shouldn't
git diff avoid spewing out colors when the output is not a tty? And when
it is, I want the colors myself, too.
Good point with the --no-pager, but in that case, tg patch itself should
by default invoke the pager, since it really is very desirable.
--
Petr "Pasky" Baudis
People who take cold baths never have rheumatism, but they have
cold baths.
^ permalink raw reply
* Re: [PATCH] Allow help/--help/-h to be run outside of a TopGit repo
From: Petr Baudis @ 2008-11-20 14:27 UTC (permalink / raw)
To: martin f. krafft; +Cc: git
In-Reply-To: <1227181594-15123-1-git-send-email-madduck@debian.org>
On Thu, Nov 20, 2008 at 12:46:34PM +0100, martin f. krafft wrote:
> The user ought to be able to call `tg help` from anywhere in the filesystem,
> not just Git repositories, so the help parsing has to happen before the calls
> to git git binary.
>
> Debian bug: #501982
>
> Signed-off-by: martin f. krafft <madduck@debian.org>
>
> ---
> tg.sh | 28 +++++++++++++++++++++++++---
> 1 files changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/tg.sh b/tg.sh
> index 4dcc15e..258f8ce 100644
> --- a/tg.sh
> +++ b/tg.sh
> @@ -235,12 +235,37 @@ do_help()
> fi
> }
>
> +# Check whether we are supposed to output the help message
> +should_do_help()
> +{
> + # we are being sourced for utility functions, never run help
> + [ -z "$tg__include" ] || return 1
> +
> + local prev
> + while [ -n "$1" ]; do
> + case "$1" in
> + help|--help|-h)
> + shift
> + echo "${1:-$prev}"
> + return 0
> + esac
> + prev="$1"
> + shift
> + done
> +
> + # run help when there was no previous topic, meaning that there where
> + # no arguments at all
> + test -z "$prev"
> +}
>
> ## Startup
>
> [ -d "@cmddir@" ] ||
> die "No command directory: '@cmddir@'"
>
> +# check if we should run help and get the topic while we're at it
> +help_topic="$(should_do_help "$@")" && { do_help "$help_topic"; exit 0; }
> +
Why is this so complicated? Can't you just do_help from
should_do_help()? The overall semantics seems strange anyway, though -
it seems that 'tg mail --help -r' will try to show help for '-r' instead
of 'mail'.
--
Petr "Pasky" Baudis
People who take cold baths never have rheumatism, but they have
cold baths.
^ permalink raw reply
* Re: [TopGit PATCH] README: Fix spelling
From: Jonas Fonseca @ 2008-11-20 14:23 UTC (permalink / raw)
To: martin f krafft; +Cc: git
In-Reply-To: <20081120141725.GB25425@piper.oerlikon.madduck.net>
On Thu, Nov 20, 2008 at 15:17, martin f krafft <madduck@debian.org> wrote:
> also sprach Jonas Fonseca <jonas.fonseca@gmail.com> [2008.11.20.1452 +0100]:
>> Oops sorry about this one!!! :-/
>
> What about it? The patch seems perfectly alright. Only the quoted
> version is broken, which I think is your fault.
Well, it looks very broken in Gmail ...
> Should I apply the README patch?
Yes, if you can salvage it. Else it is also available in branch
jf/readme-update at
git://repo.or.cz/topgit/fonseca.git
--
Jonas Fonseca
^ permalink raw reply
* Re: git and mtime
From: Roger Leigh @ 2008-11-20 14:22 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: martin f krafft, git
In-Reply-To: <alpine.DEB.1.00.0811201506390.30769@pacific.mpi-cbg.de>
On Thu, Nov 20, 2008 at 03:07:46PM +0100, Johannes Schindelin wrote:
> Hi,
>
> On Thu, 20 Nov 2008, Roger Leigh wrote:
>
> > They are optional build depdendencies. They are provided pre-built, and
> > won't be rebuilt unless they get outdated. In the release tarball, the
> > timestamps are correct, ensuring this never happens. When checking out
> > with git, the timestamps are incorrect, and it attempts to rebuild
> > something that's *already built*.
>
> I'll try just one more time. Why don't you teach your build process to
> check if the generated files can be generated, and if not, fall back to
> the committed ones?
Well, it's definitely not a good idea to try rebuilding when the tools
aren't available, and I'll update the Makefiles to only attempt a
rebuild when this is the case. So yes, making the build a bit more
intelligent is definitely something to do. However, this is really
a separate issue, since the repo dates back eight years, and I don't
want to break older stuff. This will only fix things for the future.
Regards,
Roger
--
.''`. Roger Leigh
: :' : Debian GNU/Linux http://people.debian.org/~rleigh/
`. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/
`- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
^ permalink raw reply
* Re: [TopGit PATCH] README: Fix spelling
From: martin f krafft @ 2008-11-20 14:17 UTC (permalink / raw)
To: Jonas Fonseca; +Cc: git
In-Reply-To: <2c6b72b30811200552h46004299w881ad61134ec5555@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
also sprach Jonas Fonseca <jonas.fonseca@gmail.com> [2008.11.20.1452 +0100]:
> Oops sorry about this one!!! :-/
What about it? The patch seems perfectly alright. Only the quoted
version is broken, which I think is your fault.
Should I apply the README patch?
--
.''`. martin f. krafft <madduck@debian.org>
: :' : proud Debian developer, author, administrator, and user
`. `'` http://people.debian.org/~madduck - http://debiansystem.info
`- Debian - when you have better things to do than fixing systems
a Hooloovoo is a superintelligent shade of the color blue.
-- douglas adams, "the hitchhiker's guide to the galaxy"
[-- Attachment #2: Digital signature (see http://martin-krafft.net/gpg/) --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: git and mtime
From: Roger Leigh @ 2008-11-20 14:15 UTC (permalink / raw)
To: Andreas Ericsson; +Cc: Christian MICHON, git
In-Reply-To: <492560C5.5070308@op5.se>
On Thu, Nov 20, 2008 at 02:06:13PM +0100, Andreas Ericsson wrote:
> Roger Leigh wrote:
>> On Wed, Nov 19, 2008 at 05:18:16PM +0100, Christian MICHON wrote:
>>> On Wed, Nov 19, 2008 at 12:37 PM, Roger Leigh <rleigh@codelibre.net> wrote:
>>>> Would it be possible for git to store the mtime of files in the tree?
>>>>
>>>> This would make it possible to do this type of work in git, since it's
>>>> currently a bit random as to whether it works or not. This only
>>>> started when I upgraded to an amd64 architecture from powerpc32,
>>>> I guess it's maybe using high-resolution timestamps.
>>>>
>>> beside the obvious answer it comes back often as a request, it is
>>> possible in theory to create a shell script which, for each file
>>> present in the sandbox in the current branch, would find the mtime of
>>> the last commit on that file (quite an expensive operation) and apply
>>> it.
>>
>> Surely this is only expensive because you're not already storing the
>> information in the tree; if it was there, it would be (relatively)
>> cheap?
>
> No, it's because git is *snapshot* based and doesn't care about anything
> but contents. Storing filestate information in the tree would be a
> backwards incompatible change that would require a major version change.
It's not strictly true that it's only caring about contents. The
contents are of course in the blobs, but the tree is already
effectively storing inode data, since it's a directory of
filenames/subtrees, just one that only cares to store the
permissions part of the total inode data.
I understand that git stored the permissions tacked onto the hash;
would it be feasable to tack on the other bits as well.
If I understand correctly, it's binary encoded in the pack format,
and that would require updating the format to hold the additional
data?
> Caring about meta-data the way you mean it would mean that
>
> git add foo.c; git commit -m "kapooie"; touch foo.c; git status
>
> would show "foo.c" as modified. How sane is that?
I've never come close to suggesting we do anything so insane.
What I am suggesting is that on add/commit, the inode metadata
be recorded in the tree (like we already store perms), so that
it can be (**optionally**) reused/restored on checkout.
Whether it's stored in the tree or not is a separate concern from
whether to *use* it or not. For most situations, it won't be
useful, as has been made quite clear from all of the replies, and I
don't disagree with this. However, for some, the ability to have
this information to hand to make use of would be invaluable.
There have been quite a few suggestions to look into using hooks,
and I'll investigate this. However, I do have some concerns
about *where* I would store this "extended tree" data, since it
is implicitly tied to a single tree object, and I wouldn't
want to store it directly as content.
Regards,
Roger
--
.''`. Roger Leigh
: :' : Debian GNU/Linux http://people.debian.org/~rleigh/
`. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/
`- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
^ permalink raw reply
* Re: git and mtime
From: martin f krafft @ 2008-11-20 13:59 UTC (permalink / raw)
To: Roger Leigh, git
In-Reply-To: <20081120133546.GA6023@codelibre.net>
[-- Attachment #1: Type: text/plain, Size: 848 bytes --]
also sprach Roger Leigh <rleigh@codelibre.net> [2008.11.20.1435 +0100]:
> By end user, I mean person downloading and building the sources.
>
> They are optional build depdendencies. They are provided pre-built,
> and won't be rebuilt unless they get outdated. In the release
> tarball, the timestamps are correct, ensuring this never happens.
> When checking out with git, the timestamps are incorrect, and it
> attempts to rebuild something that's *already built*.
I know you will hate me, but I think the solution here is to fix the
toolchain and make those build dependencies required.
--
martin | http://madduck.net/ | http://two.sentenc.es/
"first get your facts; then you can distort them at your leisure."
-- mark twain
spamtraps: madduck.bogus@madduck.net
[-- Attachment #2: Digital signature (see http://martin-krafft.net/gpg/) --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: git and mtime
From: Johannes Schindelin @ 2008-11-20 14:07 UTC (permalink / raw)
To: Roger Leigh; +Cc: martin f krafft, git
In-Reply-To: <20081120133546.GA6023@codelibre.net>
Hi,
On Thu, 20 Nov 2008, Roger Leigh wrote:
> They are optional build depdendencies. They are provided pre-built, and
> won't be rebuilt unless they get outdated. In the release tarball, the
> timestamps are correct, ensuring this never happens. When checking out
> with git, the timestamps are incorrect, and it attempts to rebuild
> something that's *already built*.
I'll try just one more time. Why don't you teach your build process to
check if the generated files can be generated, and if not, fall back to
the committed ones?
Ciao,
Dscho
^ permalink raw reply
* [TopGit PATCH] Add Vim modelines for consistent spacing
From: martin f. krafft @ 2008-11-20 13:59 UTC (permalink / raw)
To: git, pasky; +Cc: martin f. krafft
TopGit shell scripts use sw=8:ts=8:noet and to ensure that everyone complies,
these modelines configure Vim on open.
Signed-off-by: martin f. krafft <madduck@debian.org>
---
create-help.sh | 1 +
tg-create.sh | 2 ++
tg-delete.sh | 2 ++
tg-depend.sh | 2 ++
tg-export.sh | 2 ++
tg-import.sh | 2 ++
tg-info.sh | 2 ++
tg-mail.sh | 2 ++
tg-patch.sh | 2 ++
tg-remote.sh | 2 ++
tg-summary.sh | 2 ++
tg-update.sh | 2 ++
tg.sh | 2 ++
13 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/create-help.sh b/create-help.sh
index 766e8d4..8324b2a 100755
--- a/create-help.sh
+++ b/create-help.sh
@@ -15,3 +15,4 @@ fi
{ if (incommand) { print $0; } }
' > tg-"$1".txt
+# vim:sw=8:ts=8:noet
diff --git a/tg-create.sh b/tg-create.sh
index 6ee3f02..677c19d 100644
--- a/tg-create.sh
+++ b/tg-create.sh
@@ -141,3 +141,5 @@ git add -f "$root_dir/.topmsg"
info "Topic branch $name set up. Please fill .topmsg now and make initial commit."
info "To abort: git rm -f .top* && git checkout ${deps%% *} && $tg delete $name"
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-delete.sh b/tg-delete.sh
index 7f7ede7..37f4bac 100644
--- a/tg-delete.sh
+++ b/tg-delete.sh
@@ -44,3 +44,5 @@ branch_empty "$name" || nonempty=1
git update-ref -d "refs/top-bases/$name" "$baserev"
git update-ref -d "refs/heads/$name" "$branchrev"
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-depend.sh b/tg-depend.sh
index ff4541c..4539188 100644
--- a/tg-depend.sh
+++ b/tg-depend.sh
@@ -47,3 +47,5 @@ echo "$name" >>"$root_dir/.topdeps"
git add -f "$root_dir/.topdeps"
git commit -m"New TopGit dependency: $name"
$tg update
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-export.sh b/tg-export.sh
index 52af88d..73a6ec8 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -199,3 +199,5 @@ elif [ "$driver" = "quilt" ]; then
depcount="$(cat "$output/series" | wc -l)"
echo "Exported topic branch $name (total $depcount topics) to directory $output"
fi
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-import.sh b/tg-import.sh
index b036b86..5c0484c 100644
--- a/tg-import.sh
+++ b/tg-import.sh
@@ -116,3 +116,5 @@ do
esac
done
done
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-info.sh b/tg-info.sh
index 9076247..6ae55c3 100644
--- a/tg-info.sh
+++ b/tg-info.sh
@@ -73,3 +73,5 @@ else
echo "Up-to-date."
fi
rm "$depcheck"
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-mail.sh b/tg-mail.sh
index 7b8f7ff..4d23a0e 100644
--- a/tg-mail.sh
+++ b/tg-mail.sh
@@ -55,3 +55,5 @@ people=
eval git send-email $send_email_args "$people" "$patchfile"
rm "$patchfile"
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-patch.sh b/tg-patch.sh
index 97338ab..220a0b0 100644
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -44,3 +44,5 @@ echo '-- '
echo "tg: ($base_rev..) $name (depends on: $(git cat-file blob "$name:.topdeps" | paste -s -d' '))"
branch_contains "$name" "$base_rev" ||
echo "tg: The patch is out-of-date wrt. the base! Run \`$tg update\`."
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-remote.sh b/tg-remote.sh
index 4f60c73..2a9c4a0 100644
--- a/tg-remote.sh
+++ b/tg-remote.sh
@@ -59,3 +59,5 @@ git for-each-ref "refs/remotes/$name/top-bases" |
git config "topgit.remote" "$name"
info "The remote '$name' is now the default source of topic branches."
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-summary.sh b/tg-summary.sh
index 3c90a6b..c165d19 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -98,3 +98,5 @@ git for-each-ref refs/top-bases |
if [ -n "$graphviz" ]; then
echo '}'
fi
+
+# vim:sw=8:ts=8:noet
diff --git a/tg-update.sh b/tg-update.sh
index 040800d..1114b7d 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -142,3 +142,5 @@ if ! git merge "$merge_with"; then
fi
exit 3
fi
+
+# vim:sw=8:ts=8:noet
diff --git a/tg.sh b/tg.sh
index 4dcc15e..137fef4 100644
--- a/tg.sh
+++ b/tg.sh
@@ -283,3 +283,5 @@ help|--help|-h)
}
. "@cmddir@"/tg-$cmd;;
esac
+
+# vim:sw=8:ts=8:noet
--
tg: (f17218e..) features/vim-modelines (depends on: upstream)
^ permalink raw reply related
* [TopGit PATCH] tg patch: disable pager and colors for git-diff
From: Jonas Fonseca @ 2008-11-20 13:57 UTC (permalink / raw)
To: madduck; +Cc: git
In-Reply-To: <1227189062-11951-1-git-send-email-fonseca@diku.dk>
When output is not redirected to a file, git brings up the pager for
only the diff, which can be confusing, so disable with --no-pager.
git-diff is a porcelain command and thus subject to color options. Use
--no-color, to avoid the patch being corrupted with terminal escape
characters when color.diff=always.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---
tg-patch.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Jonas Fonseca <fonseca@diku.dk> wrote Thu, Nov 20, 2008:
> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
>
> ---
> README^[[m | 11 ^[[32m+++++^[[m^[[31m------^[[m
> 1 files changed, 5 insertions(+), 6 deletions(-)^[[m
>
> ^[[1mdiff --git a/README b/README^[[m
> ^[[1mindex 5bfe3ee..9e291da 100644^[[m
> ^[[1m--- a/README^[[m
> ^[[1m+++ b/README^[[m
I hope this demonstrates the point of this patch. ;)
diff --git a/tg-patch.sh b/tg-patch.sh
index 97338ab..c2f1b56 100644
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -34,7 +34,7 @@ git diff-tree --name-only "$base_rev" "$name" |
fgrep -vx ".topdeps" |
fgrep -vx ".topmsg" >"$git_is_stupid" || : # fgrep likes to fail randomly?
if [ -s "$git_is_stupid" ]; then
- cat "$git_is_stupid" | xargs git diff --patch-with-stat "$base_rev" "$name" --
+ cat "$git_is_stupid" | xargs git --no-pager diff --no-color --patch-with-stat "$base_rev" "$name" --
else
echo "No changes."
fi
--
tg: (f17218e..) jf/patch-no-pager-and-color (depends on: master)
--
Jonas Fonseca
^ permalink raw reply related
* Re: [TopGit PATCH] README: Fix spelling
From: Jonas Fonseca @ 2008-11-20 13:52 UTC (permalink / raw)
To: madduck; +Cc: git
In-Reply-To: <1227189062-11951-1-git-send-email-fonseca@diku.dk>
Oops sorry about this one!!! :-/
On Thu, Nov 20, 2008 at 14:51, Jonas Fonseca <fonseca@diku.dk> wrote:
> Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
>
> ---
> README [m | 11 [32m+++++ [m [31m------ [m
> 1 files changed, 5 insertions(+), 6 deletions(-) [m
>
> [1mdiff --git a/README b/README [m
> [1mindex 5bfe3ee..9e291da 100644 [m
> [1m--- a/README [m
> [1m+++ b/README [m
> [36m@@ -22,7 +22,7 @@ version control of patches (reordering of patches is not [m
> version-controlled at all). But there are several disadvantages - [m
> for one, these tools (especially StGIT) do not actually fit well [m
> with plain Git at all: it is basically impossible to take advantage [m
> [31m-of the index efectively when using StGIT. But more importantly, [m
> [32m+ [m [32mof the index effectively when using StGIT. But more importantly, [m
> these tools horribly fail in the face of distributed environment. [m
> [m
> TopGit has been designed around three main tenets: [m
> [36m@@ -45,7 +45,7 @@ them. [m
> [m
> As mentioned above, the main intended use-case for TopGit is tracking [m
> third-party patches, where each patch is effectively a single topic [m
> [31m-branch. In order to flexibly accomodate even complex scenarios when [m
> [32m+ [m [32mbranch. In order to flexibly accommodate even complex scenarios when [m
> you track many patches where many are independent but some depend [m
> on others, TopGit ignores the ancient Quilt heritage of patch series [m
> and instead allows the patches to freely form graphs (DAGs just like [m
> [36m@@ -222,7 +222,7 @@ tg create [m
> [m
> After `tg create`, you should insert the patch description [m
> to the '.topmsg' file, which will already contain some [m
> [31m- pre-filled bits. You can set topgit.to, topgit.cc and topgit.bcc [m
> [32m+ [m [32mprefilled bits. You can set topgit.to, topgit.cc and topgit.bcc [m
> configuration variables in order to have `tg create` [m
> add these headers with given default values to '.topmsg'. [m
> [m
> [36m@@ -350,7 +350,7 @@ tg export [m
> in the cleaned up history (corresponding basically exactly [m
> to `tg patch` output for the topic branch). [m
> [m
> [31m- The command has two posible outputs now - either a Git branch [m
> [32m+ [m [32mThe command has two possible outputs now - either a Git branch [m
> with the collapsed history, or a quilt series in new directory. [m
> [m
> In case of producing collapsed history in new branch, [m
> [36m@@ -455,7 +455,6 @@ tg update [m
> [m
> TODO: tg update -a for updating all topic branches [m
> [m
> [31m-TODO: tg depend for adding/removing dependencies smoothly [m
> TODO: tg rename [m
> [m
> [m
> [36m@@ -485,7 +484,7 @@ whatever Cc headers you choose or the post-three-dashes message. [m
> When mailing out your patch, basically only few extra headers [m
> mail headers are inserted and the patch itself is appended. [m
> Thus, as your patches evolve, you can record nuances like whether [m
> [31m-the paricular patch should have To-list/Cc-maintainer or vice [m
> [32m+ [m [32mthe particular patch should have To-list/Cc-maintainer or vice [m
> versa and similar nuances, if your project is into that. [m
> From is prefilled from your current GIT_AUTHOR_IDENT, other headers [m
> can be prefilled from various optional topgit.* config options. [m
> --
> tg: (f17218e..) jf/readme-update (depends on: master)
>
--
Jonas Fonseca
^ permalink raw reply
* [TopGit PATCH] README: Fix spelling
From: Jonas Fonseca @ 2008-11-20 13:51 UTC (permalink / raw)
To: madduck; +Cc: git
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---
README^[[m | 11 ^[[32m+++++^[[m^[[31m------^[[m
1 files changed, 5 insertions(+), 6 deletions(-)^[[m
^[[1mdiff --git a/README b/README^[[m
^[[1mindex 5bfe3ee..9e291da 100644^[[m
^[[1m--- a/README^[[m
^[[1m+++ b/README^[[m
^[[36m@@ -22,7 +22,7 @@ version control of patches (reordering of patches is not^[[m
version-controlled at all). But there are several disadvantages -^[[m
for one, these tools (especially StGIT) do not actually fit well^[[m
with plain Git at all: it is basically impossible to take advantage^[[m
^[[31m-of the index efectively when using StGIT. But more importantly,^[[m
^[[32m+^[[m^[[32mof the index effectively when using StGIT. But more importantly,^[[m
these tools horribly fail in the face of distributed environment.^[[m
^[[m
TopGit has been designed around three main tenets:^[[m
^[[36m@@ -45,7 +45,7 @@ them.^[[m
^[[m
As mentioned above, the main intended use-case for TopGit is tracking^[[m
third-party patches, where each patch is effectively a single topic^[[m
^[[31m-branch. In order to flexibly accomodate even complex scenarios when^[[m
^[[32m+^[[m^[[32mbranch. In order to flexibly accommodate even complex scenarios when^[[m
you track many patches where many are independent but some depend^[[m
on others, TopGit ignores the ancient Quilt heritage of patch series^[[m
and instead allows the patches to freely form graphs (DAGs just like^[[m
^[[36m@@ -222,7 +222,7 @@ tg create^[[m
^[[m
After `tg create`, you should insert the patch description^[[m
to the '.topmsg' file, which will already contain some^[[m
^[[31m- pre-filled bits. You can set topgit.to, topgit.cc and topgit.bcc^[[m
^[[32m+^[[m ^[[32mprefilled bits. You can set topgit.to, topgit.cc and topgit.bcc^[[m
configuration variables in order to have `tg create`^[[m
add these headers with given default values to '.topmsg'.^[[m
^[[m
^[[36m@@ -350,7 +350,7 @@ tg export^[[m
in the cleaned up history (corresponding basically exactly^[[m
to `tg patch` output for the topic branch).^[[m
^[[m
^[[31m- The command has two posible outputs now - either a Git branch^[[m
^[[32m+^[[m ^[[32mThe command has two possible outputs now - either a Git branch^[[m
with the collapsed history, or a quilt series in new directory.^[[m
^[[m
In case of producing collapsed history in new branch,^[[m
^[[36m@@ -455,7 +455,6 @@ tg update^[[m
^[[m
TODO: tg update -a for updating all topic branches^[[m
^[[m
^[[31m-TODO: tg depend for adding/removing dependencies smoothly^[[m
TODO: tg rename^[[m
^[[m
^[[m
^[[36m@@ -485,7 +484,7 @@ whatever Cc headers you choose or the post-three-dashes message.^[[m
When mailing out your patch, basically only few extra headers^[[m
mail headers are inserted and the patch itself is appended.^[[m
Thus, as your patches evolve, you can record nuances like whether^[[m
^[[31m-the paricular patch should have To-list/Cc-maintainer or vice^[[m
^[[32m+^[[m^[[32mthe particular patch should have To-list/Cc-maintainer or vice^[[m
versa and similar nuances, if your project is into that.^[[m
From is prefilled from your current GIT_AUTHOR_IDENT, other headers^[[m
can be prefilled from various optional topgit.* config options.^[[m
--
tg: (f17218e..) jf/readme-update (depends on: master)
^ permalink raw reply
* Re: [PATCH v2] Updated Swedish translation (514t0f0u).
From: Alexander Gavrilov @ 2008-11-20 13:41 UTC (permalink / raw)
To: Peter Krefting
Cc: Andreas Ericsson, Shawn O. Pearce, Git Mailing List,
Mikael Magnusson
In-Reply-To: <Pine.LNX.4.64.0811201423291.1606@ds9.cixit.se>
On Thu, Nov 20, 2008 at 4:26 PM, Peter Krefting <peter@softwolves.pp.se> wrote:
>
>>> +msgid "Blame History Context Radius (days)"
>>> +msgstr "Historikkontextradie för klandring (dagar)"
>> At least a 100 points in scrabble for "historikkontextradie". How about
>> "Historikradie för klandring (dagar)"?
>
> I struggled with this one. I still haven't got the faintest clue what
> it is all about, but I have changed it as you suggested...
>
It is about the menu item called "Show History Context".
Alexander
^ permalink raw reply
* Re: git and mtime
From: Roger Leigh @ 2008-11-20 13:40 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: Christian MICHON, git
In-Reply-To: <86iqqizgng.fsf@blue.stonehenge.com>
On Thu, Nov 20, 2008 at 05:11:15AM -0800, Randal L. Schwartz wrote:
> >>>>> "Roger" == Roger Leigh <rleigh@codelibre.net> writes:
>
> Roger> Except in this case I'm storing the content of *tarballs* (along with
> Roger> pristine-tar). I'm committing exactly what's in the tarball with
> Roger> no changes (this is a requirement). I can't change the source prior
> Roger> to commit.
>
> If you're not doing distributed source code development, why are you using
> git? It's hard to be angry at a screwdriver for not pounding in nails
> properly.
Err, it *is* being used for distributed development... of Debian
packaging. We track upstream releases on one branch, merge this
periodically onto the master branch containing the Debian packaging
infrastructure, and also have other bits such as a
continually-rebased patches branch to generate quilt patch series
from. I think you'll find we do actually need to use git.
> Sounds like you want rsync or something.
I think not! Perhaps if you read my original mail, you might
understand the reasoning behind this (whether you consider that
valid reasoning or not is another matter).
Regards,
Roger
--
.''`. Roger Leigh
: :' : Debian GNU/Linux http://people.debian.org/~rleigh/
`. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/
`- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
^ permalink raw reply
* Re: git and mtime
From: Roger Leigh @ 2008-11-20 13:35 UTC (permalink / raw)
To: martin f krafft; +Cc: git
In-Reply-To: <20081120132107.GA27571@piper.oerlikon.madduck.net>
On Thu, Nov 20, 2008 at 02:21:07PM +0100, martin f krafft wrote:
> also sprach Roger Leigh <rleigh@codelibre.net> [2008.11.19.1237 +0100]:
> > These are provided by upstream so that end users don't need these tools
> > installed (particularly docbook, since the toolchain is so flaky on
> > different systems). However, the fact that git isn't storing the
> > mtime of the files confuses make, so it then tries to regenerate these
> > (already up-to-date) files, and fails in the process since the tools
> > aren't available.
>
> I don't get it. Why are end users running make in the first place?
> Why aren't those in the build-dependencies?
By end user, I mean person downloading and building the sources.
They are optional build depdendencies. They are provided pre-built,
and won't be rebuilt unless they get outdated. In the release
tarball, the timestamps are correct, ensuring this never happens.
When checking out with git, the timestamps are incorrect, and it
attempts to rebuild something that's *already built*.
Regards,
Roger
--
.''`. Roger Leigh
: :' : Debian GNU/Linux http://people.debian.org/~rleigh/
`. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/
`- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
^ permalink raw reply
* Re: [PATCH v2] Updated Swedish translation (514t0f0u).
From: Peter Krefting @ 2008-11-20 13:26 UTC (permalink / raw)
To: Andreas Ericsson; +Cc: Shawn O. Pearce, Git Mailing List, Mikael Magnusson
In-Reply-To: <49254595.7040103@op5.se>
---
po/sv.po | 1149 +++++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 839 insertions(+), 310 deletions(-)
Andreas Ericsson:
> s/ospårad/ospårade/
Fixed.
> 's/, vill/. Vill/'
Fixed (both).
> Should probably be two sentences in english too.
The English version is shorter, but the short form looked weird in
Swedish.
>> +msgid "Blame History Context Radius (days)"
>> +msgstr "Historikkontextradie för klandring (dagar)"
> At least a 100 points in scrabble for "historikkontextradie". How about
> "Historikradie för klandring (dagar)"?
I struggled with this one. I still haven't got the faintest clue what
it is all about, but I have changed it as you suggested...
> Använd "fjärrarkiv" konsekvent istället. "fjärr" används, såvitt jag
> vet, inte ensamt någonstans i svenska språket, annat än som slang.
I agree. Fixed.
> "Ta bort gren i fjärrarkivet" (fjärrgren är något annat)
Fixed.
> s/Kör/Exekverar/ (upplysning, inte uppmaning)
Well, "kör" is both, but changed as requested.
diff --git a/po/sv.po b/po/sv.po
index 0196ba8..83953d3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,48 +1,48 @@
# Swedish translation of git-gui.
-# Copyright (C) 2007 Shawn Pearce, et al.
+# Copyright (C) 2007-2008 Shawn Pearce, et al.
# This file is distributed under the same license as the git-gui package.
#
-# Peter Karlsson <peter@softwolves.pp.se>, 2007-2008.
+# Peter Krefting <peter@softwolves.pp.se>, 2007-2008.
# Mikael Magnusson <mikachu@gmail.com>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-03 01:34+0200\n"
-"PO-Revision-Date: 2008-08-03 01:45+0200\n"
-"Last-Translator: Mikael Magnusson <mikachu@gmail.com>\n"
+"POT-Creation-Date: 2008-11-16 13:56-0800\n"
+"PO-Revision-Date: 2008-11-20 14:24+0100\n"
+"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\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:688 git-gui.sh:702 git-gui.sh:715 git-gui.sh:798
-#: git-gui.sh:817
+#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
+#: git-gui.sh:866
msgid "git-gui: fatal error"
msgstr "git-gui: ödesdigert fel"
-#: git-gui.sh:644
+#: git-gui.sh:689
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "Ogiltigt teckensnitt angivet i %s:"
-#: git-gui.sh:674
+#: git-gui.sh:723
msgid "Main Font"
msgstr "Huvudteckensnitt"
-#: git-gui.sh:675
+#: git-gui.sh:724
msgid "Diff/Console Font"
msgstr "Diff/konsolteckensnitt"
-#: git-gui.sh:689
+#: git-gui.sh:738
msgid "Cannot find git in PATH."
msgstr "Hittar inte git i PATH."
-#: git-gui.sh:716
+#: git-gui.sh:765
msgid "Cannot parse Git version string:"
msgstr "Kan inte tolka versionssträng från Git:"
-#: git-gui.sh:734
+#: git-gui.sh:783
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -61,380 +61,445 @@ msgstr ""
"\n"
"Anta att \"%s\" är version 1.5.0?\n"
-#: git-gui.sh:972
+#: git-gui.sh:1062
msgid "Git directory not found:"
msgstr "Git-katalogen hittades inte:"
-#: git-gui.sh:979
+#: git-gui.sh:1069
msgid "Cannot move to top of working directory:"
msgstr "Kan inte gå till början på arbetskatalogen:"
-#: git-gui.sh:986
+#: git-gui.sh:1076
msgid "Cannot use funny .git directory:"
msgstr "Kan inte använda underlig .git-katalog:"
-#: git-gui.sh:991
+#: git-gui.sh:1081
msgid "No working directory"
msgstr "Ingen arbetskatalog"
-#: git-gui.sh:1138 lib/checkout_op.tcl:305
+#: git-gui.sh:1247 lib/checkout_op.tcl:305
msgid "Refreshing file status..."
msgstr "Uppdaterar filstatus..."
-#: git-gui.sh:1194
+#: git-gui.sh:1303
msgid "Scanning for modified files ..."
msgstr "Söker efter ändrade filer..."
-#: git-gui.sh:1369 lib/browser.tcl:246
+#: git-gui.sh:1367
+msgid "Calling prepare-commit-msg hook..."
+msgstr "Anropar kroken för förberedning av incheckningsmeddelande (prepare-commit-msg)..."
+
+#: git-gui.sh:1384
+msgid "Commit declined by prepare-commit-msg hook."
+msgstr "Incheckningen avvisades av kroken för förberedning av incheckningsmeddelande (prepare-commit-msg)."
+
+#: git-gui.sh:1542 lib/browser.tcl:246
msgid "Ready."
msgstr "Klar."
-#: git-gui.sh:1635
+#: git-gui.sh:1819
msgid "Unmodified"
msgstr "Oförändrade"
-#: git-gui.sh:1637
+#: git-gui.sh:1821
msgid "Modified, not staged"
msgstr "Förändrade, ej köade"
-#: git-gui.sh:1638 git-gui.sh:1643
+#: git-gui.sh:1822 git-gui.sh:1830
msgid "Staged for commit"
msgstr "Köade för incheckning"
-#: git-gui.sh:1639 git-gui.sh:1644
+#: git-gui.sh:1823 git-gui.sh:1831
msgid "Portions staged for commit"
msgstr "Delar köade för incheckning"
-#: git-gui.sh:1640 git-gui.sh:1645
+#: git-gui.sh:1824 git-gui.sh:1832
msgid "Staged for commit, missing"
msgstr "Köade för incheckning, saknade"
-#: git-gui.sh:1642
+#: git-gui.sh:1826
+msgid "File type changed, not staged"
+msgstr "Filtyp ändrad, ej köade"
+
+#: git-gui.sh:1827
+msgid "File type changed, staged"
+msgstr "Filtyp ändrad, köade"
+
+#: git-gui.sh:1829
msgid "Untracked, not staged"
msgstr "Ej spårade, ej köade"
-#: git-gui.sh:1647
+#: git-gui.sh:1834
msgid "Missing"
msgstr "Saknade"
-#: git-gui.sh:1648
+#: git-gui.sh:1835
msgid "Staged for removal"
msgstr "Köade för borttagning"
-#: git-gui.sh:1649
+#: git-gui.sh:1836
msgid "Staged for removal, still present"
msgstr "Köade för borttagning, fortfarande närvarande"
-#: git-gui.sh:1651 git-gui.sh:1652 git-gui.sh:1653 git-gui.sh:1654
+#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
+#: git-gui.sh:1842 git-gui.sh:1843
msgid "Requires merge resolution"
msgstr "Kräver konflikthantering efter sammanslagning"
-#: git-gui.sh:1689
+#: git-gui.sh:1878
msgid "Starting gitk... please wait..."
msgstr "Startar gitk... vänta..."
-#: git-gui.sh:1698
+#: git-gui.sh:1887
msgid "Couldn't find gitk in PATH"
msgstr "Hittar inte gitk i PATH."
-#: git-gui.sh:1948 lib/choose_repository.tcl:36
+#: git-gui.sh:2280 lib/choose_repository.tcl:36
msgid "Repository"
msgstr "Arkiv"
-#: git-gui.sh:1949
+#: git-gui.sh:2281
msgid "Edit"
msgstr "Redigera"
-#: git-gui.sh:1951 lib/choose_rev.tcl:561
+#: git-gui.sh:2283 lib/choose_rev.tcl:561
msgid "Branch"
msgstr "Gren"
-#: git-gui.sh:1954 lib/choose_rev.tcl:548
+#: git-gui.sh:2286 lib/choose_rev.tcl:548
msgid "Commit@@noun"
msgstr "Incheckning"
-#: git-gui.sh:1957 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
+#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
msgid "Merge"
msgstr "Slå ihop"
-#: git-gui.sh:1958 lib/choose_rev.tcl:557
+#: git-gui.sh:2290 lib/choose_rev.tcl:557
msgid "Remote"
-msgstr "Fjärr"
+msgstr "Fjärrarkiv"
+
+#: git-gui.sh:2293
+msgid "Tools"
+msgstr "Verktyg"
+
+#: git-gui.sh:2302
+msgid "Explore Working Copy"
+msgstr "Utforska arbetskopia"
-#: git-gui.sh:1967
+#: git-gui.sh:2307
msgid "Browse Current Branch's Files"
msgstr "Bläddra i grenens filer"
-#: git-gui.sh:1971
+#: git-gui.sh:2311
msgid "Browse Branch Files..."
msgstr "Bläddra filer på gren..."
-#: git-gui.sh:1976
+#: git-gui.sh:2316
msgid "Visualize Current Branch's History"
msgstr "Visualisera grenens historik"
-#: git-gui.sh:1980
+#: git-gui.sh:2320
msgid "Visualize All Branch History"
msgstr "Visualisera alla grenars historik"
-#: git-gui.sh:1987
+#: git-gui.sh:2327
#, tcl-format
msgid "Browse %s's Files"
msgstr "Bläddra i filer för %s"
-#: git-gui.sh:1989
+#: git-gui.sh:2329
#, tcl-format
msgid "Visualize %s's History"
msgstr "Visualisera historik för %s"
-#: git-gui.sh:1994 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
msgid "Database Statistics"
msgstr "Databasstatistik"
-#: git-gui.sh:1997 lib/database.tcl:34
+#: git-gui.sh:2337 lib/database.tcl:34
msgid "Compress Database"
msgstr "Komprimera databas"
-#: git-gui.sh:2000
+#: git-gui.sh:2340
msgid "Verify Database"
msgstr "Verifiera databas"
-#: git-gui.sh:2007 git-gui.sh:2011 git-gui.sh:2015 lib/shortcut.tcl:7
+#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
msgid "Create Desktop Icon"
msgstr "Skapa skrivbordsikon"
-#: git-gui.sh:2023 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
+#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
msgid "Quit"
msgstr "Avsluta"
-#: git-gui.sh:2031
+#: git-gui.sh:2371
msgid "Undo"
msgstr "Ã…ngra"
-#: git-gui.sh:2034
+#: git-gui.sh:2374
msgid "Redo"
msgstr "Gör om"
-#: git-gui.sh:2038 git-gui.sh:2545
+#: git-gui.sh:2378 git-gui.sh:2923
msgid "Cut"
msgstr "Klipp ut"
-#: git-gui.sh:2041 git-gui.sh:2548 git-gui.sh:2622 git-gui.sh:2715
+#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
#: lib/console.tcl:69
msgid "Copy"
msgstr "Kopiera"
-#: git-gui.sh:2044 git-gui.sh:2551
+#: git-gui.sh:2384 git-gui.sh:2929
msgid "Paste"
msgstr "Klistra in"
-#: git-gui.sh:2047 git-gui.sh:2554 lib/branch_delete.tcl:26
+#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr "Ta bort"
-#: git-gui.sh:2051 git-gui.sh:2558 git-gui.sh:2719 lib/console.tcl:71
+#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
msgid "Select All"
msgstr "Markera alla"
-#: git-gui.sh:2060
+#: git-gui.sh:2400
msgid "Create..."
msgstr "Skapa..."
-#: git-gui.sh:2066
+#: git-gui.sh:2406
msgid "Checkout..."
msgstr "Checka ut..."
-#: git-gui.sh:2072
+#: git-gui.sh:2412
msgid "Rename..."
msgstr "Byt namn..."
-#: git-gui.sh:2077 git-gui.sh:2187
+#: git-gui.sh:2417
msgid "Delete..."
msgstr "Ta bort..."
-#: git-gui.sh:2082
+#: git-gui.sh:2422
msgid "Reset..."
msgstr "Återställ..."
-#: git-gui.sh:2094 git-gui.sh:2491
+#: git-gui.sh:2432
+msgid "Done"
+msgstr "Färdig"
+
+#: git-gui.sh:2434
+msgid "Commit@@verb"
+msgstr "Checka in"
+
+#: git-gui.sh:2443 git-gui.sh:2864
msgid "New Commit"
msgstr "Ny incheckning"
-#: git-gui.sh:2102 git-gui.sh:2498
+#: git-gui.sh:2451 git-gui.sh:2871
msgid "Amend Last Commit"
msgstr "Lägg till föregående incheckning"
-#: git-gui.sh:2111 git-gui.sh:2458 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr "Sök på nytt"
-#: git-gui.sh:2117
+#: git-gui.sh:2467
msgid "Stage To Commit"
msgstr "Köa för incheckning"
-#: git-gui.sh:2123
+#: git-gui.sh:2473
msgid "Stage Changed Files To Commit"
msgstr "Köa ändrade filer för incheckning"
-#: git-gui.sh:2129
+#: git-gui.sh:2479
msgid "Unstage From Commit"
msgstr "Ta bort från incheckningskö"
-#: git-gui.sh:2134 lib/index.tcl:395
+#: git-gui.sh:2484 lib/index.tcl:410
msgid "Revert Changes"
msgstr "Återställ ändringar"
-#: git-gui.sh:2141 git-gui.sh:2702
+#: git-gui.sh:2491 git-gui.sh:3069
msgid "Show Less Context"
msgstr "Visa mindre sammanhang"
-#: git-gui.sh:2145 git-gui.sh:2706
+#: git-gui.sh:2495 git-gui.sh:3073
msgid "Show More Context"
msgstr "Visa mer sammanhang"
-#: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
+#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
msgid "Sign Off"
msgstr "Skriv under"
-#: git-gui.sh:2155 git-gui.sh:2474
-msgid "Commit@@verb"
-msgstr "Checka in"
-
-#: git-gui.sh:2166
+#: git-gui.sh:2518
msgid "Local Merge..."
msgstr "Lokal sammanslagning..."
-#: git-gui.sh:2171
+#: git-gui.sh:2523
msgid "Abort Merge..."
msgstr "Avbryt sammanslagning..."
-#: git-gui.sh:2183
+#: git-gui.sh:2535 git-gui.sh:2575
+msgid "Add..."
+msgstr "Lägg till..."
+
+#: git-gui.sh:2539
msgid "Push..."
msgstr "Sänd..."
-#: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
+#: git-gui.sh:2543
+msgid "Delete Branch..."
+msgstr "Ta bort gren..."
+
+#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
#, tcl-format
msgid "About %s"
msgstr "Om %s"
-#: git-gui.sh:2201
+#: git-gui.sh:2557
msgid "Preferences..."
msgstr "Inställningar..."
-#: git-gui.sh:2209 git-gui.sh:2740
+#: git-gui.sh:2565 git-gui.sh:3115
msgid "Options..."
msgstr "Alternativ..."
-#: git-gui.sh:2215 lib/choose_repository.tcl:47
+#: git-gui.sh:2576
+msgid "Remove..."
+msgstr "Ta bort..."
+
+#: git-gui.sh:2585 lib/choose_repository.tcl:50
msgid "Help"
msgstr "Hjälp"
-#: git-gui.sh:2256
+#: git-gui.sh:2611
msgid "Online Documentation"
msgstr "Webbdokumentation"
-#: git-gui.sh:2340
+#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+msgid "Show SSH Key"
+msgstr "Visa SSH-nyckel"
+
+#: git-gui.sh:2707
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
"ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas"
-#: git-gui.sh:2373
+#: git-gui.sh:2740
msgid "Current Branch:"
msgstr "Aktuell gren:"
-#: git-gui.sh:2394
+#: git-gui.sh:2761
msgid "Staged Changes (Will Commit)"
msgstr "Köade ändringar (kommer att checkas in)"
-#: git-gui.sh:2414
+#: git-gui.sh:2781
msgid "Unstaged Changes"
msgstr "Oköade ändringar"
-#: git-gui.sh:2464
+#: git-gui.sh:2831
msgid "Stage Changed"
msgstr "Köa ändrade"
-#: git-gui.sh:2480 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
msgid "Push"
msgstr "Sänd"
-#: git-gui.sh:2510
+#: git-gui.sh:2885
msgid "Initial Commit Message:"
msgstr "Inledande incheckningsmeddelande:"
-#: git-gui.sh:2511
+#: git-gui.sh:2886
msgid "Amended Commit Message:"
msgstr "Utökat incheckningsmeddelande:"
-#: git-gui.sh:2512
+#: git-gui.sh:2887
msgid "Amended Initial Commit Message:"
msgstr "Utökat inledande incheckningsmeddelande:"
-#: git-gui.sh:2513
+#: git-gui.sh:2888
msgid "Amended Merge Commit Message:"
msgstr "Utökat incheckningsmeddelande för sammanslagning:"
-#: git-gui.sh:2514
+#: git-gui.sh:2889
msgid "Merge Commit Message:"
msgstr "Incheckningsmeddelande för sammanslagning:"
-#: git-gui.sh:2515
+#: git-gui.sh:2890
msgid "Commit Message:"
msgstr "Incheckningsmeddelande:"
-#: git-gui.sh:2561 git-gui.sh:2723 lib/console.tcl:73
+#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
msgid "Copy All"
msgstr "Kopiera alla"
-#: git-gui.sh:2585 lib/blame.tcl:100
+#: git-gui.sh:2963 lib/blame.tcl:104
msgid "File:"
msgstr "Fil:"
-#: git-gui.sh:2691
-msgid "Apply/Reverse Hunk"
-msgstr "Använd/återställ del"
-
-#: git-gui.sh:2696
-msgid "Apply/Reverse Line"
-msgstr "Använd/återställ rad"
-
-#: git-gui.sh:2711
+#: git-gui.sh:3078
msgid "Refresh"
msgstr "Uppdatera"
-#: git-gui.sh:2732
+#: git-gui.sh:3099
msgid "Decrease Font Size"
msgstr "Minska teckensnittsstorlek"
-#: git-gui.sh:2736
+#: git-gui.sh:3103
msgid "Increase Font Size"
msgstr "Öka teckensnittsstorlek"
-#: git-gui.sh:2747
+#: git-gui.sh:3111 lib/blame.tcl:281
+msgid "Encoding"
+msgstr "Teckenkodning"
+
+#: git-gui.sh:3122
+msgid "Apply/Reverse Hunk"
+msgstr "Använd/återställ del"
+
+#: git-gui.sh:3127
+msgid "Apply/Reverse Line"
+msgstr "Använd/återställ rad"
+
+#: git-gui.sh:3137
+msgid "Run Merge Tool"
+msgstr "Starta verktyg för sammanslagning"
+
+#: git-gui.sh:3142
+msgid "Use Remote Version"
+msgstr "Använd versionen från fjärrarkivet"
+
+#: git-gui.sh:3146
+msgid "Use Local Version"
+msgstr "Använd lokala versionen"
+
+#: git-gui.sh:3150
+msgid "Revert To Base"
+msgstr "Återställ till basversionen"
+
+#: git-gui.sh:3169
msgid "Unstage Hunk From Commit"
msgstr "Ta bort del ur incheckningskö"
-#: git-gui.sh:2748
+#: git-gui.sh:3170
msgid "Unstage Line From Commit"
msgstr "Ta bort rad ur incheckningskö"
-#: git-gui.sh:2750
+#: git-gui.sh:3172
msgid "Stage Hunk For Commit"
msgstr "Ställ del i incheckningskö"
-#: git-gui.sh:2751
+#: git-gui.sh:3173
msgid "Stage Line For Commit"
msgstr "Ställ rad i incheckningskö"
-#: git-gui.sh:2771
+#: git-gui.sh:3196
msgid "Initializing..."
msgstr "Initierar..."
-#: git-gui.sh:2876
+#: git-gui.sh:3301
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@ -451,7 +516,7 @@ msgstr ""
"av %s:\n"
"\n"
-#: git-gui.sh:2906
+#: git-gui.sh:3331
msgid ""
"\n"
"This is due to a known issue with the\n"
@@ -461,7 +526,7 @@ msgstr ""
"Detta beror på ett känt problem med\n"
"Tcl-binären som följer med Cygwin."
-#: git-gui.sh:2911
+#: git-gui.sh:3336
#, tcl-format
msgid ""
"\n"
@@ -482,80 +547,108 @@ msgstr ""
msgid "git-gui - a graphical user interface for Git."
msgstr "git-gui - ett grafiskt användargränssnitt för Git."
-#: lib/blame.tcl:70
+#: lib/blame.tcl:72
msgid "File Viewer"
msgstr "Filvisare"
-#: lib/blame.tcl:74
+#: lib/blame.tcl:78
msgid "Commit:"
msgstr "Incheckning:"
-#: lib/blame.tcl:257
+#: lib/blame.tcl:271
msgid "Copy Commit"
msgstr "Kopiera incheckning"
-#: lib/blame.tcl:260
+#: lib/blame.tcl:275
+msgid "Find Text..."
+msgstr "Sök text..."
+
+#: lib/blame.tcl:284
msgid "Do Full Copy Detection"
msgstr "Gör full kopieringsigenkänning"
-#: lib/blame.tcl:388
+#: lib/blame.tcl:288
+msgid "Show History Context"
+msgstr "Visa historiksammanhang"
+
+#: lib/blame.tcl:291
+msgid "Blame Parent Commit"
+msgstr "Klandra föräldraincheckning"
+
+#: lib/blame.tcl:450
#, tcl-format
msgid "Reading %s..."
msgstr "Läser %s..."
-#: lib/blame.tcl:492
+#: lib/blame.tcl:557
msgid "Loading copy/move tracking annotations..."
msgstr "Läser annoteringar för kopiering/flyttning..."
-#: lib/blame.tcl:512
+#: lib/blame.tcl:577
msgid "lines annotated"
msgstr "rader annoterade"
-#: lib/blame.tcl:704
+#: lib/blame.tcl:769
msgid "Loading original location annotations..."
msgstr "Läser in annotering av originalplacering..."
-#: lib/blame.tcl:707
+#: lib/blame.tcl:772
msgid "Annotation complete."
msgstr "Annotering fullbordad."
-#: lib/blame.tcl:737
+#: lib/blame.tcl:802
msgid "Busy"
msgstr "Upptagen"
-#: lib/blame.tcl:738
+#: lib/blame.tcl:803
msgid "Annotation process is already running."
msgstr "Annoteringsprocess körs redan."
-#: lib/blame.tcl:777
+#: lib/blame.tcl:842
msgid "Running thorough copy detection..."
msgstr "Kör grundlig kopieringsigenkänning..."
-#: lib/blame.tcl:827
+#: lib/blame.tcl:910
msgid "Loading annotation..."
msgstr "Läser in annotering..."
-#: lib/blame.tcl:883
+#: lib/blame.tcl:964
msgid "Author:"
msgstr "Författare:"
-#: lib/blame.tcl:887
+#: lib/blame.tcl:968
msgid "Committer:"
msgstr "Incheckare:"
-#: lib/blame.tcl:892
+#: lib/blame.tcl:973
msgid "Original File:"
msgstr "Ursprunglig fil:"
-#: lib/blame.tcl:1006
+#: lib/blame.tcl:1021
+msgid "Cannot find HEAD commit:"
+msgstr "Hittar inte incheckning för HEAD:"
+
+#: lib/blame.tcl:1076
+msgid "Cannot find parent commit:"
+msgstr "Hittar inte föräldraincheckning:"
+
+#: lib/blame.tcl:1091
+msgid "Unable to display parent"
+msgstr "Kan inte visa förälder"
+
+#: lib/blame.tcl:1092 lib/diff.tcl:297
+msgid "Error loading diff:"
+msgstr "Fel vid inläsning av differens:"
+
+#: lib/blame.tcl:1232
msgid "Originally By:"
msgstr "Ursprungligen av:"
-#: lib/blame.tcl:1012
+#: lib/blame.tcl:1238
msgid "In File:"
msgstr "I filen:"
-#: lib/blame.tcl:1017
+#: lib/blame.tcl:1243
msgid "Copied Or Moved Here By:"
msgstr "Kopierad eller flyttad hit av:"
@@ -569,16 +662,18 @@ msgstr "Checka ut"
#: 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:544 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:544 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:97
msgid "Cancel"
msgstr "Avbryt"
-#: 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 "Revision"
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:244
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
msgid "Options"
msgstr "Alternativ"
@@ -598,7 +693,7 @@ msgstr "Skapa gren"
msgid "Create New Branch"
msgstr "Skapa ny gren"
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
msgid "Create"
msgstr "Skapa"
@@ -606,7 +701,7 @@ msgstr "Skapa"
msgid "Branch Name"
msgstr "Namn på gren"
-#: lib/branch_create.tcl:43
+#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
msgid "Name:"
msgstr "Namn:"
@@ -751,9 +846,9 @@ msgstr "[Upp till förälder]"
msgid "Browse Branch Files"
msgstr "Bläddra filer på grenen"
-#: lib/browser.tcl:278 lib/choose_repository.tcl:387
-#: lib/choose_repository.tcl:472 lib/choose_repository.tcl:482
-#: lib/choose_repository.tcl:985
+#: lib/browser.tcl:278 lib/choose_repository.tcl:394
+#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491
+#: lib/choose_repository.tcl:995
msgid "Browse"
msgstr "Bläddra"
@@ -768,6 +863,7 @@ msgid "fatal: Cannot resolve %s"
msgstr "ödesdigert: Kunde inte slå upp %s"
#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
+#: lib/sshkey.tcl:53
msgid "Close"
msgstr "Stäng"
@@ -879,7 +975,7 @@ msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar."
msgid "Reset '%s'?"
msgstr "Återställa \"%s\"?"
-#: lib/checkout_op.tcl:532 lib/merge.tcl:163
+#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343
msgid "Visualize"
msgstr "Visualisera"
@@ -928,221 +1024,225 @@ 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:382
msgid "Create New Repository"
msgstr "Skapa nytt arkiv"
-#: lib/choose_repository.tcl:87
+#: lib/choose_repository.tcl:93
msgid "New..."
msgstr "Nytt..."
-#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:458
+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
msgid "Clone Existing Repository"
msgstr "Klona befintligt arkiv"
-#: lib/choose_repository.tcl:100
+#: lib/choose_repository.tcl:106
msgid "Clone..."
msgstr "Klona..."
-#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:974
+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
msgid "Open Existing Repository"
msgstr "Öppna befintligt arkiv"
-#: lib/choose_repository.tcl:113
+#: lib/choose_repository.tcl:119
msgid "Open..."
msgstr "Öppna..."
-#: lib/choose_repository.tcl:126
+#: lib/choose_repository.tcl:132
msgid "Recent Repositories"
msgstr "Senaste arkiven"
-#: lib/choose_repository.tcl:132
+#: lib/choose_repository.tcl:138
msgid "Open Recent Repository:"
msgstr "Öppna tidigare arkiv:"
-#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
-#: lib/choose_repository.tcl:310
+#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
+#: lib/choose_repository.tcl:316
#, tcl-format
msgid "Failed to create repository %s:"
msgstr "Kunde inte skapa arkivet %s:"
-#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:476
+#: lib/choose_repository.tcl:387
msgid "Directory:"
msgstr "Katalog:"
-#: lib/choose_repository.tcl:410 lib/choose_repository.tcl:535
-#: lib/choose_repository.tcl:1007
+#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544
+#: lib/choose_repository.tcl:1017
msgid "Git Repository"
msgstr "Gitarkiv"
-#: lib/choose_repository.tcl:435
+#: lib/choose_repository.tcl:442
#, tcl-format
msgid "Directory %s already exists."
msgstr "Katalogen %s finns redan."
-#: lib/choose_repository.tcl:439
+#: lib/choose_repository.tcl:446
#, tcl-format
msgid "File %s already exists."
msgstr "Filen %s finns redan."
-#: lib/choose_repository.tcl:453
+#: lib/choose_repository.tcl:460
msgid "Clone"
msgstr "Klona"
-#: lib/choose_repository.tcl:466
-msgid "URL:"
-msgstr "Webbadress:"
+#: lib/choose_repository.tcl:473
+msgid "Source Location:"
+msgstr "Plats för källkod:"
+
+#: lib/choose_repository.tcl:484
+msgid "Target Directory:"
+msgstr "MÃ¥lkatalog:"
-#: lib/choose_repository.tcl:487
+#: lib/choose_repository.tcl:496
msgid "Clone Type:"
msgstr "Typ av klon:"
-#: lib/choose_repository.tcl:493
+#: lib/choose_repository.tcl:502
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr "Standard (snabb, semiredundant, hårda länkar)"
-#: lib/choose_repository.tcl:499
+#: lib/choose_repository.tcl:508
msgid "Full Copy (Slower, Redundant Backup)"
msgstr "Full kopia (långsammare, redundant säkerhetskopia)"
-#: lib/choose_repository.tcl:505
+#: lib/choose_repository.tcl:514
msgid "Shared (Fastest, Not Recommended, No Backup)"
msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)"
-#: lib/choose_repository.tcl:541 lib/choose_repository.tcl:588
-#: lib/choose_repository.tcl:734 lib/choose_repository.tcl:804
-#: lib/choose_repository.tcl:1013 lib/choose_repository.tcl:1021
+#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
+#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813
+#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031
#, tcl-format
msgid "Not a Git repository: %s"
msgstr "Inte ett Gitarkiv: %s"
-#: lib/choose_repository.tcl:577
+#: lib/choose_repository.tcl:586
msgid "Standard only available for local repository."
msgstr "Standard är endast tillgängligt för lokala arkiv."
-#: lib/choose_repository.tcl:581
+#: lib/choose_repository.tcl:590
msgid "Shared only available for local repository."
msgstr "Delat är endast tillgängligt för lokala arkiv."
-#: lib/choose_repository.tcl:602
+#: lib/choose_repository.tcl:611
#, tcl-format
msgid "Location %s already exists."
msgstr "Platsen %s finns redan."
-#: lib/choose_repository.tcl:613
+#: lib/choose_repository.tcl:622
msgid "Failed to configure origin"
msgstr "Kunde inte konfigurera ursprung"
-#: lib/choose_repository.tcl:625
+#: lib/choose_repository.tcl:634
msgid "Counting objects"
msgstr "Räknar objekt"
-#: lib/choose_repository.tcl:626
+#: lib/choose_repository.tcl:635
msgid "buckets"
msgstr "hinkar"
-#: lib/choose_repository.tcl:650
+#: lib/choose_repository.tcl:659
#, tcl-format
msgid "Unable to copy objects/info/alternates: %s"
msgstr "Kunde inte kopiera objekt/info/alternativ: %s"
-#: lib/choose_repository.tcl:686
+#: lib/choose_repository.tcl:695
#, tcl-format
msgid "Nothing to clone from %s."
msgstr "Ingenting att klona från %s."
-#: lib/choose_repository.tcl:688 lib/choose_repository.tcl:902
-#: lib/choose_repository.tcl:914
+#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911
+#: lib/choose_repository.tcl:923
msgid "The 'master' branch has not been initialized."
msgstr "Grenen \"master\" har inte initierats."
-#: lib/choose_repository.tcl:701
+#: lib/choose_repository.tcl:710
msgid "Hardlinks are unavailable. Falling back to copying."
msgstr "Hårda länkar är inte tillgängliga. Faller tillbaka på kopiering."
-#: lib/choose_repository.tcl:713
+#: lib/choose_repository.tcl:722
#, tcl-format
msgid "Cloning from %s"
msgstr "Klonar från %s"
-#: lib/choose_repository.tcl:744
+#: lib/choose_repository.tcl:753
msgid "Copying objects"
msgstr "Kopierar objekt"
-#: lib/choose_repository.tcl:745
+#: lib/choose_repository.tcl:754
msgid "KiB"
msgstr "KiB"
-#: lib/choose_repository.tcl:769
+#: lib/choose_repository.tcl:778
#, tcl-format
msgid "Unable to copy object: %s"
msgstr "Kunde inte kopiera objekt: %s"
-#: lib/choose_repository.tcl:779
+#: lib/choose_repository.tcl:788
msgid "Linking objects"
msgstr "Länkar objekt"
-#: lib/choose_repository.tcl:780
+#: lib/choose_repository.tcl:789
msgid "objects"
msgstr "objekt"
-#: lib/choose_repository.tcl:788
+#: lib/choose_repository.tcl:797
#, tcl-format
msgid "Unable to hardlink object: %s"
msgstr "Kunde inte hårdlänka objekt: %s"
-#: lib/choose_repository.tcl:843
+#: lib/choose_repository.tcl:852
msgid "Cannot fetch branches and objects. See console output for details."
msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer."
-#: lib/choose_repository.tcl:854
+#: lib/choose_repository.tcl:863
msgid "Cannot fetch tags. See console output for details."
msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer."
-#: lib/choose_repository.tcl:878
+#: lib/choose_repository.tcl:887
msgid "Cannot determine HEAD. See console output for details."
msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer."
-#: lib/choose_repository.tcl:887
+#: lib/choose_repository.tcl:896
#, tcl-format
msgid "Unable to cleanup %s"
msgstr "Kunde inte städa upp %s"
-#: lib/choose_repository.tcl:893
+#: lib/choose_repository.tcl:902
msgid "Clone failed."
msgstr "Kloning misslyckades."
-#: lib/choose_repository.tcl:900
+#: lib/choose_repository.tcl:909
msgid "No default branch obtained."
msgstr "Hämtade ingen standardgren."
-#: lib/choose_repository.tcl:911
+#: lib/choose_repository.tcl:920
#, tcl-format
msgid "Cannot resolve %s as a commit."
msgstr "Kunde inte slå upp %s till någon incheckning."
-#: lib/choose_repository.tcl:923
+#: lib/choose_repository.tcl:932
msgid "Creating working directory"
msgstr "Skapar arbetskatalog"
-#: lib/choose_repository.tcl:924 lib/index.tcl:65 lib/index.tcl:127
-#: lib/index.tcl:193
+#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128
+#: lib/index.tcl:196
msgid "files"
msgstr "filer"
-#: lib/choose_repository.tcl:953
+#: lib/choose_repository.tcl:962
msgid "Initial file checkout failed."
msgstr "Inledande filutcheckning misslyckades."
-#: lib/choose_repository.tcl:969
+#: lib/choose_repository.tcl:978
msgid "Open"
msgstr "Öppna"
-#: lib/choose_repository.tcl:979
+#: lib/choose_repository.tcl:988
msgid "Repository:"
msgstr "Arkiv:"
-#: lib/choose_repository.tcl:1027
+#: lib/choose_repository.tcl:1037
#, tcl-format
msgid "Failed to open repository %s:"
msgstr "Kunde inte öppna arkivet %s:"
@@ -1242,7 +1342,7 @@ msgstr ""
"\n"
"Sökningen kommer att startas automatiskt nu.\n"
-#: lib/commit.tcl:154
+#: lib/commit.tcl:156
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
@@ -1255,7 +1355,7 @@ msgstr ""
"Filen %s har sammanslagningskonflikter. Du måste lösa dem och köa filen "
"innan du checkar in den.\n"
-#: lib/commit.tcl:162
+#: lib/commit.tcl:164
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
@@ -1266,7 +1366,7 @@ msgstr ""
"\n"
"Filen %s kan inte checkas in av programmet.\n"
-#: lib/commit.tcl:170
+#: lib/commit.tcl:172
msgid ""
"No changes to commit.\n"
"\n"
@@ -1276,7 +1376,7 @@ msgstr ""
"\n"
"Du måste köa åtminstone en fil innan du kan checka in.\n"
-#: lib/commit.tcl:183
+#: lib/commit.tcl:187
msgid ""
"Please supply a commit message.\n"
"\n"
@@ -1294,45 +1394,45 @@ msgstr ""
"- Andra raden: Tom\n"
"- Följande rader: Beskriv varför det här är en bra ändring.\n"
-#: lib/commit.tcl:207
+#: lib/commit.tcl:211
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"."
-#: lib/commit.tcl:221
+#: lib/commit.tcl:227
msgid "Calling pre-commit hook..."
-msgstr "Anropar krok före incheckning..."
+msgstr "Anropar kroken före incheckning (pre-commit)..."
-#: lib/commit.tcl:236
+#: lib/commit.tcl:242
msgid "Commit declined by pre-commit hook."
-msgstr "Incheckningen avvisades av krok före incheckning."
+msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)."
-#: lib/commit.tcl:259
+#: lib/commit.tcl:265
msgid "Calling commit-msg hook..."
-msgstr "Anropar krok för incheckningsmeddelande..."
+msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..."
-#: lib/commit.tcl:274
+#: lib/commit.tcl:280
msgid "Commit declined by commit-msg hook."
-msgstr "Incheckning avvisad av krok för incheckningsmeddelande."
+msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)."
-#: lib/commit.tcl:287
+#: lib/commit.tcl:293
msgid "Committing changes..."
msgstr "Checkar in ändringar..."
-#: lib/commit.tcl:303
+#: lib/commit.tcl:309
msgid "write-tree failed:"
msgstr "write-tree misslyckades:"
-#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
msgid "Commit failed."
msgstr "Incheckningen misslyckades."
-#: lib/commit.tcl:321
+#: lib/commit.tcl:327
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr "Incheckningen %s verkar vara trasig"
-#: lib/commit.tcl:326
+#: lib/commit.tcl:332
msgid ""
"No changes to commit.\n"
"\n"
@@ -1346,19 +1446,19 @@ msgstr ""
"\n"
"En sökning kommer att startas automatiskt nu.\n"
-#: lib/commit.tcl:333
+#: lib/commit.tcl:339
msgid "No changes to commit."
msgstr "Inga ändringar att checka in."
-#: lib/commit.tcl:347
+#: lib/commit.tcl:353
msgid "commit-tree failed:"
msgstr "commit-tree misslyckades:"
-#: lib/commit.tcl:367
+#: lib/commit.tcl:373
msgid "update-ref failed:"
msgstr "update-ref misslyckades:"
-#: lib/commit.tcl:454
+#: lib/commit.tcl:461
#, tcl-format
msgid "Created commit %s: %s"
msgstr "Skapade incheckningen %s: %s"
@@ -1433,7 +1533,7 @@ msgstr ""
msgid "Invalid date from Git: %s"
msgstr "Ogiltigt datum från Git: %s"
-#: lib/diff.tcl:44
+#: lib/diff.tcl:59
#, tcl-format
msgid ""
"No differences detected.\n"
@@ -1456,48 +1556,98 @@ msgstr ""
"En sökning kommer automatiskt att startas för att hitta andra filer som kan "
"vara i samma tillstånd."
-#: lib/diff.tcl:83
+#: lib/diff.tcl:99
#, tcl-format
msgid "Loading diff of %s..."
msgstr "Läser differens för %s..."
-#: lib/diff.tcl:116 lib/diff.tcl:190
+#: lib/diff.tcl:120
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
+msgstr "LOKAL: borttagen\n"
+"FJÄRR:\n"
+
+#: lib/diff.tcl:125
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
+msgstr "FJÄRR: borttagen\n"
+"LOKAL:\n"
+
+#: lib/diff.tcl:132
+msgid "LOCAL:\n"
+msgstr "LOKAL:\n"
+
+#: lib/diff.tcl:135
+msgid "REMOTE:\n"
+msgstr "FJÄRR:\n"
+
+#: lib/diff.tcl:197 lib/diff.tcl:296
#, tcl-format
msgid "Unable to display %s"
msgstr "Kan inte visa %s"
-#: lib/diff.tcl:117
+#: lib/diff.tcl:198
msgid "Error loading file:"
msgstr "Fel vid läsning av fil:"
-#: lib/diff.tcl:124
+#: lib/diff.tcl:205
msgid "Git Repository (subproject)"
msgstr "Gitarkiv (underprojekt)"
-#: lib/diff.tcl:136
+#: lib/diff.tcl:217
msgid "* Binary file (not showing content)."
msgstr "* Binärfil (visar inte innehållet)."
-#: lib/diff.tcl:191
-msgid "Error loading diff:"
-msgstr "Fel vid inläsning av differens:"
+#: lib/diff.tcl:222
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"
+msgstr "* Den ospårade filen är %d byte.\n"
+"* Visar endast inledande %d byte.\n"
-#: lib/diff.tcl:313
+#: lib/diff.tcl:228
+#, tcl-format
+msgid ""
+"\n"
+"* Untracked file clipped here by %s.\n"
+"* To see the entire file, use an external editor.\n"
+msgstr ""
+"\n"
+"* Den ospårade filen klipptes här av %s.\n"
+"* För att se hela filen, använd ett externt redigeringsprogram.\n"
+
+#: lib/diff.tcl:436
msgid "Failed to unstage selected hunk."
msgstr "Kunde inte ta bort den valda delen från kön."
-#: lib/diff.tcl:320
+#: lib/diff.tcl:443
msgid "Failed to stage selected hunk."
msgstr "Kunde inte lägga till den valda delen till kön."
-#: lib/diff.tcl:386
+#: lib/diff.tcl:509
msgid "Failed to unstage selected line."
msgstr "Kunde inte ta bort den valda raden från kön."
-#: lib/diff.tcl:394
+#: lib/diff.tcl:517
msgid "Failed to stage selected line."
msgstr "Kunde inte lägga till den valda raden till kön."
+#: lib/encoding.tcl:443
+msgid "Default"
+msgstr "Standard"
+
+#: lib/encoding.tcl:448
+#, tcl-format
+msgid "System (%s)"
+msgstr "Systemets (%s)"
+
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
+msgstr "Annan"
+
#: lib/error.tcl:20 lib/error.tcl:114
msgid "error"
msgstr "fel"
@@ -1534,39 +1684,48 @@ msgstr "Forstätt"
msgid "Unlock Index"
msgstr "LÃ¥s upp index"
-#: lib/index.tcl:282
+#: lib/index.tcl:287
#, tcl-format
msgid "Unstaging %s from commit"
msgstr "Tar bort %s för incheckningskön"
-#: lib/index.tcl:313
+#: lib/index.tcl:326
msgid "Ready to commit."
msgstr "Redo att checka in."
-#: lib/index.tcl:326
+#: lib/index.tcl:339
#, tcl-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: lib/index.tcl:381
+#: lib/index.tcl:396
#, tcl-format
msgid "Revert changes in file %s?"
msgstr "Återställ ändringarna i filen %s?"
-#: lib/index.tcl:383
+#: lib/index.tcl:398
#, tcl-format
msgid "Revert changes in these %i files?"
msgstr "Återställ ändringarna i dessa %i filer?"
-#: lib/index.tcl:391
+#: lib/index.tcl:406
msgid "Any unstaged changes will be permanently lost by the revert."
msgstr ""
"Alla oköade ändringar kommer permanent gå förlorade vid återställningen."
-#: lib/index.tcl:394
+#: lib/index.tcl:409
msgid "Do Nothing"
msgstr "Gör ingenting"
+#: lib/index.tcl:427
+msgid "Reverting selected files"
+msgstr "Återställer valda filer"
+
+#: lib/index.tcl:431
+#, tcl-format
+msgid "Reverting %s"
+msgstr "Återställer %s"
+
#: lib/merge.tcl:13
msgid ""
"Cannot merge while amending.\n"
@@ -1594,7 +1753,7 @@ msgstr ""
"\n"
"Sökningen kommer att startas automatiskt nu.\n"
-#: lib/merge.tcl:44
+#: lib/merge.tcl:45
#, tcl-format
msgid ""
"You are in the middle of a conflicted merge.\n"
@@ -1611,7 +1770,7 @@ msgstr ""
"Du måste lösa dem, köa filen och checka in för att fullborda den aktuella "
"sammanslagningen. När du gjort det kan du påbörja en ny sammanslagning.\n"
-#: lib/merge.tcl:54
+#: lib/merge.tcl:55
#, tcl-format
msgid ""
"You are in the middle of a change.\n"
@@ -1629,34 +1788,34 @@ msgstr ""
"sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad "
"sammanslagning, om det skulle vara nödvändigt.\n"
-#: lib/merge.tcl:106
+#: lib/merge.tcl:107
#, tcl-format
msgid "%s of %s"
msgstr "%s av %s"
-#: lib/merge.tcl:119
+#: lib/merge.tcl:120
#, tcl-format
msgid "Merging %s and %s..."
msgstr "Slår ihop %s och %s..."
-#: lib/merge.tcl:130
+#: lib/merge.tcl:131
msgid "Merge completed successfully."
msgstr "Sammanslagningen avslutades framgångsrikt."
-#: lib/merge.tcl:132
+#: lib/merge.tcl:133
msgid "Merge failed. Conflict resolution is required."
msgstr "Sammanslagningen misslyckades. Du måste lösa konflikterna."
-#: lib/merge.tcl:157
+#: lib/merge.tcl:158
#, tcl-format
msgid "Merge Into %s"
msgstr "Slå ihop i %s"
-#: lib/merge.tcl:176
+#: lib/merge.tcl:177
msgid "Revision To Merge"
msgstr "Revisioner att slå ihop"
-#: lib/merge.tcl:211
+#: lib/merge.tcl:212
msgid ""
"Cannot abort while amending.\n"
"\n"
@@ -1666,7 +1825,7 @@ msgstr ""
"\n"
"Du måste göra dig färdig med att utöka incheckningen.\n"
-#: lib/merge.tcl:221
+#: lib/merge.tcl:222
msgid ""
"Abort merge?\n"
"\n"
@@ -1681,7 +1840,7 @@ msgstr ""
"\n"
"GÃ¥ vidare med att avbryta den aktuella sammanslagningen?"
-#: lib/merge.tcl:227
+#: lib/merge.tcl:228
msgid ""
"Reset changes?\n"
"\n"
@@ -1696,119 +1855,321 @@ msgstr ""
"\n"
"Gå vidare med att återställa de aktuella ändringarna?"
-#: lib/merge.tcl:238
+#: lib/merge.tcl:239
msgid "Aborting"
msgstr "Avbryter"
-#: lib/merge.tcl:238
+#: lib/merge.tcl:239
msgid "files reset"
msgstr "filer återställda"
-#: lib/merge.tcl:266
+#: lib/merge.tcl:267
msgid "Abort failed."
msgstr "Misslyckades avbryta."
-#: lib/merge.tcl:268
+#: lib/merge.tcl:269
msgid "Abort completed. Ready."
msgstr "Avbrytning fullbordad. Redo."
-#: lib/option.tcl:95
+#: lib/mergetool.tcl:8
+msgid "Force resolution to the base version?"
+msgstr "Tvinga lösning att använda basversionen?"
+
+#: lib/mergetool.tcl:9
+msgid "Force resolution to this branch?"
+msgstr "Tvinga lösning att använda den aktuella grenen?"
+
+#: lib/mergetool.tcl:10
+msgid "Force resolution to the other branch?"
+msgstr "Tvinga lösning att använda den andra grenen?"
+
+#: lib/mergetool.tcl:14
+#, tcl-format
+msgid ""
+"Note that the diff shows only conflicting changes.\n"
+"\n"
+"%s will be overwritten.\n"
+"\n"
+"This operation can be undone only by restarting the merge."
+msgstr ""
+"Observera att diffen endast visar de ändringar som står i konflikt.\n"
+"\n"
+"%s kommer att skrivas över.\n"
+"\n"
+"Du måste starta om sammanslagningen för att göra den här operationen ogjord."
+
+#: lib/mergetool.tcl:45
+#, tcl-format
+msgid "File %s seems to have unresolved conflicts, still stage?"
+msgstr "Filen %s verkar innehålla olösta konflikter. Vill du köa ändå?"
+
+#: lib/mergetool.tcl:60
+#, tcl-format
+msgid "Adding resolution for %s"
+msgstr "Lägger till lösning för %s"
+
+#: lib/mergetool.tcl:141
+msgid "Cannot resolve deletion or link conflicts using a tool"
+msgstr "Kan inte lösa borttagnings- eller länkkonflikter med ett verktyg"
+
+#: lib/mergetool.tcl:146
+msgid "Conflict file does not exist"
+msgstr "Konfliktfil existerar inte"
+
+#: lib/mergetool.tcl:264
+#, tcl-format
+msgid "Not a GUI merge tool: '%s'"
+msgstr "Inte ett grafiskt verktyg för sammanslagning: %s"
+
+#: lib/mergetool.tcl:268
+#, tcl-format
+msgid "Unsupported merge tool '%s'"
+msgstr "Verktyget \"%s\" för sammanslagning stöds inte"
+
+#: lib/mergetool.tcl:303
+msgid "Merge tool is already running, terminate it?"
+msgstr "Verktyget för sammanslagning körs redan. Vill du avsluta det?"
+
+#: lib/mergetool.tcl:323
+#, tcl-format
+msgid ""
+"Error retrieving versions:\n"
+"%s"
+msgstr "Fel vid hämtning av versioner:\n"
+"%s"
+
+#: lib/mergetool.tcl:343
+#, tcl-format
+msgid ""
+"Could not start the merge tool:\n"
+"\n"
+"%s"
+msgstr "Kunde inte starta verktyg för sammanslagning:\n"
+"\n"
+"%s"
+
+#: lib/mergetool.tcl:347
+msgid "Running merge tool..."
+msgstr "Kör verktyg för sammanslagning..."
+
+#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
+msgid "Merge tool failed."
+msgstr "Verktyget för sammanslagning misslyckades."
+
+#: lib/option.tcl:11
+#, tcl-format
+msgid "Invalid global encoding '%s'"
+msgstr "Den globala teckenkodningen \"%s\" är ogiltig"
+
+#: lib/option.tcl:19
+#, tcl-format
+msgid "Invalid repo encoding '%s'"
+msgstr "Arkivets teckenkodning \"%s\" är ogiltig"
+
+#: lib/option.tcl:117
msgid "Restore Defaults"
msgstr "Återställ standardvärden"
-#: lib/option.tcl:99
+#: lib/option.tcl:121
msgid "Save"
msgstr "Spara"
-#: lib/option.tcl:109
+#: lib/option.tcl:131
#, tcl-format
msgid "%s Repository"
msgstr "Arkivet %s"
-#: lib/option.tcl:110
+#: lib/option.tcl:132
msgid "Global (All Repositories)"
msgstr "Globalt (alla arkiv)"
-#: lib/option.tcl:116
+#: lib/option.tcl:138
msgid "User Name"
msgstr "Användarnamn"
-#: lib/option.tcl:117
+#: lib/option.tcl:139
msgid "Email Address"
msgstr "E-postadress"
-#: lib/option.tcl:119
+#: lib/option.tcl:141
msgid "Summarize Merge Commits"
msgstr "Summera sammanslagningsincheckningar"
-#: lib/option.tcl:120
+#: lib/option.tcl:142
msgid "Merge Verbosity"
msgstr "Pratsamhet för sammanslagningar"
-#: lib/option.tcl:121
+#: lib/option.tcl:143
msgid "Show Diffstat After Merge"
msgstr "Visa diffstatistik efter sammanslagning"
-#: lib/option.tcl:123
+#: lib/option.tcl:144
+msgid "Use Merge Tool"
+msgstr "Använd verktyg för sammanslagning"
+
+#: lib/option.tcl:146
msgid "Trust File Modification Timestamps"
msgstr "Lita på filändringstidsstämplar"
-#: lib/option.tcl:124
+#: lib/option.tcl:147
msgid "Prune Tracking Branches During Fetch"
msgstr "Städa spårade grenar vid hämtning"
-#: lib/option.tcl:125
+#: lib/option.tcl:148
msgid "Match Tracking Branches"
msgstr "Matcha spårade grenar"
-#: lib/option.tcl:126
+#: lib/option.tcl:149
msgid "Blame Copy Only On Changed Files"
msgstr "Klandra kopiering bara i ändrade filer"
-#: lib/option.tcl:127
+#: lib/option.tcl:150
msgid "Minimum Letters To Blame Copy On"
msgstr "Minsta antal tecken att klandra kopiering för"
-#: lib/option.tcl:128
+#: lib/option.tcl:151
+msgid "Blame History Context Radius (days)"
+msgstr "Historikradie för klandring klandring (dagar)"
+
+#: lib/option.tcl:152
msgid "Number of Diff Context Lines"
msgstr "Antal rader sammanhang i differenser"
-#: lib/option.tcl:129
+#: lib/option.tcl:153
msgid "Commit Message Text Width"
msgstr "Textbredd för incheckningsmeddelande"
-#: lib/option.tcl:130
+#: lib/option.tcl:154
msgid "New Branch Name Template"
msgstr "Mall för namn på nya grenar"
-#: lib/option.tcl:194
+#: lib/option.tcl:155
+msgid "Default File Contents Encoding"
+msgstr "Standardteckenkodning för filinnehåll"
+
+#: lib/option.tcl:203
+msgid "Change"
+msgstr "Ändra"
+
+#: lib/option.tcl:230
msgid "Spelling Dictionary:"
msgstr "Stavningsordlista:"
-#: lib/option.tcl:218
+#: lib/option.tcl:254
msgid "Change Font"
msgstr "Byt teckensnitt"
-#: lib/option.tcl:222
+#: lib/option.tcl:258
#, tcl-format
msgid "Choose %s"
msgstr "Välj %s"
-#: lib/option.tcl:228
+#: lib/option.tcl:264
msgid "pt."
msgstr "p."
-#: lib/option.tcl:242
+#: lib/option.tcl:278
msgid "Preferences"
msgstr "Inställningar"
-#: lib/option.tcl:277
+#: lib/option.tcl:314
msgid "Failed to completely save options:"
msgstr "Misslyckades med att helt spara alternativ:"
+#: lib/remote.tcl:163
+msgid "Remove Remote"
+msgstr "Ta bort fjärrarkiv"
+
+#: lib/remote.tcl:168
+msgid "Prune from"
+msgstr "Ta bort från"
+
+#: lib/remote.tcl:173
+msgid "Fetch from"
+msgstr "Hämta från"
+
+#: lib/remote.tcl:215
+msgid "Push to"
+msgstr "Sänd till"
+
+#: lib/remote_add.tcl:19
+msgid "Add Remote"
+msgstr "Lägg till fjärrarkiv"
+
+#: lib/remote_add.tcl:24
+msgid "Add New Remote"
+msgstr "Lägg till nytt fjärrarkiv"
+
+#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
+msgid "Add"
+msgstr "Lägg till"
+
+#: lib/remote_add.tcl:37
+msgid "Remote Details"
+msgstr "Detaljer för fjärrarkiv"
+
+#: lib/remote_add.tcl:50
+msgid "Location:"
+msgstr "Plats:"
+
+#: lib/remote_add.tcl:62
+msgid "Further Action"
+msgstr "Ytterligare åtgärd"
+
+#: lib/remote_add.tcl:65
+msgid "Fetch Immediately"
+msgstr "Hämta omedelbart"
+
+#: lib/remote_add.tcl:71
+msgid "Initialize Remote Repository and Push"
+msgstr "Initiera fjärrarkiv och sänd till"
+
+#: lib/remote_add.tcl:77
+msgid "Do Nothing Else Now"
+msgstr "Gör ingent mer nu"
+
+#: lib/remote_add.tcl:101
+msgid "Please supply a remote name."
+msgstr "Ange ett namn för fjärrarkivet."
+
+#: lib/remote_add.tcl:114
+#, tcl-format
+msgid "'%s' is not an acceptable remote name."
+msgstr "\"%s\" kan inte användas som namn på fjärrarkivet."
+
+#: lib/remote_add.tcl:125
+#, tcl-format
+msgid "Failed to add remote '%s' of location '%s'."
+msgstr "Kunde inte lägga till fjärrarkivet \"%s\" på platsen \"%s\"."
+
+#: lib/remote_add.tcl:133 lib/transport.tcl:6
+#, tcl-format
+msgid "fetch %s"
+msgstr "hämta %s"
+
+#: lib/remote_add.tcl:134
+#, tcl-format
+msgid "Fetching the %s"
+msgstr "Hämtar %s"
+
+#: lib/remote_add.tcl:157
+#, tcl-format
+msgid "Do not know how to initialize repository at location '%s'."
+msgstr "Vet inte hur arkivet på platsen \"%s\" skall initieras."
+
+#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr "sänd %s"
+
+#: lib/remote_add.tcl:164
+#, tcl-format
+msgid "Setting up the %s (at %s)"
+msgstr "Konfigurerar %s (på %s)"
+
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
-msgid "Delete Remote Branch"
-msgstr "Ta bort fjärrgren"
+msgid "Delete Branch Remotely"
+msgstr "Ta bort gren från fjärrarkiv"
#: lib/remote_branch_delete.tcl:47
msgid "From Repository"
@@ -1816,11 +2177,11 @@ msgstr "Från arkiv"
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
msgid "Remote:"
-msgstr "Fjärr:"
+msgstr "Fjärrarkiv:"
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
-msgid "Arbitrary URL:"
-msgstr "Godtycklig webbadress:"
+msgid "Arbitrary Location:"
+msgstr "Godtycklig plats:"
#: lib/remote_branch_delete.tcl:84
msgid "Branches"
@@ -1890,17 +2251,21 @@ msgstr "Inget arkiv markerat."
msgid "Scanning %s..."
msgstr "Söker %s..."
-#: lib/remote.tcl:165
-msgid "Prune from"
-msgstr "Ta bort från"
+#: lib/search.tcl:21
+msgid "Find:"
+msgstr "Sök:"
-#: lib/remote.tcl:170
-msgid "Fetch from"
-msgstr "Hämta från"
+#: lib/search.tcl:23
+msgid "Next"
+msgstr "Nästa"
-#: lib/remote.tcl:213
-msgid "Push to"
-msgstr "Sänd till"
+#: lib/search.tcl:24
+msgid "Prev"
+msgstr "Föreg"
+
+#: lib/search.tcl:25
+msgid "Case-Sensitive"
+msgstr "Skilj på VERSALER/gemener"
#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
msgid "Cannot write shortcut:"
@@ -1939,23 +2304,186 @@ msgstr "Stavningskontrollprogrammet känns inte igen"
msgid "No Suggestions"
msgstr "Inga förslag"
-#: lib/spellcheck.tcl:387
+#: lib/spellcheck.tcl:388
msgid "Unexpected EOF from spell checker"
msgstr "Oväntat filslut från stavningskontroll"
-#: lib/spellcheck.tcl:391
+#: lib/spellcheck.tcl:392
msgid "Spell Checker Failed"
msgstr "Stavningskontroll misslyckades"
+#: lib/sshkey.tcl:31
+msgid "No keys found."
+msgstr "Inga nycklar hittades."
+
+#: lib/sshkey.tcl:34
+#, tcl-format
+msgid "Found a public key in: %s"
+msgstr "Hittade öppen nyckel i: %s"
+
+#: lib/sshkey.tcl:40
+msgid "Generate Key"
+msgstr "Skapa nyckel"
+
+#: lib/sshkey.tcl:56
+msgid "Copy To Clipboard"
+msgstr "Kopiera till Urklipp"
+
+#: lib/sshkey.tcl:70
+msgid "Your OpenSSH Public Key"
+msgstr "Din öppna OpenSSH-nyckel"
+
+#: lib/sshkey.tcl:78
+msgid "Generating..."
+msgstr "Skapar..."
+
+#: lib/sshkey.tcl:84
+#, tcl-format
+msgid ""
+"Could not start ssh-keygen:\n"
+"\n"
+"%s"
+msgstr "Kunde inte starta ssh-keygen:\n"
+"\n"
+"%s"
+
+#: lib/sshkey.tcl:111
+msgid "Generation failed."
+msgstr "Misslyckades med att skapa."
+
+#: lib/sshkey.tcl:118
+msgid "Generation succeded, but no keys found."
+msgstr "Lyckades skapa nyckeln, men hittar inte någon nyckel."
+
+#: lib/sshkey.tcl:121
+#, tcl-format
+msgid "Your key is in: %s"
+msgstr "Din nyckel finns i: %s"
+
#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
msgstr "%s... %*i av %*i %s (%3i%%)"
-#: lib/transport.tcl:6
+#: lib/tools.tcl:75
#, tcl-format
-msgid "fetch %s"
-msgstr "hämta %s"
+msgid "Running %s requires a selected file."
+msgstr "För att starta %s måste du välja en fil."
+
+#: lib/tools.tcl:90
+#, tcl-format
+msgid "Are you sure you want to run %s?"
+msgstr "Är du säker på att du vill starta %s?"
+
+#: lib/tools.tcl:110
+#, tcl-format
+msgid "Tool: %s"
+msgstr "Verktyg: %s"
+
+#: lib/tools.tcl:111
+#, tcl-format
+msgid "Running: %s"
+msgstr "Exekverar: %s"
+
+#: lib/tools.tcl:149
+#, tcl-format
+msgid "Tool completed succesfully: %s"
+msgstr "Verktyget avslutades framgångsrikt."
+
+#: lib/tools.tcl:151
+#, tcl-format
+msgid "Tool failed: %s"
+msgstr "Verktyget misslyckades: %s"
+
+#: lib/tools_dlg.tcl:22
+msgid "Add Tool"
+msgstr "Lägg till verktyg"
+
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
+msgstr "Lägg till nytt verktygskommando"
+
+#: lib/tools_dlg.tcl:33
+msgid "Add globally"
+msgstr "Lägg till globalt"
+
+#: lib/tools_dlg.tcl:45
+msgid "Tool Details"
+msgstr "Detaljer för verktyg"
+
+#: lib/tools_dlg.tcl:48
+msgid "Use '/' separators to create a submenu tree:"
+msgstr "Använd \"/\"-avdelare för att skapa ett undermenyträd:"
+
+#: lib/tools_dlg.tcl:61
+msgid "Command:"
+msgstr "Kommando:"
+
+#: lib/tools_dlg.tcl:74
+msgid "Show a dialog before running"
+msgstr "Visa dialog innan programmet startas"
+
+#: lib/tools_dlg.tcl:80
+msgid "Ask the user to select a revision (sets $REVISION)"
+msgstr "Be användaren välja en version (sätter $REVISION)"
+
+#: lib/tools_dlg.tcl:85
+msgid "Ask the user for additional arguments (sets $ARGS)"
+msgstr "Be användaren om ytterligare parametrar (sätter $ARGS)"
+
+#: lib/tools_dlg.tcl:92
+msgid "Don't show the command output window"
+msgstr "Visa inte kommandots utdatafönster"
+
+#: lib/tools_dlg.tcl:97
+msgid "Run only if a diff is selected ($FILENAME not empty)"
+msgstr "Kör endast om en diff har markerats ($FILENAME är inte tomt)"
+
+#: lib/tools_dlg.tcl:121
+msgid "Please supply a name for the tool."
+msgstr "Ange ett namn för verktyget."
+
+#: lib/tools_dlg.tcl:129
+#, tcl-format
+msgid "Tool '%s' already exists."
+msgstr "Verktyget \"%s\" finns redan."
+
+#: lib/tools_dlg.tcl:151
+#, tcl-format
+msgid ""
+"Could not add tool:\n"
+"%s"
+msgstr "Kunde inte lägga till verktyget:\n"
+"%s"
+
+#: lib/tools_dlg.tcl:190
+msgid "Remove Tool"
+msgstr "Ta bort verktyg"
+
+#: lib/tools_dlg.tcl:196
+msgid "Remove Tool Commands"
+msgstr "Ta bort verktygskommandon"
+
+#: lib/tools_dlg.tcl:200
+msgid "Remove"
+msgstr "Ta bort"
+
+#: lib/tools_dlg.tcl:236
+msgid "(Blue denotes repository-local tools)"
+msgstr "(Blått anger verktyg lokala för arkivet)"
+
+#: lib/tools_dlg.tcl:297
+#, tcl-format
+msgid "Run Command: %s"
+msgstr "Kör kommandot: %s"
+
+#: lib/tools_dlg.tcl:311
+msgid "Arguments"
+msgstr "Argument"
+
+#: lib/tools_dlg.tcl:348
+msgid "OK"
+msgstr "OK"
#: lib/transport.tcl:7
#, tcl-format
@@ -1972,11 +2500,6 @@ msgstr "fjärrborttagning %s"
msgid "Pruning tracking branches deleted from %s"
msgstr "Tar bort spårande grenar som tagits bort från %s"
-#: lib/transport.tcl:25 lib/transport.tcl:71
-#, tcl-format
-msgid "push %s"
-msgstr "sänd %s"
-
#: lib/transport.tcl:26
#, tcl-format
msgid "Pushing changes to %s"
@@ -1989,7 +2512,7 @@ msgstr "Sänder %s %s till %s"
#: lib/transport.tcl:89
msgid "Push Branches"
-msgstr "Sänder grenar"
+msgstr "Sänd grenar"
#: lib/transport.tcl:103
msgid "Source Branches"
@@ -2015,6 +2538,12 @@ msgstr "Använd tunt paket (för långsamma nätverksanslutningar)"
msgid "Include tags"
msgstr "Ta med taggar"
+#~ msgid "URL:"
+#~ msgstr "Webbadress:"
+
+#~ msgid "Delete Remote Branch"
+#~ msgstr "Ta bort fjärrgren"
+
#~ msgid ""
#~ "Unable to start gitk:\n"
#~ "\n"
--
1.5.6.5
^ permalink raw reply related
* Re: git and mtime
From: martin f krafft @ 2008-11-20 13:21 UTC (permalink / raw)
To: Roger Leigh; +Cc: git
In-Reply-To: <20081119113752.GA13611@ravenclaw.codelibre.net>
[-- Attachment #1: Type: text/plain, Size: 817 bytes --]
also sprach Roger Leigh <rleigh@codelibre.net> [2008.11.19.1237 +0100]:
> These are provided by upstream so that end users don't need these tools
> installed (particularly docbook, since the toolchain is so flaky on
> different systems). However, the fact that git isn't storing the
> mtime of the files confuses make, so it then tries to regenerate these
> (already up-to-date) files, and fails in the process since the tools
> aren't available.
I don't get it. Why are end users running make in the first place?
Why aren't those in the build-dependencies?
--
martin | http://madduck.net/ | http://two.sentenc.es/
it is better to have loft and lost
than to never have loft at all.
-- groucho marx
spamtraps: madduck.bogus@madduck.net
[-- Attachment #2: Digital signature (see http://martin-krafft.net/gpg/) --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* [PATCH v2] Document levenshtein.c
From: Johannes Schindelin @ 2008-11-20 13:27 UTC (permalink / raw)
To: Samuel Tardieu; +Cc: Junio C Hamano, git
In-Reply-To: <2008-11-20-13-00-31+trackit+sam@rfc1149.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
On Thu, 20 Nov 2008, Samuel Tardieu wrote:
> * Johannes Schindelin <Johannes.Schindelin@gmx.de> [2008-11-20
> 13:00:35 +0100]
>
> | How about this?
>
> I think it still lacks a note about what "deletion" and
> "insertion" means (is that a character deleted from string1 to obtain
> string2 or the reverse?). In most implementation, you use the same
> cost for insertion and deletion so the function is symetrical, but
> this implementation is more powerful.
Second paragraph and last sentence were added.
levenshtein.c | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/levenshtein.c b/levenshtein.c
index db52f2c..ebef34b 100644
--- a/levenshtein.c
+++ b/levenshtein.c
@@ -1,6 +1,43 @@
#include "cache.h"
#include "levenshtein.h"
+/*
+ * This function implements the Damerau-Levenshtein algorithm to
+ * calculate a distance between strings.
+ *
+ * Basically, it says how many letters need to be swapped, substituted,
+ * deleted from, or added to string1, at least, to get string2.
+ *
+ * The idea is to build a distance matrix for the substrings of both
+ * strings. To avoid a large space complexity, only the last three rows
+ * are kept in memory (if swaps had the same or higher cost as one deletion
+ * plus one insertion, only two rows would be needed).
+ *
+ * At any stage, "i + 1" denotes the length of the current substring of
+ * string1 that the distance is calculated for.
+ *
+ * row2 holds the current row, row1 the previous row (i.e. for the substring
+ * of string1 of length "i"), and row0 the row before that.
+ *
+ * In other words, at the start of the big loop, row2[j + 1] contains the
+ * Damerau-Levenshtein distance between the substring of string1 of length
+ * "i" and the substring of string2 of length "j + 1".
+ *
+ * All the big loop does is determine the partial minimum-cost paths.
+ *
+ * It does so by calculating the costs of the path ending in characters
+ * i (in string1) and j (in string2), respectively, given that the last
+ * operation is a substition, a swap, a deletion, or an insertion.
+ *
+ * This implementation allows the costs to be weighted:
+ *
+ * - w (as in "sWap")
+ * - s (as in "Substition")
+ * - a (for insertion, AKA "Add")
+ * - d (as in "Deletion")
+ *
+ * Note that this algorithm calculates a distance _iff_ d == a.
+ */
int levenshtein(const char *string1, const char *string2,
int w, int s, int a, int d)
{
--
1.6.0.2.763.g72663
^ permalink raw reply related
* Re: [TopGit PATCH] Print help message when command is not proper
From: Petr Baudis @ 2008-11-20 13:18 UTC (permalink / raw)
To: martin f. krafft; +Cc: git
In-Reply-To: <1227182928-24916-1-git-send-email-madduck@debian.org>
On Thu, Nov 20, 2008 at 01:08:48PM +0100, martin f. krafft wrote:
> When invoked with an unknown subcommand, or when --help is sought for
> a command that does not exist, TopGit prints the help message.
>
> Signed-off-by: martin f. krafft <madduck@debian.org>
Acked-by: Petr Baudis <pasky@suse.cz>
Note that I think these changes are reasonable only as long as do_help
is just a short two-line usage help; in the event we also implement a
longer help, it certainly shouldn't be printed in these cases.
^ permalink raw reply
* Re: git and mtime
From: Andreas Ericsson @ 2008-11-20 13:12 UTC (permalink / raw)
To: Roger Leigh; +Cc: Matthias Kestenholz, git
In-Reply-To: <49255CBA.4030709@op5.se>
Andreas Ericsson wrote:
> Roger Leigh wrote:
>> For this, and some other uses I have in mind for git, it would be
>> great if git could store some more components of the inode
>> metadata in the tree, such as:
>> - mtime
>> - user
>> - group
>> - full permissions
>> - and also allow storage of the full range of file types (i.e.
>> block, character, pipe, etc.)
>>
>> This would allow git to be used as the basis for a complete
>> functional versioned filesystem (which I'd like to use for my
>> lightweight virtualisation tool, schroot, which currently
>> uses LVM snapshots for this purpose).
>>
>
> I believe someone else has done some work along the way of
> turning git into complete-with-metadata backupsystem before.
> Google might prove beneficial.
>
Although now that I come to think of it, storing "user" and
"group" made it near-enough totally useless for anything a
user had created as the repos hardly ever could be shared.
I'll say it again; Hooks can be written to handle this.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ 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