mirror of
https://github.com/git/git.git
synced 2026-03-13 10:23:30 +01:00
Merge branch 'master' of git://repo.or.cz/alt-git
This commit is contained in:
Johannes Sixt
@@ -183,6 +183,10 @@ or copyright violation) from all commits:
|
||||
git filter-branch --tree-filter 'rm filename' HEAD
|
||||
-------------------------------------------------------
|
||||
|
||||
However, if the file is absent from the tree of some commit,
|
||||
a simple `rm filename` will fail for that tree and commit.
|
||||
Thus you may instead want to use `rm -f filename` as the script.
|
||||
|
||||
A significantly faster version:
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
@@ -18,12 +18,15 @@ git-prune. See the section "NOTES", below.
|
||||
|
||||
This runs `git-fsck --unreachable` using all the refs
|
||||
available in `$GIT_DIR/refs`, optionally with additional set of
|
||||
objects specified on the command line, and prunes all
|
||||
objects specified on the command line, and prunes all unpacked
|
||||
objects unreachable from any of these head objects from the object database.
|
||||
In addition, it
|
||||
prunes the unpacked objects that are also found in packs by
|
||||
running `git prune-packed`.
|
||||
|
||||
Note that unreachable, packed objects will remain. If this is
|
||||
not desired, see linkgit:git-repack[1].
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ SYNOPSIS
|
||||
[verse]
|
||||
'git-submodule' [--quiet] add [-b branch] [--] <repository> [<path>]
|
||||
'git-submodule' [--quiet] status [--cached] [--] [<path>...]
|
||||
'git-submodule' [--quiet] [init|update] [--] [<path>...]
|
||||
'git-submodule' [--quiet] init [--] [<path>...]
|
||||
'git-submodule' [--quiet] update [--init] [--] [<path>...]
|
||||
'git-submodule' [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>...]
|
||||
|
||||
|
||||
@@ -47,6 +48,10 @@ update::
|
||||
Update the registered submodules, i.e. clone missing submodules and
|
||||
checkout the commit specified in the index of the containing repository.
|
||||
This will make the submodules HEAD be detached.
|
||||
+
|
||||
If the submodule is not yet initialized, and you just want to use the
|
||||
setting as stored in .gitmodules, you can automatically initialize the
|
||||
submodule with the --init option.
|
||||
|
||||
summary::
|
||||
Show commit summary between the given commit (defaults to HEAD) and
|
||||
|
||||
@@ -78,7 +78,7 @@ When 'konqueror' is specified by the a command line option or a
|
||||
configuration variable, we launch 'kfmclient' to try to open the HTML
|
||||
man page on an already opened konqueror in a new tab if possible.
|
||||
|
||||
For consistency, we also try such a trick if 'brower.konqueror.path' is
|
||||
For consistency, we also try such a trick if 'browser.konqueror.path' is
|
||||
set to something like 'A_PATH_TO/konqueror'. That means we will try to
|
||||
launch 'A_PATH_TO/kfmclient' instead.
|
||||
|
||||
|
||||
4
Makefile
4
Makefile
@@ -635,8 +635,12 @@ endif
|
||||
ifeq ($(uname_S),AIX)
|
||||
NO_STRCASESTR=YesPlease
|
||||
NO_MEMMEM = YesPlease
|
||||
NO_MKDTEMP = YesPlease
|
||||
NO_STRLCPY = YesPlease
|
||||
FREAD_READS_DIRECTORIES = UnfortunatelyYes
|
||||
INTERNAL_QSORT = UnfortunatelyYes
|
||||
NEEDS_LIBICONV=YesPlease
|
||||
BASIC_CFLAGS += -D_LARGE_FILES
|
||||
endif
|
||||
ifeq ($(uname_S),GNU)
|
||||
# GNU/Hurd
|
||||
|
||||
@@ -1690,7 +1690,7 @@ static void skip_optional_lf(void)
|
||||
ungetc(term_char, stdin);
|
||||
}
|
||||
|
||||
static void cmd_mark(void)
|
||||
static void parse_mark(void)
|
||||
{
|
||||
if (!prefixcmp(command_buf.buf, "mark :")) {
|
||||
next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
|
||||
@@ -1700,7 +1700,7 @@ static void cmd_mark(void)
|
||||
next_mark = 0;
|
||||
}
|
||||
|
||||
static void cmd_data(struct strbuf *sb)
|
||||
static void parse_data(struct strbuf *sb)
|
||||
{
|
||||
strbuf_reset(sb);
|
||||
|
||||
@@ -1798,13 +1798,13 @@ static char *parse_ident(const char *buf)
|
||||
return ident;
|
||||
}
|
||||
|
||||
static void cmd_new_blob(void)
|
||||
static void parse_new_blob(void)
|
||||
{
|
||||
static struct strbuf buf = STRBUF_INIT;
|
||||
|
||||
read_next_command();
|
||||
cmd_mark();
|
||||
cmd_data(&buf);
|
||||
parse_mark();
|
||||
parse_data(&buf);
|
||||
store_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);
|
||||
}
|
||||
|
||||
@@ -1908,7 +1908,7 @@ static void file_change_m(struct branch *b)
|
||||
p = uq.buf;
|
||||
}
|
||||
read_next_command();
|
||||
cmd_data(&buf);
|
||||
parse_data(&buf);
|
||||
store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
|
||||
} else if (oe) {
|
||||
if (oe->type != OBJ_BLOB)
|
||||
@@ -1995,7 +1995,7 @@ static void file_change_deleteall(struct branch *b)
|
||||
load_tree(&b->branch_tree);
|
||||
}
|
||||
|
||||
static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)
|
||||
static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
|
||||
{
|
||||
if (!buf || size < 46)
|
||||
die("Not a valid commit: %s", sha1_to_hex(b->sha1));
|
||||
@@ -2006,7 +2006,7 @@ static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)
|
||||
b->branch_tree.versions[1].sha1);
|
||||
}
|
||||
|
||||
static void cmd_from_existing(struct branch *b)
|
||||
static void parse_from_existing(struct branch *b)
|
||||
{
|
||||
if (is_null_sha1(b->sha1)) {
|
||||
hashclr(b->branch_tree.versions[0].sha1);
|
||||
@@ -2017,12 +2017,12 @@ static void cmd_from_existing(struct branch *b)
|
||||
|
||||
buf = read_object_with_reference(b->sha1,
|
||||
commit_type, &size, b->sha1);
|
||||
cmd_from_commit(b, buf, size);
|
||||
parse_from_commit(b, buf, size);
|
||||
free(buf);
|
||||
}
|
||||
}
|
||||
|
||||
static int cmd_from(struct branch *b)
|
||||
static int parse_from(struct branch *b)
|
||||
{
|
||||
const char *from;
|
||||
struct branch *s;
|
||||
@@ -2053,12 +2053,12 @@ static int cmd_from(struct branch *b)
|
||||
if (oe->pack_id != MAX_PACK_ID) {
|
||||
unsigned long size;
|
||||
char *buf = gfi_unpack_entry(oe, &size);
|
||||
cmd_from_commit(b, buf, size);
|
||||
parse_from_commit(b, buf, size);
|
||||
free(buf);
|
||||
} else
|
||||
cmd_from_existing(b);
|
||||
parse_from_existing(b);
|
||||
} else if (!get_sha1(from, b->sha1))
|
||||
cmd_from_existing(b);
|
||||
parse_from_existing(b);
|
||||
else
|
||||
die("Invalid ref name or SHA1 expression: %s", from);
|
||||
|
||||
@@ -2066,7 +2066,7 @@ static int cmd_from(struct branch *b)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static struct hash_list *cmd_merge(unsigned int *count)
|
||||
static struct hash_list *parse_merge(unsigned int *count)
|
||||
{
|
||||
struct hash_list *list = NULL, *n, *e = e;
|
||||
const char *from;
|
||||
@@ -2107,7 +2107,7 @@ static struct hash_list *cmd_merge(unsigned int *count)
|
||||
return list;
|
||||
}
|
||||
|
||||
static void cmd_new_commit(void)
|
||||
static void parse_new_commit(void)
|
||||
{
|
||||
static struct strbuf msg = STRBUF_INIT;
|
||||
struct branch *b;
|
||||
@@ -2124,7 +2124,7 @@ static void cmd_new_commit(void)
|
||||
b = new_branch(sp);
|
||||
|
||||
read_next_command();
|
||||
cmd_mark();
|
||||
parse_mark();
|
||||
if (!prefixcmp(command_buf.buf, "author ")) {
|
||||
author = parse_ident(command_buf.buf + 7);
|
||||
read_next_command();
|
||||
@@ -2135,10 +2135,10 @@ static void cmd_new_commit(void)
|
||||
}
|
||||
if (!committer)
|
||||
die("Expected committer but didn't get one");
|
||||
cmd_data(&msg);
|
||||
parse_data(&msg);
|
||||
read_next_command();
|
||||
cmd_from(b);
|
||||
merge_list = cmd_merge(&merge_count);
|
||||
parse_from(b);
|
||||
merge_list = parse_merge(&merge_count);
|
||||
|
||||
/* ensure the branch is active/loaded */
|
||||
if (!b->branch_tree.tree || !max_active_branches) {
|
||||
@@ -2196,7 +2196,7 @@ static void cmd_new_commit(void)
|
||||
b->last_commit = object_count_by_type[OBJ_COMMIT];
|
||||
}
|
||||
|
||||
static void cmd_new_tag(void)
|
||||
static void parse_new_tag(void)
|
||||
{
|
||||
static struct strbuf msg = STRBUF_INIT;
|
||||
char *sp;
|
||||
@@ -2253,7 +2253,7 @@ static void cmd_new_tag(void)
|
||||
|
||||
/* tag payload/message */
|
||||
read_next_command();
|
||||
cmd_data(&msg);
|
||||
parse_data(&msg);
|
||||
|
||||
/* build the tag object */
|
||||
strbuf_reset(&new_data);
|
||||
@@ -2273,7 +2273,7 @@ static void cmd_new_tag(void)
|
||||
t->pack_id = pack_id;
|
||||
}
|
||||
|
||||
static void cmd_reset_branch(void)
|
||||
static void parse_reset_branch(void)
|
||||
{
|
||||
struct branch *b;
|
||||
char *sp;
|
||||
@@ -2293,12 +2293,12 @@ static void cmd_reset_branch(void)
|
||||
else
|
||||
b = new_branch(sp);
|
||||
read_next_command();
|
||||
cmd_from(b);
|
||||
parse_from(b);
|
||||
if (command_buf.len > 0)
|
||||
unread_command_buf = 1;
|
||||
}
|
||||
|
||||
static void cmd_checkpoint(void)
|
||||
static void parse_checkpoint(void)
|
||||
{
|
||||
if (object_count) {
|
||||
cycle_packfile();
|
||||
@@ -2309,7 +2309,7 @@ static void cmd_checkpoint(void)
|
||||
skip_optional_lf();
|
||||
}
|
||||
|
||||
static void cmd_progress(void)
|
||||
static void parse_progress(void)
|
||||
{
|
||||
fwrite(command_buf.buf, 1, command_buf.len, stdout);
|
||||
fputc('\n', stdout);
|
||||
@@ -2449,17 +2449,17 @@ int main(int argc, const char **argv)
|
||||
set_die_routine(die_nicely);
|
||||
while (read_next_command() != EOF) {
|
||||
if (!strcmp("blob", command_buf.buf))
|
||||
cmd_new_blob();
|
||||
parse_new_blob();
|
||||
else if (!prefixcmp(command_buf.buf, "commit "))
|
||||
cmd_new_commit();
|
||||
parse_new_commit();
|
||||
else if (!prefixcmp(command_buf.buf, "tag "))
|
||||
cmd_new_tag();
|
||||
parse_new_tag();
|
||||
else if (!prefixcmp(command_buf.buf, "reset "))
|
||||
cmd_reset_branch();
|
||||
parse_reset_branch();
|
||||
else if (!strcmp("checkpoint", command_buf.buf))
|
||||
cmd_checkpoint();
|
||||
parse_checkpoint();
|
||||
else if (!prefixcmp(command_buf.buf, "progress "))
|
||||
cmd_progress();
|
||||
parse_progress();
|
||||
else
|
||||
die("Unsupported command: %s", command_buf.buf);
|
||||
}
|
||||
|
||||
@@ -601,6 +601,7 @@ proc apply_config {} {
|
||||
}
|
||||
}
|
||||
|
||||
set default_config(branch.autosetupmerge) true
|
||||
set default_config(merge.diffstat) true
|
||||
set default_config(merge.summary) false
|
||||
set default_config(merge.verbosity) 2
|
||||
|
||||
@@ -183,6 +183,9 @@ method _create {} {
|
||||
if {$spec ne {} && $opt_fetch} {
|
||||
$co enable_fetch $spec
|
||||
}
|
||||
if {$spec ne {}} {
|
||||
$co remote_source $spec
|
||||
}
|
||||
|
||||
if {[$co run]} {
|
||||
destroy $w
|
||||
|
||||
@@ -127,7 +127,7 @@ method _delete {} {
|
||||
foreach i $to_delete {
|
||||
set b [lindex $i 0]
|
||||
set o [lindex $i 1]
|
||||
if {[catch {git update-ref -d "refs/heads/$b" $o} err]} {
|
||||
if {[catch {git branch -D $b} err]} {
|
||||
append failed " - $b: $err\n"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ field merge_base {}; # merge base if we have another ref involved
|
||||
field fetch_spec {}; # refetch tracking branch if used?
|
||||
field checkout 1; # actually checkout the branch?
|
||||
field create 0; # create the branch if it doesn't exist?
|
||||
field remote_source {}; # same as fetch_spec, to setup tracking
|
||||
|
||||
field reset_ok 0; # did the user agree to reset?
|
||||
field fetch_ok 0; # did the fetch succeed?
|
||||
@@ -44,6 +45,10 @@ method enable_fetch {spec} {
|
||||
set fetch_spec $spec
|
||||
}
|
||||
|
||||
method remote_source {spec} {
|
||||
set remote_source $spec
|
||||
}
|
||||
|
||||
method enable_checkout {co} {
|
||||
set checkout $co
|
||||
}
|
||||
@@ -145,7 +150,7 @@ method _finish_fetch {ok} {
|
||||
}
|
||||
|
||||
method _update_ref {} {
|
||||
global null_sha1 current_branch
|
||||
global null_sha1 current_branch repo_config
|
||||
|
||||
set ref $new_ref
|
||||
set new $new_hash
|
||||
@@ -172,6 +177,23 @@ method _update_ref {} {
|
||||
|
||||
set reflog_msg "branch: Created from $new_expr"
|
||||
set cur $null_sha1
|
||||
|
||||
if {($repo_config(branch.autosetupmerge) eq {true}
|
||||
|| $repo_config(branch.autosetupmerge) eq {always})
|
||||
&& $remote_source ne {}
|
||||
&& "refs/heads/$newbranch" eq $ref} {
|
||||
|
||||
set c_remote [lindex $remote_source 1]
|
||||
set c_merge [lindex $remote_source 2]
|
||||
if {[catch {
|
||||
git config branch.$newbranch.remote $c_remote
|
||||
git config branch.$newbranch.merge $c_merge
|
||||
} err]} {
|
||||
_error $this [strcat \
|
||||
[mc "Failed to configure simplified git-pull for '%s'." $newbranch] \
|
||||
"\n\n$err"]
|
||||
}
|
||||
}
|
||||
} elseif {$create && $merge_type eq {none}} {
|
||||
# We were told to create it, but not do a merge.
|
||||
# Bad. Name shouldn't have existed.
|
||||
|
||||
@@ -102,8 +102,8 @@ proc hint_gc {} {
|
||||
*]]
|
||||
|
||||
if {$objects_current >= $object_limit} {
|
||||
set objects_current [expr {$objects_current * 256}]
|
||||
set object_limit [expr {$object_limit * 256}]
|
||||
set objects_current [expr {$objects_current * 250}]
|
||||
set object_limit [expr {$object_limit * 250}]
|
||||
if {[ask_popup \
|
||||
[mc "This repository currently has approximately %i loose objects.
|
||||
|
||||
|
||||
@@ -84,13 +84,19 @@ method _connect {pipe_fd} {
|
||||
regexp \
|
||||
{International Ispell Version .* \(but really (Aspell .*?)\)$} \
|
||||
$s_version _junk s_version
|
||||
regexp {^Aspell (\d)+\.(\d+)} $s_version _junk major minor
|
||||
|
||||
puts $pipe_fd ! ; # enable terse mode
|
||||
puts $pipe_fd {$$cr master} ; # fetch the language
|
||||
flush $pipe_fd
|
||||
|
||||
gets $pipe_fd s_lang
|
||||
regexp {[/\\]([^/\\]+)\.[^\.]+$} $s_lang _ s_lang
|
||||
# fetch the language
|
||||
if {$major > 0 || ($major == 0 && $minor >= 60)} {
|
||||
puts $pipe_fd {$$cr master}
|
||||
flush $pipe_fd
|
||||
gets $pipe_fd s_lang
|
||||
regexp {[/\\]([^/\\]+)\.[^\.]+$} $s_lang _ s_lang
|
||||
} else {
|
||||
set s_lang {}
|
||||
}
|
||||
|
||||
if {$::default_config(gui.spellingdictionary) eq {}
|
||||
&& [get_config gui.spellingdictionary] eq {}} {
|
||||
|
||||
@@ -8,7 +8,7 @@ msgstr ""
|
||||
"Project-Id-Version: git-gui\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2008-03-14 07:18+0100\n"
|
||||
"PO-Revision-Date: 2008-02-16 21:52+0100\n"
|
||||
"PO-Revision-Date: 2008-05-01 11:51+0200\n"
|
||||
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
|
||||
"Language-Team: German\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -1754,9 +1754,8 @@ msgid "Number of Diff Context Lines"
|
||||
msgstr "Anzahl der Kontextzeilen beim Vergleich"
|
||||
|
||||
#: lib/option.tcl:127
|
||||
#, fuzzy
|
||||
msgid "Commit Message Text Width"
|
||||
msgstr "Versionsbeschreibung:"
|
||||
msgstr "Textbreite der Versionsbeschreibung"
|
||||
|
||||
#: lib/option.tcl:128
|
||||
msgid "New Branch Name Template"
|
||||
@@ -1895,40 +1894,36 @@ msgstr "Fehler beim Erstellen des Icons:"
|
||||
|
||||
#: lib/spellcheck.tcl:57
|
||||
msgid "Unsupported spell checker"
|
||||
msgstr ""
|
||||
msgstr "Rechtschreibprüfungsprogramm nicht unterstützt"
|
||||
|
||||
#: lib/spellcheck.tcl:65
|
||||
#, fuzzy
|
||||
msgid "Spell checking is unavailable"
|
||||
msgstr "Rechtschreibprüfung fehlgeschlagen"
|
||||
msgstr "Rechtschreibprüfung nicht verfügbar"
|
||||
|
||||
#: lib/spellcheck.tcl:68
|
||||
msgid "Invalid spell checking configuration"
|
||||
msgstr ""
|
||||
msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung"
|
||||
|
||||
#: lib/spellcheck.tcl:70
|
||||
#, tcl-format
|
||||
msgid "Reverting dictionary to %s."
|
||||
msgstr ""
|
||||
msgstr "Wörterbuch auf %s zurückgesetzt."
|
||||
|
||||
#: lib/spellcheck.tcl:73
|
||||
#, fuzzy
|
||||
msgid "Spell checker silently failed on startup"
|
||||
msgstr "Rechtschreibprüfung fehlgeschlagen"
|
||||
msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen"
|
||||
|
||||
#: lib/spellcheck.tcl:80
|
||||
#, fuzzy
|
||||
msgid "Unrecognized spell checker"
|
||||
msgstr "Unbekannte Version von »aspell«"
|
||||
msgstr "Unbekanntes Rechtschreibprüfungsprogramm"
|
||||
|
||||
#: lib/spellcheck.tcl:180
|
||||
msgid "No Suggestions"
|
||||
msgstr "Keine Vorschläge"
|
||||
|
||||
#: lib/spellcheck.tcl:381
|
||||
#, fuzzy
|
||||
msgid "Unexpected EOF from spell checker"
|
||||
msgstr "Unerwartetes EOF von »aspell«"
|
||||
msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm"
|
||||
|
||||
#: lib/spellcheck.tcl:385
|
||||
msgid "Spell Checker Failed"
|
||||
@@ -2002,6 +1997,3 @@ msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
|
||||
#: lib/transport.tcl:168
|
||||
msgid "Include tags"
|
||||
msgstr "Mit Markierungen übertragen"
|
||||
|
||||
#~ msgid "Not connected to aspell"
|
||||
#~ msgstr "Keine Verbindung zu »aspell«"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
# Copyright (c) 2007 Lars Hjemli
|
||||
|
||||
USAGE="[--quiet] [--cached] \
|
||||
[add <repo> [-b branch]|status|init|update|summary [-n|--summary-limit <n>] [<commit>]] \
|
||||
[add <repo> [-b branch]|status|init|update [-i|--init]|summary [-n|--summary-limit <n>] [<commit>]] \
|
||||
[--] [<path>...]"
|
||||
OPTIONS_SPEC=
|
||||
. git-sh-setup
|
||||
@@ -74,8 +74,7 @@ module_name()
|
||||
{
|
||||
# Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
|
||||
re=$(printf '%s' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
|
||||
name=$( GIT_CONFIG=.gitmodules \
|
||||
git config --get-regexp '^submodule\..*\.path$' |
|
||||
name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
|
||||
sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
|
||||
test -z "$name" &&
|
||||
die "No submodule mapping found in .gitmodules for path '$path'"
|
||||
@@ -198,8 +197,8 @@ cmd_add()
|
||||
git add "$path" ||
|
||||
die "Failed to add submodule '$path'"
|
||||
|
||||
GIT_CONFIG=.gitmodules git config submodule."$path".path "$path" &&
|
||||
GIT_CONFIG=.gitmodules git config submodule."$path".url "$repo" &&
|
||||
git config -f .gitmodules submodule."$path".path "$path" &&
|
||||
git config -f .gitmodules submodule."$path".url "$repo" &&
|
||||
git add .gitmodules ||
|
||||
die "Failed to register submodule '$path'"
|
||||
}
|
||||
@@ -240,7 +239,7 @@ cmd_init()
|
||||
url=$(git config submodule."$name".url)
|
||||
test -z "$url" || continue
|
||||
|
||||
url=$(GIT_CONFIG=.gitmodules git config submodule."$name".url)
|
||||
url=$(git config -f .gitmodules submodule."$name".url)
|
||||
test -z "$url" &&
|
||||
die "No url found for submodule path '$path' in .gitmodules"
|
||||
|
||||
@@ -272,6 +271,10 @@ cmd_update()
|
||||
-q|--quiet)
|
||||
quiet=1
|
||||
;;
|
||||
-i|--init)
|
||||
shift
|
||||
cmd_init "$@" || return
|
||||
;;
|
||||
--)
|
||||
shift
|
||||
break
|
||||
@@ -297,6 +300,7 @@ cmd_update()
|
||||
# path have been specified
|
||||
test "$#" != "0" &&
|
||||
say "Submodule path '$path' not initialized"
|
||||
say "Maybe you want to use 'update --init'?"
|
||||
continue
|
||||
fi
|
||||
|
||||
|
||||
@@ -44,9 +44,9 @@ endif
|
||||
all:: gitk-wish $(ALL_MSGFILES)
|
||||
|
||||
install:: all
|
||||
$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
|
||||
$(INSTALL) -d '$(DESTDIR_SQ)$(msgsdir_SQ)'
|
||||
$(foreach p,$(ALL_MSGFILES), $(INSTALL) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
|
||||
$(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
|
||||
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
|
||||
$(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
|
||||
|
||||
uninstall::
|
||||
$(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
|
||||
|
||||
2608
gitk-git/gitk
2608
gitk-git/gitk
File diff suppressed because it is too large
Load Diff
890
gitk-git/gitk-git/po/es.po
Normal file
890
gitk-git/gitk-git/po/es.po
Normal file
@@ -0,0 +1,890 @@
|
||||
# Translation of gitk
|
||||
# Copyright (C) 2005-2008 Santiago Gala
|
||||
# This file is distributed under the same license as the gitk package.
|
||||
# Santiago Gala <santiago.gala@gmail.com>, 2008.
|
||||
#
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gitk\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2008-03-13 17:29+0100\n"
|
||||
"PO-Revision-Date: 2008-03-25 11:20+0100\n"
|
||||
"Last-Translator: Santiago Gala <santiago.gala@gmail.com>\n"
|
||||
"Language-Team: Spanish\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: gitk:111
|
||||
msgid "Error executing git rev-list:"
|
||||
msgstr "Error al ejecutar git rev-list:"
|
||||
|
||||
#: gitk:124
|
||||
msgid "Reading"
|
||||
msgstr "Leyendo"
|
||||
|
||||
#: gitk:151 gitk:2191
|
||||
msgid "Reading commits..."
|
||||
msgstr "Leyendo revisiones..."
|
||||
|
||||
#: gitk:275
|
||||
msgid "Can't parse git log output:"
|
||||
msgstr "Error analizando la salida de git log:"
|
||||
|
||||
#: gitk:386 gitk:2195
|
||||
msgid "No commits selected"
|
||||
msgstr "No se seleccionaron revisiones"
|
||||
|
||||
#: gitk:500
|
||||
msgid "No commit information available"
|
||||
msgstr "Falta información sobre las revisiones"
|
||||
|
||||
#: gitk:599 gitk:621 gitk:1955 gitk:6423 gitk:7923 gitk:8082
|
||||
msgid "OK"
|
||||
msgstr "Aceptar"
|
||||
|
||||
#: gitk:623 gitk:1956 gitk:6107 gitk:6178 gitk:6275 gitk:6321 gitk:6425
|
||||
#: gitk:7924 gitk:8083
|
||||
msgid "Cancel"
|
||||
msgstr "Cancelar"
|
||||
|
||||
#: gitk:661
|
||||
msgid "File"
|
||||
msgstr "Archivo"
|
||||
|
||||
#: gitk:663
|
||||
msgid "Update"
|
||||
msgstr "Actualizar"
|
||||
|
||||
#: gitk:664
|
||||
msgid "Reread references"
|
||||
msgstr "Releer referencias"
|
||||
|
||||
#: gitk:665
|
||||
msgid "List references"
|
||||
msgstr "Lista de referencias"
|
||||
|
||||
#: gitk:666
|
||||
msgid "Quit"
|
||||
msgstr "Salir"
|
||||
|
||||
#: gitk:668
|
||||
msgid "Edit"
|
||||
msgstr "Editar"
|
||||
|
||||
#: gitk:669
|
||||
msgid "Preferences"
|
||||
msgstr "Preferencias"
|
||||
|
||||
#: gitk:672 gitk:1892
|
||||
msgid "View"
|
||||
msgstr "Vista"
|
||||
|
||||
#: gitk:673
|
||||
msgid "New view..."
|
||||
msgstr "Nueva vista..."
|
||||
|
||||
#: gitk:674 gitk:2133 gitk:8722
|
||||
msgid "Edit view..."
|
||||
msgstr "Modificar vista..."
|
||||
|
||||
#: gitk:676 gitk:2134 gitk:8723
|
||||
msgid "Delete view"
|
||||
msgstr "Eliminar vista"
|
||||
|
||||
#: gitk:678
|
||||
msgid "All files"
|
||||
msgstr "Todos los archivos"
|
||||
|
||||
#: gitk:682
|
||||
msgid "Help"
|
||||
msgstr "Ayuda"
|
||||
|
||||
#: gitk:683 gitk:1317
|
||||
msgid "About gitk"
|
||||
msgstr "Acerca de gitk"
|
||||
|
||||
#: gitk:684
|
||||
msgid "Key bindings"
|
||||
msgstr "Combinaciones de teclas"
|
||||
|
||||
#: gitk:741
|
||||
msgid "SHA1 ID: "
|
||||
msgstr "SHA1 ID: "
|
||||
|
||||
#: gitk:791
|
||||
msgid "Find"
|
||||
msgstr "Buscar"
|
||||
|
||||
#: gitk:792
|
||||
msgid "next"
|
||||
msgstr "<<"
|
||||
|
||||
#: gitk:793
|
||||
msgid "prev"
|
||||
msgstr ">>"
|
||||
|
||||
#: gitk:794
|
||||
msgid "commit"
|
||||
msgstr "revisión"
|
||||
|
||||
#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
|
||||
msgid "containing:"
|
||||
msgstr "que contiene:"
|
||||
|
||||
#: gitk:800 gitk:1778 gitk:1783 gitk:2431
|
||||
msgid "touching paths:"
|
||||
msgstr "que modifica la ruta:"
|
||||
|
||||
#: gitk:801 gitk:2436
|
||||
msgid "adding/removing string:"
|
||||
msgstr "que añade/elimina cadena:"
|
||||
|
||||
#: gitk:810 gitk:812
|
||||
msgid "Exact"
|
||||
msgstr "Exacto"
|
||||
|
||||
#: gitk:812 gitk:2514 gitk:4274
|
||||
msgid "IgnCase"
|
||||
msgstr "NoMayús"
|
||||
|
||||
#: gitk:812 gitk:2405 gitk:2512 gitk:4270
|
||||
msgid "Regexp"
|
||||
msgstr "Regex"
|
||||
|
||||
#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436
|
||||
msgid "All fields"
|
||||
msgstr "Todos los campos"
|
||||
|
||||
#: gitk:815 gitk:2531 gitk:2563 gitk:4336
|
||||
msgid "Headline"
|
||||
msgstr "Título"
|
||||
|
||||
#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827
|
||||
msgid "Comments"
|
||||
msgstr "Comentarios"
|
||||
|
||||
#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5956
|
||||
#: gitk:5971
|
||||
msgid "Author"
|
||||
msgstr "Autor"
|
||||
|
||||
#: gitk:816 gitk:2531 gitk:4336 gitk:4765
|
||||
msgid "Committer"
|
||||
msgstr ""
|
||||
|
||||
#: gitk:845
|
||||
msgid "Search"
|
||||
msgstr "Buscar"
|
||||
|
||||
#: gitk:852
|
||||
msgid "Diff"
|
||||
msgstr "Diferencia"
|
||||
|
||||
#: gitk:854
|
||||
msgid "Old version"
|
||||
msgstr "Versión antigua"
|
||||
|
||||
#: gitk:856
|
||||
msgid "New version"
|
||||
msgstr "Versión nueva"
|
||||
|
||||
#: gitk:858
|
||||
msgid "Lines of context"
|
||||
msgstr "Líneas de contexto"
|
||||
|
||||
#: gitk:868
|
||||
msgid "Ignore space change"
|
||||
msgstr "Ignora cambios de espaciado"
|
||||
|
||||
#: gitk:926
|
||||
msgid "Patch"
|
||||
msgstr "Parche"
|
||||
|
||||
#: gitk:928
|
||||
msgid "Tree"
|
||||
msgstr "Árbol"
|
||||
|
||||
#: gitk:1053 gitk:1068 gitk:6022
|
||||
msgid "Diff this -> selected"
|
||||
msgstr "Diferencia de esta -> seleccionada"
|
||||
|
||||
#: gitk:1055 gitk:1070 gitk:6023
|
||||
msgid "Diff selected -> this"
|
||||
msgstr "Diferencia de seleccionada -> esta"
|
||||
|
||||
#: gitk:1057 gitk:1072 gitk:6024
|
||||
msgid "Make patch"
|
||||
msgstr "Crear patch"
|
||||
|
||||
#: gitk:1058 gitk:6162
|
||||
msgid "Create tag"
|
||||
msgstr "Crear etiqueta"
|
||||
|
||||
#: gitk:1059 gitk:6255
|
||||
msgid "Write commit to file"
|
||||
msgstr "Escribir revisiones a archivo"
|
||||
|
||||
#: gitk:1060 gitk:6309
|
||||
msgid "Create new branch"
|
||||
msgstr "Crear nueva rama"
|
||||
|
||||
#: gitk:1061
|
||||
msgid "Cherry-pick this commit"
|
||||
msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
|
||||
|
||||
#: gitk:1063
|
||||
msgid "Reset HEAD branch to here"
|
||||
msgstr "Traer la rama HEAD aquí"
|
||||
|
||||
#: gitk:1079
|
||||
msgid "Check out this branch"
|
||||
msgstr "Cambiar a esta rama"
|
||||
|
||||
#: gitk:1081
|
||||
msgid "Remove this branch"
|
||||
msgstr "Eliminar esta rama"
|
||||
|
||||
#: gitk:1087
|
||||
msgid "Highlight this too"
|
||||
msgstr "Seleccionar también"
|
||||
|
||||
#: gitk:1089
|
||||
msgid "Highlight this only"
|
||||
msgstr "Seleccionar sólo"
|
||||
|
||||
#: gitk:1318
|
||||
msgid ""
|
||||
"\n"
|
||||
"Gitk - a commit viewer for git\n"
|
||||
"\n"
|
||||
"Copyright © 2005-2006 Paul Mackerras\n"
|
||||
"\n"
|
||||
"Use and redistribute under the terms of the GNU General Public License"
|
||||
msgstr ""
|
||||
"\n"
|
||||
"Gitk - un visualizador de revisiones para git\n"
|
||||
"\n"
|
||||
"Copyright © 2005-2006 Paul Mackerras\n"
|
||||
"\n"
|
||||
"Uso y redistribución permitidos según los términos de la Licencia Pública General de "
|
||||
"GNU (GNU GPL)"
|
||||
|
||||
#: gitk:1326 gitk:1387 gitk:6581
|
||||
msgid "Close"
|
||||
msgstr "Cerrar"
|
||||
|
||||
#: gitk:1345
|
||||
msgid "Gitk key bindings"
|
||||
msgstr "Combinaciones de tecla de Gitk"
|
||||
|
||||
#: gitk:1347
|
||||
msgid "Gitk key bindings:"
|
||||
msgstr "Combinaciones de tecla de Gitk:"
|
||||
|
||||
#: gitk:1349
|
||||
#, tcl-format
|
||||
msgid "<%s-Q>\t\tQuit"
|
||||
msgstr "<%s-Q>\t\tSalir"
|
||||
|
||||
#: gitk:1350
|
||||
msgid "<Home>\t\tMove to first commit"
|
||||
msgstr "<Home>\t\tIr a la primera revisión"
|
||||
|
||||
#: gitk:1351
|
||||
msgid "<End>\t\tMove to last commit"
|
||||
msgstr "<End>\t\tIr a la última revisión"
|
||||
|
||||
#: gitk:1352
|
||||
msgid "<Up>, p, i\tMove up one commit"
|
||||
msgstr "<Up>, p, i\tSubir una revisión"
|
||||
|
||||
#: gitk:1353
|
||||
msgid "<Down>, n, k\tMove down one commit"
|
||||
msgstr "<Down>, n, k\tBajar una revisión"
|
||||
|
||||
#: gitk:1354
|
||||
msgid "<Left>, z, j\tGo back in history list"
|
||||
msgstr "<Left>, z, j\tRetroceder en la historia"
|
||||
|
||||
#: gitk:1355
|
||||
msgid "<Right>, x, l\tGo forward in history list"
|
||||
msgstr "<Right>, x, l\tAvanzar en la historia"
|
||||
|
||||
#: gitk:1356
|
||||
msgid "<PageUp>\tMove up one page in commit list"
|
||||
msgstr "<PageUp>\tSubir una página en la lista de revisiones"
|
||||
|
||||
#: gitk:1357
|
||||
msgid "<PageDown>\tMove down one page in commit list"
|
||||
msgstr "<PageDown>\tBajar una página en la lista de revisiones"
|
||||
|
||||
#: gitk:1358
|
||||
#, tcl-format
|
||||
msgid "<%s-Home>\tScroll to top of commit list"
|
||||
msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones"
|
||||
|
||||
#: gitk:1359
|
||||
#, tcl-format
|
||||
msgid "<%s-End>\tScroll to bottom of commit list"
|
||||
msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones"
|
||||
|
||||
#: gitk:1360
|
||||
#, tcl-format
|
||||
msgid "<%s-Up>\tScroll commit list up one line"
|
||||
msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones"
|
||||
|
||||
#: gitk:1361
|
||||
#, tcl-format
|
||||
msgid "<%s-Down>\tScroll commit list down one line"
|
||||
msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones"
|
||||
|
||||
#: gitk:1362
|
||||
#, tcl-format
|
||||
msgid "<%s-PageUp>\tScroll commit list up one page"
|
||||
msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones"
|
||||
|
||||
#: gitk:1363
|
||||
#, tcl-format
|
||||
msgid "<%s-PageDown>\tScroll commit list down one page"
|
||||
msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones"
|
||||
|
||||
#: gitk:1364
|
||||
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
|
||||
msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)"
|
||||
|
||||
#: gitk:1365
|
||||
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
|
||||
msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)"
|
||||
|
||||
#: gitk:1366
|
||||
msgid "<Delete>, b\tScroll diff view up one page"
|
||||
msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias"
|
||||
|
||||
#: gitk:1367
|
||||
msgid "<Backspace>\tScroll diff view up one page"
|
||||
msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias"
|
||||
|
||||
#: gitk:1368
|
||||
msgid "<Space>\t\tScroll diff view down one page"
|
||||
msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias"
|
||||
|
||||
#: gitk:1369
|
||||
msgid "u\t\tScroll diff view up 18 lines"
|
||||
msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias"
|
||||
|
||||
#: gitk:1370
|
||||
msgid "d\t\tScroll diff view down 18 lines"
|
||||
msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias"
|
||||
|
||||
#: gitk:1371
|
||||
#, tcl-format
|
||||
msgid "<%s-F>\t\tFind"
|
||||
msgstr "<%s-F>\t\tBuscar"
|
||||
|
||||
#: gitk:1372
|
||||
#, tcl-format
|
||||
msgid "<%s-G>\t\tMove to next find hit"
|
||||
msgstr "<%s-G>\t\tBuscar el siguiente"
|
||||
|
||||
#: gitk:1373
|
||||
msgid "<Return>\tMove to next find hit"
|
||||
msgstr "<Return>\tBuscar el siguiente"
|
||||
|
||||
#: gitk:1374
|
||||
msgid "/\t\tMove to next find hit, or redo find"
|
||||
msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda"
|
||||
|
||||
#: gitk:1375
|
||||
msgid "?\t\tMove to previous find hit"
|
||||
msgstr "?\t\tBuscar el anterior"
|
||||
|
||||
#: gitk:1376
|
||||
msgid "f\t\tScroll diff view to next file"
|
||||
msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
|
||||
|
||||
#: gitk:1377
|
||||
#, tcl-format
|
||||
msgid "<%s-S>\t\tSearch for next hit in diff view"
|
||||
msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias"
|
||||
|
||||
#: gitk:1378
|
||||
#, tcl-format
|
||||
msgid "<%s-R>\t\tSearch for previous hit in diff view"
|
||||
msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias"
|
||||
|
||||
#: gitk:1379
|
||||
#, tcl-format
|
||||
msgid "<%s-KP+>\tIncrease font size"
|
||||
msgstr "<%s-KP+>\tAumentar tamaño del texto"
|
||||
|
||||
#: gitk:1380
|
||||
#, tcl-format
|
||||
msgid "<%s-plus>\tIncrease font size"
|
||||
msgstr "<%s-plus>\tAumentar tamaño del texto"
|
||||
|
||||
#: gitk:1381
|
||||
#, tcl-format
|
||||
msgid "<%s-KP->\tDecrease font size"
|
||||
msgstr "<%s-KP->\tDisminuir tamaño del texto"
|
||||
|
||||
#: gitk:1382
|
||||
#, tcl-format
|
||||
msgid "<%s-minus>\tDecrease font size"
|
||||
msgstr "<%s-minus>\tDisminuir tamaño del texto"
|
||||
|
||||
#: gitk:1383
|
||||
msgid "<F5>\t\tUpdate"
|
||||
msgstr "<F5>\t\tActualizar"
|
||||
|
||||
#: gitk:1896
|
||||
msgid "Gitk view definition"
|
||||
msgstr "Definición de vistas de Gitk"
|
||||
|
||||
#: gitk:1921
|
||||
msgid "Name"
|
||||
msgstr "Nombre"
|
||||
|
||||
#: gitk:1924
|
||||
msgid "Remember this view"
|
||||
msgstr "Recordar esta vista"
|
||||
|
||||
#: gitk:1928
|
||||
msgid "Commits to include (arguments to git rev-list):"
|
||||
msgstr "Revisiones a incluir (argumentos a git rev-list):"
|
||||
|
||||
#: gitk:1935
|
||||
msgid "Command to generate more commits to include:"
|
||||
msgstr "Comando que genera más revisiones a incluir:"
|
||||
|
||||
#: gitk:1942
|
||||
msgid "Enter files and directories to include, one per line:"
|
||||
msgstr "Introducir archivos y directorios a incluir, uno por línea:"
|
||||
|
||||
#: gitk:1989
|
||||
msgid "Error in commit selection arguments:"
|
||||
msgstr "Error en los argumentos de selección de las revisiones:"
|
||||
|
||||
#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8688 gitk:8689
|
||||
msgid "None"
|
||||
msgstr "Ninguno"
|
||||
|
||||
#: gitk:2531 gitk:4336 gitk:5958 gitk:5973
|
||||
msgid "Date"
|
||||
msgstr "Fecha"
|
||||
|
||||
#: gitk:2531 gitk:4336
|
||||
msgid "CDate"
|
||||
msgstr "Fecha de creación"
|
||||
|
||||
#: gitk:2680 gitk:2685
|
||||
msgid "Descendant"
|
||||
msgstr "Descendiente"
|
||||
|
||||
#: gitk:2681
|
||||
msgid "Not descendant"
|
||||
msgstr "No descendiente"
|
||||
|
||||
#: gitk:2688 gitk:2693
|
||||
msgid "Ancestor"
|
||||
msgstr "Antepasado"
|
||||
|
||||
#: gitk:2689
|
||||
msgid "Not ancestor"
|
||||
msgstr "No antepasado"
|
||||
|
||||
#: gitk:2924
|
||||
msgid "Local changes checked in to index but not committed"
|
||||
msgstr "Cambios locales añadidos al índice pero sin completar revisión"
|
||||
|
||||
#: gitk:2954
|
||||
msgid "Local uncommitted changes, not checked in to index"
|
||||
msgstr "Cambios locales sin añadir al índice"
|
||||
|
||||
#: gitk:4305
|
||||
msgid "Searching"
|
||||
msgstr "Buscando"
|
||||
|
||||
#: gitk:4767
|
||||
msgid "Tags:"
|
||||
msgstr "Etiquetas:"
|
||||
|
||||
#: gitk:4784 gitk:4790 gitk:5951
|
||||
msgid "Parent"
|
||||
msgstr "Padre"
|
||||
|
||||
#: gitk:4795
|
||||
msgid "Child"
|
||||
msgstr "Hija"
|
||||
|
||||
#: gitk:4804
|
||||
msgid "Branch"
|
||||
msgstr "Rama"
|
||||
|
||||
#: gitk:4807
|
||||
msgid "Follows"
|
||||
msgstr "Sigue-a"
|
||||
|
||||
#: gitk:4810
|
||||
msgid "Precedes"
|
||||
msgstr "Precede-a"
|
||||
|
||||
#: gitk:5093
|
||||
msgid "Error getting merge diffs:"
|
||||
msgstr "Error al leer las diferencias de fusión:"
|
||||
|
||||
#: gitk:5778
|
||||
msgid "Goto:"
|
||||
msgstr "Ir a:"
|
||||
|
||||
#: gitk:5780
|
||||
msgid "SHA1 ID:"
|
||||
msgstr "SHA1 ID:"
|
||||
|
||||
#: gitk:5805
|
||||
#, tcl-format
|
||||
msgid "Short SHA1 id %s is ambiguous"
|
||||
msgstr "La id SHA1 abreviada %s es ambigua"
|
||||
|
||||
#: gitk:5817
|
||||
#, tcl-format
|
||||
msgid "SHA1 id %s is not known"
|
||||
msgstr "La id SHA1 %s es desconocida"
|
||||
|
||||
#: gitk:5819
|
||||
#, tcl-format
|
||||
msgid "Tag/Head %s is not known"
|
||||
msgstr "La etiqueta/rama %s es deconocida"
|
||||
|
||||
#: gitk:5961
|
||||
msgid "Children"
|
||||
msgstr "Hijas"
|
||||
|
||||
#: gitk:6018
|
||||
#, tcl-format
|
||||
msgid "Reset %s branch to here"
|
||||
msgstr "Poner la rama %s en esta revisión"
|
||||
|
||||
#: gitk:6049
|
||||
msgid "Top"
|
||||
msgstr "Origen"
|
||||
|
||||
#: gitk:6050
|
||||
msgid "From"
|
||||
msgstr "De"
|
||||
|
||||
#: gitk:6055
|
||||
msgid "To"
|
||||
msgstr "A"
|
||||
|
||||
#: gitk:6078
|
||||
msgid "Generate patch"
|
||||
msgstr "Generar parche"
|
||||
|
||||
#: gitk:6080
|
||||
msgid "From:"
|
||||
msgstr "De:"
|
||||
|
||||
#: gitk:6089
|
||||
msgid "To:"
|
||||
msgstr "Para:"
|
||||
|
||||
#: gitk:6098
|
||||
msgid "Reverse"
|
||||
msgstr "Invertir"
|
||||
|
||||
#: gitk:6100 gitk:6269
|
||||
msgid "Output file:"
|
||||
msgstr "Escribir a archivo:"
|
||||
|
||||
#: gitk:6106
|
||||
msgid "Generate"
|
||||
msgstr "Generar"
|
||||
|
||||
#: gitk:6142
|
||||
msgid "Error creating patch:"
|
||||
msgstr "Error en la creación del parche:"
|
||||
|
||||
#: gitk:6164 gitk:6257 gitk:6311
|
||||
msgid "ID:"
|
||||
msgstr "ID:"
|
||||
|
||||
#: gitk:6173
|
||||
msgid "Tag name:"
|
||||
msgstr "Nombre de etiqueta:"
|
||||
|
||||
#: gitk:6177 gitk:6320
|
||||
msgid "Create"
|
||||
msgstr "Crear"
|
||||
|
||||
#: gitk:6192
|
||||
msgid "No tag name specified"
|
||||
msgstr "No se ha especificado etiqueta"
|
||||
|
||||
#: gitk:6196
|
||||
#, tcl-format
|
||||
msgid "Tag \"%s\" already exists"
|
||||
msgstr "La etiqueta \"%s\" ya existe"
|
||||
|
||||
#: gitk:6202
|
||||
msgid "Error creating tag:"
|
||||
msgstr "Error al crear la etiqueta:"
|
||||
|
||||
#: gitk:6266
|
||||
msgid "Command:"
|
||||
msgstr "Comando:"
|
||||
|
||||
#: gitk:6274
|
||||
msgid "Write"
|
||||
msgstr "Escribir"
|
||||
|
||||
#: gitk:6290
|
||||
msgid "Error writing commit:"
|
||||
msgstr "Error al escribir revisión:"
|
||||
|
||||
#: gitk:6316
|
||||
msgid "Name:"
|
||||
msgstr "Nombre:"
|
||||
|
||||
#: gitk:6335
|
||||
msgid "Please specify a name for the new branch"
|
||||
msgstr "Especifique un nombre para la nueva rama"
|
||||
|
||||
#: gitk:6364
|
||||
#, tcl-format
|
||||
msgid "Commit %s is already included in branch %s -- really re-apply it?"
|
||||
msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
|
||||
|
||||
#: gitk:6369
|
||||
msgid "Cherry-picking"
|
||||
msgstr "Eligiendo revisiones (cherry-picking)"
|
||||
|
||||
#: gitk:6381
|
||||
msgid "No changes committed"
|
||||
msgstr "No se han guardado cambios"
|
||||
|
||||
#: gitk:6404
|
||||
msgid "Confirm reset"
|
||||
msgstr "Confirmar git reset"
|
||||
|
||||
#: gitk:6406
|
||||
#, tcl-format
|
||||
msgid "Reset branch %s to %s?"
|
||||
msgstr "¿Reponer la rama %s a %s?"
|
||||
|
||||
#: gitk:6410
|
||||
msgid "Reset type:"
|
||||
msgstr "Tipo de reposición:"
|
||||
|
||||
#: gitk:6414
|
||||
msgid "Soft: Leave working tree and index untouched"
|
||||
msgstr "Suave: No altera la copia de trabajo ni el índice"
|
||||
|
||||
#: gitk:6417
|
||||
msgid "Mixed: Leave working tree untouched, reset index"
|
||||
msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo"
|
||||
|
||||
#: gitk:6420
|
||||
msgid ""
|
||||
"Hard: Reset working tree and index\n"
|
||||
"(discard ALL local changes)"
|
||||
msgstr ""
|
||||
"Dura: Actualiza el índice y la copia de trabajo\n"
|
||||
"(abandona TODAS las modificaciones locales)"
|
||||
|
||||
#: gitk:6436
|
||||
msgid "Resetting"
|
||||
msgstr "Reponiendo"
|
||||
|
||||
#: gitk:6493
|
||||
msgid "Checking out"
|
||||
msgstr "Creando copia de trabajo"
|
||||
|
||||
#: gitk:6523
|
||||
msgid "Cannot delete the currently checked-out branch"
|
||||
msgstr "No se puede borrar la rama actual"
|
||||
|
||||
#: gitk:6529
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
"The commits on branch %s aren't on any other branch.\n"
|
||||
"Really delete branch %s?"
|
||||
msgstr ""
|
||||
"Las revisiones de la rama %s no están presentes en otras ramas.\n"
|
||||
"¿Borrar la rama %s?"
|
||||
|
||||
#: gitk:6560
|
||||
#, tcl-format
|
||||
msgid "Tags and heads: %s"
|
||||
msgstr "Etiquetas y ramas: %s"
|
||||
|
||||
#: gitk:6574
|
||||
msgid "Filter"
|
||||
msgstr "Filtro"
|
||||
|
||||
#: gitk:6868
|
||||
msgid ""
|
||||
"Error reading commit topology information; branch and preceding/following "
|
||||
"tag information will be incomplete."
|
||||
msgstr ""
|
||||
"Error al leer la topología de revisiones: la información sobre "
|
||||
"las ramas y etiquetas precedentes y siguientes será incompleta."
|
||||
|
||||
#: gitk:7852
|
||||
msgid "Tag"
|
||||
msgstr "Etiqueta"
|
||||
|
||||
#: gitk:7852
|
||||
msgid "Id"
|
||||
msgstr "Id"
|
||||
|
||||
#: gitk:7892
|
||||
msgid "Gitk font chooser"
|
||||
msgstr "Selector de tipografías gitk"
|
||||
|
||||
#: gitk:7909
|
||||
msgid "B"
|
||||
msgstr "B"
|
||||
|
||||
#: gitk:7912
|
||||
msgid "I"
|
||||
msgstr "I"
|
||||
|
||||
#: gitk:8005
|
||||
msgid "Gitk preferences"
|
||||
msgstr "Preferencias de gitk"
|
||||
|
||||
#: gitk:8006
|
||||
msgid "Commit list display options"
|
||||
msgstr "Opciones de visualización de la lista de revisiones"
|
||||
|
||||
#: gitk:8009
|
||||
msgid "Maximum graph width (lines)"
|
||||
msgstr "Ancho máximo del gráfico (en líneas)"
|
||||
|
||||
#: gitk:8013
|
||||
#, tcl-format
|
||||
msgid "Maximum graph width (% of pane)"
|
||||
msgstr "Ancho máximo del gráfico (en % del panel)"
|
||||
|
||||
#: gitk:8018
|
||||
msgid "Show local changes"
|
||||
msgstr "Mostrar cambios locales"
|
||||
|
||||
#: gitk:8023
|
||||
msgid "Auto-select SHA1"
|
||||
msgstr "Seleccionar automáticamente SHA1 hash"
|
||||
|
||||
#: gitk:8028
|
||||
msgid "Diff display options"
|
||||
msgstr "Opciones de visualización de diferencias"
|
||||
|
||||
#: gitk:8030
|
||||
msgid "Tab spacing"
|
||||
msgstr "Espaciado de tabulador"
|
||||
|
||||
#: gitk:8034
|
||||
msgid "Display nearby tags"
|
||||
msgstr "Mostrar etiquetas cercanas"
|
||||
|
||||
#: gitk:8039
|
||||
msgid "Limit diffs to listed paths"
|
||||
msgstr "Limitar las diferencias a las rutas seleccionadas"
|
||||
|
||||
#: gitk:8044
|
||||
msgid "Colors: press to choose"
|
||||
msgstr "Colores: pulse para seleccionar"
|
||||
|
||||
#: gitk:8047
|
||||
msgid "Background"
|
||||
msgstr "Fondo"
|
||||
|
||||
#: gitk:8051
|
||||
msgid "Foreground"
|
||||
msgstr "Primer plano"
|
||||
|
||||
#: gitk:8055
|
||||
msgid "Diff: old lines"
|
||||
msgstr "Diff: líneas viejas"
|
||||
|
||||
#: gitk:8060
|
||||
msgid "Diff: new lines"
|
||||
msgstr "Diff: líneas nuevas"
|
||||
|
||||
#: gitk:8065
|
||||
msgid "Diff: hunk header"
|
||||
msgstr "Diff: cabecera de fragmento"
|
||||
|
||||
#: gitk:8071
|
||||
msgid "Select bg"
|
||||
msgstr "Color de fondo de la selección"
|
||||
|
||||
#: gitk:8075
|
||||
msgid "Fonts: press to choose"
|
||||
msgstr "Tipografías: pulse para elegir"
|
||||
|
||||
#: gitk:8077
|
||||
msgid "Main font"
|
||||
msgstr "Tipografía principal"
|
||||
|
||||
#: gitk:8078
|
||||
msgid "Diff display font"
|
||||
msgstr "Tipografía para diferencias"
|
||||
|
||||
#: gitk:8079
|
||||
msgid "User interface font"
|
||||
msgstr "Tipografía para interfaz de usuario"
|
||||
|
||||
#: gitk:8095
|
||||
#, tcl-format
|
||||
msgid "Gitk: choose color for %s"
|
||||
msgstr "Gitk: elegir color para %s"
|
||||
|
||||
#: gitk:8476
|
||||
msgid ""
|
||||
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
|
||||
" Gitk requires at least Tcl/Tk 8.4."
|
||||
msgstr ""
|
||||
"Esta versión de Tcl/Tk es demasiado antigua.\n"
|
||||
" Gitk requiere Tcl/Tk versión 8.4 o superior."
|
||||
|
||||
#: gitk:8565
|
||||
msgid "Cannot find a git repository here."
|
||||
msgstr "No hay un repositorio git aquí."
|
||||
|
||||
#: gitk:8569
|
||||
#, tcl-format
|
||||
msgid "Cannot find the git directory \"%s\"."
|
||||
msgstr "No hay directorio git \"%s\"."
|
||||
|
||||
#: gitk:8612
|
||||
#, tcl-format
|
||||
msgid "Ambiguous argument '%s': both revision and filename"
|
||||
msgstr "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo"
|
||||
|
||||
#: gitk:8624
|
||||
msgid "Bad arguments to gitk:"
|
||||
msgstr "Argumentos incorrectos a Gitk:"
|
||||
|
||||
#: gitk:8636
|
||||
msgid "Couldn't get list of unmerged files:"
|
||||
msgstr "Imposible obtener la lista de archivos pendientes de fusión:"
|
||||
|
||||
#: gitk:8652
|
||||
msgid "No files selected: --merge specified but no files are unmerged."
|
||||
msgstr ""
|
||||
"No hay archivos seleccionados: se seleccionó la opción --merge pero no hay "
|
||||
"archivos pendientes de fusión."
|
||||
|
||||
#: gitk:8655
|
||||
msgid ""
|
||||
"No files selected: --merge specified but no unmerged files are within file "
|
||||
"limit."
|
||||
msgstr ""
|
||||
"No hay archivos seleccionados: se seleccionó la opción --merge pero los archivos "
|
||||
"especificados no necesitan fusión."
|
||||
|
||||
#: gitk:8716
|
||||
msgid "Command line"
|
||||
msgstr "Línea de comandos"
|
||||
File diff suppressed because it is too large
Load Diff
887
gitk-git/po/sv.po
Normal file
887
gitk-git/po/sv.po
Normal file
@@ -0,0 +1,887 @@
|
||||
# Swedish translation for gitk
|
||||
# Copyright (C) 2005-2008 Paul Mackerras
|
||||
# This file is distributed under the same license as the gitk package.
|
||||
#
|
||||
# Peter Karlsson <peter@softwolves.pp.se>, 2008.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: sv\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2008-03-14 15:03+0100\n"
|
||||
"PO-Revision-Date: 2008-03-14 16:06CET-1\n"
|
||||
"Last-Translator: Peter Karlsson <peter@softwolves.pp.se>\n"
|
||||
"Language-Team: Swedish <sv@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit"
|
||||
|
||||
#: gitk:111
|
||||
msgid "Error executing git rev-list:"
|
||||
msgstr "Fel vid körning av git rev-list:"
|
||||
|
||||
#: gitk:124
|
||||
msgid "Reading"
|
||||
msgstr "Läser"
|
||||
|
||||
#: gitk:151 gitk:2191
|
||||
msgid "Reading commits..."
|
||||
msgstr "Läser incheckningar..."
|
||||
|
||||
#: gitk:275
|
||||
msgid "Can't parse git log output:"
|
||||
msgstr "Kan inte tolka utdata från git log:"
|
||||
|
||||
#: gitk:386 gitk:2195
|
||||
msgid "No commits selected"
|
||||
msgstr "Inga incheckningar markerade"
|
||||
|
||||
#: gitk:500
|
||||
msgid "No commit information available"
|
||||
msgstr "Ingen incheckningsinformation är tillgänglig"
|
||||
|
||||
#: gitk:599 gitk:621 gitk:1955 gitk:6423 gitk:7923 gitk:8082
|
||||
msgid "OK"
|
||||
msgstr "OK"
|
||||
|
||||
#: gitk:623 gitk:1956 gitk:6107 gitk:6178 gitk:6275 gitk:6321 gitk:6425
|
||||
#: gitk:7924 gitk:8083
|
||||
msgid "Cancel"
|
||||
msgstr "Avbryt"
|
||||
|
||||
#: gitk:661
|
||||
msgid "File"
|
||||
msgstr "Arkiv"
|
||||
|
||||
#: gitk:663
|
||||
msgid "Update"
|
||||
msgstr "Uppdatera"
|
||||
|
||||
#: gitk:664
|
||||
msgid "Reread references"
|
||||
msgstr "Läs om referenser"
|
||||
|
||||
#: gitk:665
|
||||
msgid "List references"
|
||||
msgstr "Visa referenser"
|
||||
|
||||
#: gitk:666
|
||||
msgid "Quit"
|
||||
msgstr "Avsluta"
|
||||
|
||||
#: gitk:668
|
||||
msgid "Edit"
|
||||
msgstr "Redigera"
|
||||
|
||||
#: gitk:669
|
||||
msgid "Preferences"
|
||||
msgstr "Inställningar"
|
||||
|
||||
#: gitk:672 gitk:1892
|
||||
msgid "View"
|
||||
msgstr "Visa"
|
||||
|
||||
#: gitk:673
|
||||
msgid "New view..."
|
||||
msgstr "Ny vy..."
|
||||
|
||||
#: gitk:674 gitk:2133 gitk:8722
|
||||
msgid "Edit view..."
|
||||
msgstr "Ändra vy..."
|
||||
|
||||
#: gitk:676 gitk:2134 gitk:8723
|
||||
msgid "Delete view"
|
||||
msgstr "Ta bort vy"
|
||||
|
||||
#: gitk:678
|
||||
msgid "All files"
|
||||
msgstr "Alla filer"
|
||||
|
||||
#: gitk:682
|
||||
msgid "Help"
|
||||
msgstr "Hjälp"
|
||||
|
||||
#: gitk:683 gitk:1317
|
||||
msgid "About gitk"
|
||||
msgstr "Om gitk"
|
||||
|
||||
#: gitk:684
|
||||
msgid "Key bindings"
|
||||
msgstr "Tangentbordsbindningar"
|
||||
|
||||
#: gitk:741
|
||||
msgid "SHA1 ID: "
|
||||
msgstr "SHA1-id: "
|
||||
|
||||
#: gitk:791
|
||||
msgid "Find"
|
||||
msgstr "Sök"
|
||||
|
||||
#: gitk:792
|
||||
msgid "next"
|
||||
msgstr "nästa"
|
||||
|
||||
#: gitk:793
|
||||
msgid "prev"
|
||||
msgstr "föreg"
|
||||
|
||||
#: gitk:794
|
||||
msgid "commit"
|
||||
msgstr "incheckning"
|
||||
|
||||
#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
|
||||
msgid "containing:"
|
||||
msgstr "som innehåller:"
|
||||
|
||||
#: gitk:800 gitk:1778 gitk:1783 gitk:2431
|
||||
msgid "touching paths:"
|
||||
msgstr "som rör sökväg:"
|
||||
|
||||
#: gitk:801 gitk:2436
|
||||
msgid "adding/removing string:"
|
||||
msgstr "som lägger/till tar bort sträng:"
|
||||
|
||||
#: gitk:810 gitk:812
|
||||
msgid "Exact"
|
||||
msgstr "Exakt"
|
||||
|
||||
#: gitk:812 gitk:2514 gitk:4274
|
||||
msgid "IgnCase"
|
||||
msgstr "IgnVersaler"
|
||||
|
||||
#: gitk:812 gitk:2405 gitk:2512 gitk:4270
|
||||
msgid "Regexp"
|
||||
msgstr "Reg.uttr."
|
||||
|
||||
#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436
|
||||
msgid "All fields"
|
||||
msgstr "Alla fält"
|
||||
|
||||
#: gitk:815 gitk:2531 gitk:2563 gitk:4336
|
||||
msgid "Headline"
|
||||
msgstr "Rubrik"
|
||||
|
||||
#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827
|
||||
msgid "Comments"
|
||||
msgstr "Kommentarer"
|
||||
|
||||
#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5956
|
||||
#: gitk:5971
|
||||
msgid "Author"
|
||||
msgstr "Författare"
|
||||
|
||||
#: gitk:816 gitk:2531 gitk:4336 gitk:4765
|
||||
msgid "Committer"
|
||||
msgstr "Incheckare"
|
||||
|
||||
#: gitk:845
|
||||
msgid "Search"
|
||||
msgstr "Sök"
|
||||
|
||||
#: gitk:852
|
||||
msgid "Diff"
|
||||
msgstr "Diff"
|
||||
|
||||
#: gitk:854
|
||||
msgid "Old version"
|
||||
msgstr "Gammal version"
|
||||
|
||||
#: gitk:856
|
||||
msgid "New version"
|
||||
msgstr "Ny version"
|
||||
|
||||
#: gitk:858
|
||||
msgid "Lines of context"
|
||||
msgstr "Rader sammanhang"
|
||||
|
||||
#: gitk:868
|
||||
msgid "Ignore space change"
|
||||
msgstr "Ignorera ändringar i blanksteg"
|
||||
|
||||
#: gitk:926
|
||||
msgid "Patch"
|
||||
msgstr "Patch"
|
||||
|
||||
#: gitk:928
|
||||
msgid "Tree"
|
||||
msgstr "Träd"
|
||||
|
||||
#: gitk:1053 gitk:1068 gitk:6022
|
||||
msgid "Diff this -> selected"
|
||||
msgstr "Diff denna -> markerad"
|
||||
|
||||
#: gitk:1055 gitk:1070 gitk:6023
|
||||
msgid "Diff selected -> this"
|
||||
msgstr "Diff markerad -> denna"
|
||||
|
||||
#: gitk:1057 gitk:1072 gitk:6024
|
||||
msgid "Make patch"
|
||||
msgstr "Skapa patch"
|
||||
|
||||
#: gitk:1058 gitk:6162
|
||||
msgid "Create tag"
|
||||
msgstr "Skapa tagg"
|
||||
|
||||
#: gitk:1059 gitk:6255
|
||||
msgid "Write commit to file"
|
||||
msgstr "Skriv incheckning till fil"
|
||||
|
||||
#: gitk:1060 gitk:6309
|
||||
msgid "Create new branch"
|
||||
msgstr "Skapa ny gren"
|
||||
|
||||
#: gitk:1061
|
||||
msgid "Cherry-pick this commit"
|
||||
msgstr "Plocka denna incheckning"
|
||||
|
||||
#: gitk:1063
|
||||
msgid "Reset HEAD branch to here"
|
||||
msgstr "Återställ HEAD-grenen hit"
|
||||
|
||||
#: gitk:1079
|
||||
msgid "Check out this branch"
|
||||
msgstr "Checka ut denna gren"
|
||||
|
||||
#: gitk:1081
|
||||
msgid "Remove this branch"
|
||||
msgstr "Ta bort denna gren"
|
||||
|
||||
#: gitk:1087
|
||||
msgid "Highlight this too"
|
||||
msgstr "Markera även detta"
|
||||
|
||||
#: gitk:1089
|
||||
msgid "Highlight this only"
|
||||
msgstr "Markera bara detta"
|
||||
|
||||
#: gitk:1318
|
||||
msgid ""
|
||||
"\n"
|
||||
"Gitk - a commit viewer for git\n"
|
||||
"\n"
|
||||
"Copyright © 2005-2006 Paul Mackerras\n"
|
||||
"\n"
|
||||
"Use and redistribute under the terms of the GNU General Public License"
|
||||
msgstr ""
|
||||
"\n"
|
||||
"Gitk - en incheckningsvisare för git\n"
|
||||
"\n"
|
||||
"Copyright © 2005-2006 Paul Mackerras\n"
|
||||
"\n"
|
||||
"Använd och vidareförmedla enligt villkoren i GNU General Public License"
|
||||
|
||||
#: gitk:1326 gitk:1387 gitk:6581
|
||||
msgid "Close"
|
||||
msgstr "Stäng"
|
||||
|
||||
#: gitk:1345
|
||||
msgid "Gitk key bindings"
|
||||
msgstr "Tangentbordsbindningar för Gitk"
|
||||
|
||||
#: gitk:1347
|
||||
msgid "Gitk key bindings:"
|
||||
msgstr "Tangentbordsbindningar för Gitk:"
|
||||
|
||||
#: gitk:1349
|
||||
#, tcl-format
|
||||
msgid "<%s-Q>\t\tQuit"
|
||||
msgstr "<%s-Q>\t\tAvsluta"
|
||||
|
||||
#: gitk:1350
|
||||
msgid "<Home>\t\tMove to first commit"
|
||||
msgstr "<Home>\t\tGå till första incheckning"
|
||||
|
||||
#: gitk:1351
|
||||
msgid "<End>\t\tMove to last commit"
|
||||
msgstr "<End>\t\tGå till sista incheckning"
|
||||
|
||||
#: gitk:1352
|
||||
msgid "<Up>, p, i\tMove up one commit"
|
||||
msgstr "<Upp>, p, i\tGå en incheckning upp"
|
||||
|
||||
#: gitk:1353
|
||||
msgid "<Down>, n, k\tMove down one commit"
|
||||
msgstr "<Ned>, n, k\tGå en incheckning ned"
|
||||
|
||||
#: gitk:1354
|
||||
msgid "<Left>, z, j\tGo back in history list"
|
||||
msgstr "<Vänster>, z, j\tGå bakåt i historiken"
|
||||
|
||||
#: gitk:1355
|
||||
msgid "<Right>, x, l\tGo forward in history list"
|
||||
msgstr "<Höger>, x, l\tGå framåt i historiken"
|
||||
|
||||
#: gitk:1356
|
||||
msgid "<PageUp>\tMove up one page in commit list"
|
||||
msgstr "<PageUp>\tGå upp en sida i incheckningslistan"
|
||||
|
||||
#: gitk:1357
|
||||
msgid "<PageDown>\tMove down one page in commit list"
|
||||
msgstr "<PageDown>\tGå ned en sida i incheckningslistan"
|
||||
|
||||
#: gitk:1358
|
||||
#, tcl-format
|
||||
msgid "<%s-Home>\tScroll to top of commit list"
|
||||
msgstr "<%s-Home>\tRulla till början av incheckningslistan"
|
||||
|
||||
#: gitk:1359
|
||||
#, tcl-format
|
||||
msgid "<%s-End>\tScroll to bottom of commit list"
|
||||
msgstr "<%s-End>\tRulla till slutet av incheckningslistan"
|
||||
|
||||
#: gitk:1360
|
||||
#, tcl-format
|
||||
msgid "<%s-Up>\tScroll commit list up one line"
|
||||
msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg"
|
||||
|
||||
#: gitk:1361
|
||||
#, tcl-format
|
||||
msgid "<%s-Down>\tScroll commit list down one line"
|
||||
msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg"
|
||||
|
||||
#: gitk:1362
|
||||
#, tcl-format
|
||||
msgid "<%s-PageUp>\tScroll commit list up one page"
|
||||
msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida"
|
||||
|
||||
#: gitk:1363
|
||||
#, tcl-format
|
||||
msgid "<%s-PageDown>\tScroll commit list down one page"
|
||||
msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida"
|
||||
|
||||
#: gitk:1364
|
||||
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
|
||||
msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)"
|
||||
|
||||
#: gitk:1365
|
||||
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
|
||||
msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)"
|
||||
|
||||
#: gitk:1366
|
||||
msgid "<Delete>, b\tScroll diff view up one page"
|
||||
msgstr "<Delete>, b\tRulla diffvisningen upp en sida"
|
||||
|
||||
#: gitk:1367
|
||||
msgid "<Backspace>\tScroll diff view up one page"
|
||||
msgstr "<Baksteg>\tRulla diffvisningen upp en sida"
|
||||
|
||||
#: gitk:1368
|
||||
msgid "<Space>\t\tScroll diff view down one page"
|
||||
msgstr "<Blanksteg>\tRulla diffvisningen ned en sida"
|
||||
|
||||
#: gitk:1369
|
||||
msgid "u\t\tScroll diff view up 18 lines"
|
||||
msgstr "u\t\tRulla diffvisningen upp 18 rader"
|
||||
|
||||
#: gitk:1370
|
||||
msgid "d\t\tScroll diff view down 18 lines"
|
||||
msgstr "d\t\tRulla diffvisningen ned 18 rader"
|
||||
|
||||
#: gitk:1371
|
||||
#, tcl-format
|
||||
msgid "<%s-F>\t\tFind"
|
||||
msgstr "<%s-F>\t\tSök"
|
||||
|
||||
#: gitk:1372
|
||||
#, tcl-format
|
||||
msgid "<%s-G>\t\tMove to next find hit"
|
||||
msgstr "<%s-G>\t\tGå till nästa sökträff"
|
||||
|
||||
#: gitk:1373
|
||||
msgid "<Return>\tMove to next find hit"
|
||||
msgstr "<Return>\t\tGå till nästa sökträff"
|
||||
|
||||
#: gitk:1374
|
||||
msgid "/\t\tMove to next find hit, or redo find"
|
||||
msgstr "/\t\tGå till nästa sökträff, eller sök på nytt"
|
||||
|
||||
#: gitk:1375
|
||||
msgid "?\t\tMove to previous find hit"
|
||||
msgstr "?\t\tGå till föregående sökträff"
|
||||
|
||||
#: gitk:1376
|
||||
msgid "f\t\tScroll diff view to next file"
|
||||
msgstr "f\t\tRulla diffvisningen till nästa fil"
|
||||
|
||||
#: gitk:1377
|
||||
#, tcl-format
|
||||
msgid "<%s-S>\t\tSearch for next hit in diff view"
|
||||
msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen"
|
||||
|
||||
#: gitk:1378
|
||||
#, tcl-format
|
||||
msgid "<%s-R>\t\tSearch for previous hit in diff view"
|
||||
msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen"
|
||||
|
||||
#: gitk:1379
|
||||
#, tcl-format
|
||||
msgid "<%s-KP+>\tIncrease font size"
|
||||
msgstr "<%s-Num+>\tÖka teckenstorlek"
|
||||
|
||||
#: gitk:1380
|
||||
#, tcl-format
|
||||
msgid "<%s-plus>\tIncrease font size"
|
||||
msgstr "<%s-plus>\tÖka teckenstorlek"
|
||||
|
||||
#: gitk:1381
|
||||
#, tcl-format
|
||||
msgid "<%s-KP->\tDecrease font size"
|
||||
msgstr "<%s-Num->\tMinska teckenstorlek"
|
||||
|
||||
#: gitk:1382
|
||||
#, tcl-format
|
||||
msgid "<%s-minus>\tDecrease font size"
|
||||
msgstr "<%s-minus>\tMinska teckenstorlek"
|
||||
|
||||
#: gitk:1383
|
||||
msgid "<F5>\t\tUpdate"
|
||||
msgstr "<F5>\t\tUppdatera"
|
||||
|
||||
#: gitk:1896
|
||||
msgid "Gitk view definition"
|
||||
msgstr "Definition av Gitk-vy"
|
||||
|
||||
#: gitk:1921
|
||||
msgid "Name"
|
||||
msgstr "Namn"
|
||||
|
||||
#: gitk:1924
|
||||
msgid "Remember this view"
|
||||
msgstr "Spara denna vy"
|
||||
|
||||
#: gitk:1928
|
||||
msgid "Commits to include (arguments to git rev-list):"
|
||||
msgstr "Incheckningar att ta med (argument till git rev-list):"
|
||||
|
||||
#: gitk:1935
|
||||
msgid "Command to generate more commits to include:"
|
||||
msgstr "Kommando för att generera fler incheckningar att ta med:"
|
||||
|
||||
#: gitk:1942
|
||||
msgid "Enter files and directories to include, one per line:"
|
||||
msgstr "Ange filer och kataloger att ta med, en per rad:"
|
||||
|
||||
#: gitk:1989
|
||||
msgid "Error in commit selection arguments:"
|
||||
msgstr "Fel i argument för val av incheckningar:"
|
||||
|
||||
#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8688 gitk:8689
|
||||
msgid "None"
|
||||
msgstr "Inget"
|
||||
|
||||
#: gitk:2531 gitk:4336 gitk:5958 gitk:5973
|
||||
msgid "Date"
|
||||
msgstr "Datum"
|
||||
|
||||
#: gitk:2531 gitk:4336
|
||||
msgid "CDate"
|
||||
msgstr "Skapat datum"
|
||||
|
||||
#: gitk:2680 gitk:2685
|
||||
msgid "Descendant"
|
||||
msgstr "Avkomling"
|
||||
|
||||
#: gitk:2681
|
||||
msgid "Not descendant"
|
||||
msgstr "Inte avkomling"
|
||||
|
||||
#: gitk:2688 gitk:2693
|
||||
msgid "Ancestor"
|
||||
msgstr "Förfader"
|
||||
|
||||
#: gitk:2689
|
||||
msgid "Not ancestor"
|
||||
msgstr "Inte förfader"
|
||||
|
||||
#: gitk:2924
|
||||
msgid "Local changes checked in to index but not committed"
|
||||
msgstr "Lokala ändringar sparade i indexet men inte incheckade"
|
||||
|
||||
#: gitk:2954
|
||||
msgid "Local uncommitted changes, not checked in to index"
|
||||
msgstr "Lokala ändringar, ej sparade i indexet"
|
||||
|
||||
#: gitk:4305
|
||||
msgid "Searching"
|
||||
msgstr "Söker"
|
||||
|
||||
#: gitk:4767
|
||||
msgid "Tags:"
|
||||
msgstr "Taggar:"
|
||||
|
||||
#: gitk:4784 gitk:4790 gitk:5951
|
||||
msgid "Parent"
|
||||
msgstr "Förälder"
|
||||
|
||||
#: gitk:4795
|
||||
msgid "Child"
|
||||
msgstr "Barn"
|
||||
|
||||
#: gitk:4804
|
||||
msgid "Branch"
|
||||
msgstr "Gren"
|
||||
|
||||
#: gitk:4807
|
||||
msgid "Follows"
|
||||
msgstr "Följer"
|
||||
|
||||
#: gitk:4810
|
||||
msgid "Precedes"
|
||||
msgstr "Föregår"
|
||||
|
||||
#: gitk:5093
|
||||
msgid "Error getting merge diffs:"
|
||||
msgstr "Fel vid hämtning av sammanslagningsdiff:"
|
||||
|
||||
#: gitk:5778
|
||||
msgid "Goto:"
|
||||
msgstr "Gå till:"
|
||||
|
||||
#: gitk:5780
|
||||
msgid "SHA1 ID:"
|
||||
msgstr "SHA1-id:"
|
||||
|
||||
#: gitk:5805
|
||||
#, tcl-format
|
||||
msgid "Short SHA1 id %s is ambiguous"
|
||||
msgstr "Förkortat SHA1-id %s är tvetydigt"
|
||||
|
||||
#: gitk:5817
|
||||
#, tcl-format
|
||||
msgid "SHA1 id %s is not known"
|
||||
msgstr "SHA-id:t %s är inte känt"
|
||||
|
||||
#: gitk:5819
|
||||
#, tcl-format
|
||||
msgid "Tag/Head %s is not known"
|
||||
msgstr "Tagg/huvud %s är okänt"
|
||||
|
||||
#: gitk:5961
|
||||
msgid "Children"
|
||||
msgstr "Barn"
|
||||
|
||||
#: gitk:6018
|
||||
#, tcl-format
|
||||
msgid "Reset %s branch to here"
|
||||
msgstr "Återställ grenen %s hit"
|
||||
|
||||
#: gitk:6049
|
||||
msgid "Top"
|
||||
msgstr "Topp"
|
||||
|
||||
#: gitk:6050
|
||||
msgid "From"
|
||||
msgstr "Från"
|
||||
|
||||
#: gitk:6055
|
||||
msgid "To"
|
||||
msgstr "Till"
|
||||
|
||||
#: gitk:6078
|
||||
msgid "Generate patch"
|
||||
msgstr "Generera patch"
|
||||
|
||||
#: gitk:6080
|
||||
msgid "From:"
|
||||
msgstr "Från:"
|
||||
|
||||
#: gitk:6089
|
||||
msgid "To:"
|
||||
msgstr "Till:"
|
||||
|
||||
#: gitk:6098
|
||||
msgid "Reverse"
|
||||
msgstr "Vänd"
|
||||
|
||||
#: gitk:6100 gitk:6269
|
||||
msgid "Output file:"
|
||||
msgstr "Utdatafil:"
|
||||
|
||||
#: gitk:6106
|
||||
msgid "Generate"
|
||||
msgstr "Generera"
|
||||
|
||||
#: gitk:6142
|
||||
msgid "Error creating patch:"
|
||||
msgstr "Fel vid generering av patch:"
|
||||
|
||||
#: gitk:6164 gitk:6257 gitk:6311
|
||||
msgid "ID:"
|
||||
msgstr "Id:"
|
||||
|
||||
#: gitk:6173
|
||||
msgid "Tag name:"
|
||||
msgstr "Taggnamn:"
|
||||
|
||||
#: gitk:6177 gitk:6320
|
||||
msgid "Create"
|
||||
msgstr "Skapa"
|
||||
|
||||
#: gitk:6192
|
||||
msgid "No tag name specified"
|
||||
msgstr "Inget taggnamn angavs"
|
||||
|
||||
#: gitk:6196
|
||||
#, tcl-format
|
||||
msgid "Tag \"%s\" already exists"
|
||||
msgstr "Taggen \"%s\" finns redan"
|
||||
|
||||
#: gitk:6202
|
||||
msgid "Error creating tag:"
|
||||
msgstr "Fel vid skapande av tagg:"
|
||||
|
||||
#: gitk:6266
|
||||
msgid "Command:"
|
||||
msgstr "Kommando:"
|
||||
|
||||
#: gitk:6274
|
||||
msgid "Write"
|
||||
msgstr "Skriv"
|
||||
|
||||
#: gitk:6290
|
||||
msgid "Error writing commit:"
|
||||
msgstr "Fel vid skrivning av incheckning:"
|
||||
|
||||
#: gitk:6316
|
||||
msgid "Name:"
|
||||
msgstr "Namn:"
|
||||
|
||||
#: gitk:6335
|
||||
msgid "Please specify a name for the new branch"
|
||||
msgstr "Ange ett namn för den nya grenen"
|
||||
|
||||
#: gitk:6364
|
||||
#, tcl-format
|
||||
msgid "Commit %s is already included in branch %s -- really re-apply it?"
|
||||
msgstr "Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras på nytt?"
|
||||
|
||||
#: gitk:6369
|
||||
msgid "Cherry-picking"
|
||||
msgstr "Plockar"
|
||||
|
||||
#: gitk:6381
|
||||
msgid "No changes committed"
|
||||
msgstr "Inga ändringar incheckade"
|
||||
|
||||
#: gitk:6404
|
||||
msgid "Confirm reset"
|
||||
msgstr "Bekräfta återställning"
|
||||
|
||||
#: gitk:6406
|
||||
#, tcl-format
|
||||
msgid "Reset branch %s to %s?"
|
||||
msgstr "Återställa grenen %s till %s?"
|
||||
|
||||
#: gitk:6410
|
||||
msgid "Reset type:"
|
||||
msgstr "Typ av återställning:"
|
||||
|
||||
#: gitk:6414
|
||||
msgid "Soft: Leave working tree and index untouched"
|
||||
msgstr "Mjuk: Rör inte utcheckning och index"
|
||||
|
||||
#: gitk:6417
|
||||
msgid "Mixed: Leave working tree untouched, reset index"
|
||||
msgstr "Blandad: Rör inte utcheckning, återställ index"
|
||||
|
||||
#: gitk:6420
|
||||
msgid ""
|
||||
"Hard: Reset working tree and index\n"
|
||||
"(discard ALL local changes)"
|
||||
msgstr ""
|
||||
"Hård: Återställ utcheckning och index\n"
|
||||
"(förkastar ALLA lokala ändringar)"
|
||||
|
||||
#: gitk:6436
|
||||
msgid "Resetting"
|
||||
msgstr "Återställer"
|
||||
|
||||
#: gitk:6493
|
||||
msgid "Checking out"
|
||||
msgstr "Checkar ut"
|
||||
|
||||
#: gitk:6523
|
||||
msgid "Cannot delete the currently checked-out branch"
|
||||
msgstr "Kan inte ta bort den just nu utcheckade grenen"
|
||||
|
||||
#: gitk:6529
|
||||
#, tcl-format
|
||||
msgid ""
|
||||
"The commits on branch %s aren't on any other branch.\n"
|
||||
"Really delete branch %s?"
|
||||
msgstr ""
|
||||
"Incheckningarna på grenen %s existerar inte på någon annan gren.\n"
|
||||
"Vill du verkligen ta bort grenen %s?"
|
||||
|
||||
#: gitk:6560
|
||||
#, tcl-format
|
||||
msgid "Tags and heads: %s"
|
||||
msgstr "Taggar och huvuden: %s"
|
||||
|
||||
#: gitk:6574
|
||||
msgid "Filter"
|
||||
msgstr "Filter"
|
||||
|
||||
#: gitk:6868
|
||||
msgid ""
|
||||
"Error reading commit topology information; branch and preceding/following "
|
||||
"tag information will be incomplete."
|
||||
msgstr ""
|
||||
"Fel vid läsning av information om incheckningstopologi; information om "
|
||||
"grenar och föregående/senare taggar kommer inte vara komplett."
|
||||
|
||||
#: gitk:7852
|
||||
msgid "Tag"
|
||||
msgstr "Tagg"
|
||||
|
||||
#: gitk:7852
|
||||
msgid "Id"
|
||||
msgstr "Id"
|
||||
|
||||
#: gitk:7892
|
||||
msgid "Gitk font chooser"
|
||||
msgstr "Teckensnittsväljare för Gitk"
|
||||
|
||||
#: gitk:7909
|
||||
msgid "B"
|
||||
msgstr "F"
|
||||
|
||||
#: gitk:7912
|
||||
msgid "I"
|
||||
msgstr "K"
|
||||
|
||||
#: gitk:8005
|
||||
msgid "Gitk preferences"
|
||||
msgstr "Inställningar för Gitk"
|
||||
|
||||
#: gitk:8006
|
||||
msgid "Commit list display options"
|
||||
msgstr "Alternativ för incheckningslistvy"
|
||||
|
||||
#: gitk:8009
|
||||
msgid "Maximum graph width (lines)"
|
||||
msgstr "Maximal grafbredd (rader)"
|
||||
|
||||
#: gitk:8013
|
||||
#, tcl-format
|
||||
msgid "Maximum graph width (% of pane)"
|
||||
msgstr "Maximal grafbredd (% av ruta)"
|
||||
|
||||
#: gitk:8018
|
||||
msgid "Show local changes"
|
||||
msgstr "Visa lokala ändringar"
|
||||
|
||||
#: gitk:8023
|
||||
msgid "Auto-select SHA1"
|
||||
msgstr "Välj SHA1 automatiskt"
|
||||
|
||||
#: gitk:8028
|
||||
msgid "Diff display options"
|
||||
msgstr "Alternativ för diffvy"
|
||||
|
||||
#: gitk:8030
|
||||
msgid "Tab spacing"
|
||||
msgstr "Blanksteg för tabulatortecken"
|
||||
|
||||
#: gitk:8034
|
||||
msgid "Display nearby tags"
|
||||
msgstr "Visa närliggande taggar"
|
||||
|
||||
#: gitk:8039
|
||||
msgid "Limit diffs to listed paths"
|
||||
msgstr "Begränsa diff till listade sökvägar"
|
||||
|
||||
#: gitk:8044
|
||||
msgid "Colors: press to choose"
|
||||
msgstr "Färger: tryck för att välja"
|
||||
|
||||
#: gitk:8047
|
||||
msgid "Background"
|
||||
msgstr "Bakgrund"
|
||||
|
||||
#: gitk:8051
|
||||
msgid "Foreground"
|
||||
msgstr "Förgrund"
|
||||
|
||||
#: gitk:8055
|
||||
msgid "Diff: old lines"
|
||||
msgstr "Diff: gamla rader"
|
||||
|
||||
#: gitk:8060
|
||||
msgid "Diff: new lines"
|
||||
msgstr "Diff: nya rader"
|
||||
|
||||
#: gitk:8065
|
||||
msgid "Diff: hunk header"
|
||||
msgstr "Diff: delhuvud"
|
||||
|
||||
#: gitk:8071
|
||||
msgid "Select bg"
|
||||
msgstr "Markerad bakgrund"
|
||||
|
||||
#: gitk:8075
|
||||
msgid "Fonts: press to choose"
|
||||
msgstr "Teckensnitt: tryck för att välja"
|
||||
|
||||
#: gitk:8077
|
||||
msgid "Main font"
|
||||
msgstr "Huvudteckensnitt"
|
||||
|
||||
#: gitk:8078
|
||||
msgid "Diff display font"
|
||||
msgstr "Teckensnitt för diffvisning"
|
||||
|
||||
#: gitk:8079
|
||||
msgid "User interface font"
|
||||
msgstr "Teckensnitt för användargränssnitt"
|
||||
|
||||
#: gitk:8095
|
||||
#, tcl-format
|
||||
msgid "Gitk: choose color for %s"
|
||||
msgstr "Gitk: välj färg för %s"
|
||||
|
||||
#: gitk:8476
|
||||
msgid ""
|
||||
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
|
||||
" Gitk requires at least Tcl/Tk 8.4."
|
||||
msgstr ""
|
||||
"Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
|
||||
" Gitk kräver åtminstone Tcl/Tk 8.4."
|
||||
|
||||
#: gitk:8565
|
||||
msgid "Cannot find a git repository here."
|
||||
msgstr "Hittar inget gitk-arkiv här."
|
||||
|
||||
#: gitk:8569
|
||||
#, tcl-format
|
||||
msgid "Cannot find the git directory \"%s\"."
|
||||
msgstr "Hittar inte git-katalogen \"%s\"."
|
||||
|
||||
#: gitk:8612
|
||||
#, tcl-format
|
||||
msgid "Ambiguous argument '%s': both revision and filename"
|
||||
msgstr "Tvetydigt argument \"%s\": både revision och filnamn"
|
||||
|
||||
#: gitk:8624
|
||||
msgid "Bad arguments to gitk:"
|
||||
msgstr "Felaktiga argument till gitk:"
|
||||
|
||||
#: gitk:8636
|
||||
msgid "Couldn't get list of unmerged files:"
|
||||
msgstr "Kunde inta hämta lista över ej sammanslagna filer:"
|
||||
|
||||
#: gitk:8652
|
||||
msgid "No files selected: --merge specified but no files are unmerged."
|
||||
msgstr "Inga filer valdes: --merge angavs men det finns inga filer som inte har slagits samman."
|
||||
|
||||
#: gitk:8655
|
||||
msgid ""
|
||||
"No files selected: --merge specified but no unmerged files are within file "
|
||||
"limit."
|
||||
msgstr ""
|
||||
"Inga filer valdes: --merge angavs men det finns inga filer inom "
|
||||
"filbegränsningen."
|
||||
|
||||
#: gitk:8716
|
||||
msgid "Command line"
|
||||
msgstr "Kommandorad"
|
||||
|
||||
@@ -196,4 +196,17 @@ test_expect_success 'apply submodule diff' '
|
||||
test -z "$D"
|
||||
'
|
||||
|
||||
test_expect_success 'update --init' '
|
||||
|
||||
mv init init2 &&
|
||||
git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
|
||||
git config --remove-section submodule.example
|
||||
git submodule update init > update.out &&
|
||||
grep "not initialized" update.out &&
|
||||
test ! -d init/.git &&
|
||||
git submodule update --init init &&
|
||||
test -d init/.git
|
||||
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@@ -166,7 +166,9 @@ test_expect_success 'author different from committer' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
sed -i '$d' expect
|
||||
mv expect expect.tmp
|
||||
sed '$d' < expect.tmp > expect
|
||||
rm -f expect.tmp
|
||||
echo "# Committer:
|
||||
#" >> expect
|
||||
unset GIT_COMMITTER_EMAIL
|
||||
|
||||
Reference in New Issue
Block a user