From: Junio C Hamano Date: Fri, 7 Dec 2007 07:51:15 +0000 (-0800) Subject: Merge branch 'master' of git://repo.or.cz/git-gui X-Git-Tag: v1.5.4-rc0~56 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d9f405931fa3d96b2a80fe5ad8205eea7c443f56;p=git.git Merge branch 'master' of git://repo.or.cz/git-gui * 'master' of git://repo.or.cz/git-gui: Update Hungarian translation. 100% completed. Update ja.po for git-gui git-gui: Improve the application icon on Windows. git-gui: install-sh from automake does not like -m755 git-gui: Reorder msgfmt command-line arguments Update German translation. 100% completed. Update git-gui.pot with latest (few) string additions and changes. git-gui: update it.po and glossary/it.po git-gui: fix a typo in lib/commit.tcl --- d9f405931fa3d96b2a80fe5ad8205eea7c443f56 diff --cc git-gui/Makefile index e86031927,000000000..26ac4b6bb mode 100644,000000..100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@@ -1,309 -1,0 +1,309 @@@ +all:: + +# Define V=1 to have a more verbose compile. +# +# Define NO_MSGFMT if you do not have msgfmt from the GNU gettext +# package and want to use our rough pure Tcl po->msg translator. +# TCL_PATH must be vaild for this to work. +# + +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE + @$(SHELL_PATH) ./GIT-VERSION-GEN +-include GIT-VERSION-FILE + +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') + +SCRIPT_SH = git-gui.sh +GITGUI_MAIN := git-gui +GITGUI_BUILT_INS = git-citool +ALL_LIBFILES = $(wildcard lib/*.tcl) +PRELOAD_FILES = lib/class.tcl +NONTCL_LIBFILES = \ + lib/git-gui.ico \ + $(wildcard lib/win32_*.js) \ +#end NONTCL_LIBFILES + +ifndef SHELL_PATH + SHELL_PATH = /bin/sh +endif + +ifndef gitexecdir + gitexecdir := $(shell git --exec-path) +endif + +ifndef sharedir + sharedir := $(dir $(gitexecdir))share +endif + +ifndef INSTALL + INSTALL = install +endif + +RM_RF ?= rm -rf +RMDIR ?= rmdir + - INSTALL_D0 = $(INSTALL) -d -m755 # space is required here ++INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here +INSTALL_D1 = - INSTALL_R0 = $(INSTALL) -m644 # space is required here ++INSTALL_R0 = $(INSTALL) -m 644 # space is required here +INSTALL_R1 = - INSTALL_X0 = $(INSTALL) -m755 # space is required here ++INSTALL_X0 = $(INSTALL) -m 755 # space is required here +INSTALL_X1 = +INSTALL_A0 = find # space is required here +INSTALL_A1 = | cpio -pud +INSTALL_L0 = rm -f # space is required here +INSTALL_L1 = && ln # space is required here +INSTALL_L2 = +INSTALL_L3 = + +REMOVE_D0 = $(RMDIR) # space is required here +REMOVE_D1 = || true +REMOVE_F0 = $(RM_RF) # space is required here +REMOVE_F1 = +CLEAN_DST = true + +ifndef V + QUIET = @ + QUIET_GEN = $(QUIET)echo ' ' GEN '$@' && + QUIET_INDEX = $(QUIET)echo ' ' INDEX $(dir $@) && + QUIET_MSGFMT0 = $(QUIET)printf ' MSGFMT %12s ' $@ && v=` + QUIET_MSGFMT1 = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages//g' + QUIET_2DEVNULL = 2>/dev/null + + INSTALL_D0 = dir= - INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir" ++ INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" + INSTALL_R0 = src= - INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src ++ INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src + INSTALL_X0 = src= - INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src ++ INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src + INSTALL_A0 = src= + INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud + + INSTALL_L0 = dst= + INSTALL_L1 = && src= + INSTALL_L2 = && dst= + INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst" + + CLEAN_DST = echo ' ' UNINSTALL + REMOVE_D0 = dir= + REMOVE_D1 = && echo ' ' REMOVE $$dir && test -d "$$dir" && $(RMDIR) "$$dir" || true + REMOVE_F0 = dst= + REMOVE_F1 = && echo ' ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst" +endif + +TCL_PATH ?= tclsh +TCLTK_PATH ?= wish +TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app + +ifeq ($(findstring $(MAKEFLAGS),s),s) +QUIET_GEN = +endif + +-include config.mak + +DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) +gitexecdir_SQ = $(subst ','\'',$(gitexecdir)) +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) +TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH)) +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) +TCLTK_PATH_SED = $(subst ','\'',$(subst \,\\,$(TCLTK_PATH))) + +gg_libdir ?= $(sharedir)/git-gui/lib +libdir_SQ = $(subst ','\'',$(gg_libdir)) +libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir))) +exedir = $(dir $(gitexecdir))share/git-gui/lib + +GITGUI_SCRIPT := $$0 +GITGUI_RELATIVE := +GITGUI_MACOSXAPP := + +ifeq ($(exedir),$(gg_libdir)) + GITGUI_RELATIVE := 1 +endif + +ifeq ($(uname_O),Cygwin) + GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"` + ifeq ($(GITGUI_RELATIVE),) + gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)") + endif +endif +ifeq ($(uname_S),Darwin) + ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y) + GITGUI_MACOSXAPP := YesPlease + endif +endif +ifneq (,$(findstring MINGW,$(uname_S))) + NO_MSGFMT=1 + GITGUI_WINDOWS_WRAPPER := YesPlease +endif + +ifdef GITGUI_MACOSXAPP +GITGUI_MAIN := git-gui.tcl + +git-gui: GIT-VERSION-FILE GIT-GUI-VARS + $(QUIET_GEN)rm -f $@ $@+ && \ + echo '#!$(SHELL_PATH_SQ)' >$@+ && \ + echo 'if test "z$$*" = zversion ||' >>$@+ && \ + echo ' test "z$$*" = z--version' >>$@+ && \ + echo then >>$@+ && \ + echo ' 'echo \'git-gui version '$(GITGUI_VERSION)'\' >>$@+ && \ + echo else >>$@+ && \ + echo ' 'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/Wish'\' \ + '"$$0" "$$@"' >>$@+ && \ + echo fi >>$@+ && \ + chmod +x $@+ && \ + mv $@+ $@ + +Git\ Gui.app: GIT-VERSION-FILE GIT-GUI-VARS \ + macosx/Info.plist \ + macosx/git-gui.icns \ + macosx/AppMain.tcl \ + $(TKFRAMEWORK)/Contents/MacOS/Wish + $(QUIET_GEN)rm -rf '$@' '$@'+ && \ + mkdir -p '$@'+/Contents/MacOS && \ + mkdir -p '$@'+/Contents/Resources/Scripts && \ + cp '$(subst ','\'',$(TKFRAMEWORK))/Contents/MacOS/Wish' \ + '$@'+/Contents/MacOS && \ + cp macosx/git-gui.icns '$@'+/Contents/Resources && \ + sed -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ + macosx/Info.plist \ + >'$@'+/Contents/Info.plist && \ + sed -e 's|@@gitexecdir@@|$(gitexecdir_SQ)|' \ + -e 's|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \ + macosx/AppMain.tcl \ + >'$@'+/Contents/Resources/Scripts/AppMain.tcl && \ + mv '$@'+ '$@' +endif + +ifdef GITGUI_WINDOWS_WRAPPER +GITGUI_MAIN := git-gui.tcl + +git-gui: windows/git-gui.sh + cp $< $@ +endif + +$(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS + $(QUIET_GEN)rm -f $@ $@+ && \ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e '1,30s|^ argv0=$$0| argv0=$(GITGUI_SCRIPT)|' \ + -e '1,30s|^ exec wish | exec '\''$(TCLTK_PATH_SED)'\'' |' \ + -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ + -e 's|@@GITGUI_RELATIVE@@|$(GITGUI_RELATIVE)|' \ + -e '$(GITGUI_RELATIVE)s|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \ + git-gui.sh >$@+ && \ + chmod +x $@+ && \ + mv $@+ $@ + +XGETTEXT ?= xgettext +ifdef NO_MSGFMT + MSGFMT ?= $(TCL_PATH) po/po2msg.sh +else + MSGFMT ?= msgfmt +endif + +msgsdir = $(gg_libdir)/msgs +msgsdir_SQ = $(subst ','\'',$(msgsdir)) +PO_TEMPLATE = po/git-gui.pot +ALL_POFILES = $(wildcard po/*.po) +ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES)) + +$(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES) + $(XGETTEXT) -kmc -LTcl -o $@ $(SCRIPT_SH) $(ALL_LIBFILES) +update-po:: $(PO_TEMPLATE) + $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) +$(ALL_MSGFILES): %.msg : %.po - $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) $(QUIET_MSGFMT1) ++ $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1) + +lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS + $(QUIET_INDEX)if echo \ + $(foreach p,$(PRELOAD_FILES),source $p\;) \ + auto_mkindex lib '*.tcl' \ + | $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \ + else \ + echo 1>&2 " * $(TCL_PATH) failed; using unoptimized loading"; \ + rm -f $@ ; \ + echo '# Autogenerated by git-gui Makefile' >$@ && \ + echo >>$@ && \ + $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \ + echo >>$@ ; \ + fi + +TRACK_VARS = \ + $(subst ','\'',SHELL_PATH='$(SHELL_PATH_SQ)') \ + $(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \ + $(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \ + $(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \ + $(subst ','\'',gg_libdir='$(libdir_SQ)') \ + GITGUI_MACOSXAPP=$(GITGUI_MACOSXAPP) \ +#end TRACK_VARS + +GIT-GUI-VARS: .FORCE-GIT-GUI-VARS + @VARS='$(TRACK_VARS)'; \ + if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \ + echo 1>&2 " * new locations or Tcl/Tk interpreter"; \ + echo 1>$@ "$$VARS"; \ + fi + +ifdef GITGUI_MACOSXAPP +all:: git-gui Git\ Gui.app +endif +ifdef GITGUI_WINDOWS_WRAPPER +all:: git-gui +endif +all:: $(GITGUI_MAIN) lib/tclIndex $(ALL_MSGFILES) + +install: all + $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1) + $(QUIET)$(INSTALL_X0)git-gui $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(INSTALL_L0)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L1)'$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' $(INSTALL_L2)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L3) &&) true +ifdef GITGUI_WINDOWS_WRAPPER + $(QUIET)$(INSTALL_R0)git-gui.tcl $(INSTALL_R1) '$(DESTDIR_SQ)$(gitexecdir_SQ)' +endif + $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1) + $(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' +ifdef GITGUI_MACOSXAPP + $(QUIET)$(INSTALL_A0)'Git Gui.app' $(INSTALL_A1) '$(DESTDIR_SQ)$(libdir_SQ)' + $(QUIET)$(INSTALL_X0)git-gui.tcl $(INSTALL_X1) '$(DESTDIR_SQ)$(libdir_SQ)' +endif + $(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true + $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1) + $(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true + +uninstall: + $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui $(REMOVE_F1) + $(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/$p $(REMOVE_F1) &&) true +ifdef GITGUI_WINDOWS_WRAPPER + $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui.tcl $(REMOVE_F1) +endif + $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)' + $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1) +ifdef GITGUI_MACOSXAPP + $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)/Git Gui.app' $(REMOVE_F1) + $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.tcl $(REMOVE_F1) +endif + $(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true + $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(msgsdir_SQ)' + $(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true + $(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(REMOVE_D1) + $(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(REMOVE_D1) + $(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1) + $(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1) + +dist-version: + @mkdir -p $(TARDIR) + @echo $(GITGUI_VERSION) > $(TARDIR)/version + +clean:: + $(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg + $(RM_RF) GIT-VERSION-FILE GIT-GUI-VARS +ifdef GITGUI_MACOSXAPP + $(RM_RF) 'Git Gui.app'* git-gui +endif +ifdef GITGUI_WINDOWS_WRAPPER + $(RM_RF) git-gui +endif + +.PHONY: all install uninstall dist-version clean +.PHONY: .FORCE-GIT-VERSION-FILE +.PHONY: .FORCE-GIT-GUI-VARS diff --cc git-gui/lib/commit.tcl index 10b0430f5,000000000..b2d2d5308 mode 100644,000000..100644 --- a/git-gui/lib/commit.tcl +++ b/git-gui/lib/commit.tcl @@@ -1,431 -1,0 +1,431 @@@ +# git-gui misc. commit reading/writing support +# Copyright (C) 2006, 2007 Shawn Pearce + +proc load_last_commit {} { + global HEAD PARENT MERGE_HEAD commit_type ui_comm + global repo_config + + if {[llength $PARENT] == 0} { + error_popup [mc "There is nothing to amend. + +You are about to create the initial commit. There is no commit before this to amend. +"] + return + } + + repository_state curType curHEAD curMERGE_HEAD + if {$curType eq {merge}} { + error_popup [mc "Cannot amend while merging. + +You are currently in the middle of a merge that has not been fully completed. You cannot amend the prior commit unless you first abort the current merge activity. +"] + return + } + + set msg {} + set parents [list] + if {[catch { + set fd [git_read cat-file commit $curHEAD] + fconfigure $fd -encoding binary -translation lf + if {[catch {set enc $repo_config(i18n.commitencoding)}]} { + set enc utf-8 + } + while {[gets $fd line] > 0} { + if {[string match {parent *} $line]} { + lappend parents [string range $line 7 end] + } elseif {[string match {encoding *} $line]} { + set enc [string tolower [string range $line 9 end]] + } + } + set msg [read $fd] + close $fd + + set enc [tcl_encoding $enc] + if {$enc ne {}} { + set msg [encoding convertfrom $enc $msg] + } + set msg [string trim $msg] + } err]} { + error_popup [strcat [mc "Error loading commit data for amend:"] "\n\n$err"] + return + } + + set HEAD $curHEAD + set PARENT $parents + set MERGE_HEAD [list] + switch -- [llength $parents] { + 0 {set commit_type amend-initial} + 1 {set commit_type amend} + default {set commit_type amend-merge} + } + + $ui_comm delete 0.0 end + $ui_comm insert end $msg + $ui_comm edit reset + $ui_comm edit modified false + rescan ui_ready +} + +set GIT_COMMITTER_IDENT {} + +proc committer_ident {} { + global GIT_COMMITTER_IDENT + + if {$GIT_COMMITTER_IDENT eq {}} { + if {[catch {set me [git var GIT_COMMITTER_IDENT]} err]} { + error_popup [strcat [mc "Unable to obtain your identity:"] "\n\n$err"] + return {} + } + if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \ + $me me GIT_COMMITTER_IDENT]} { + error_popup [strcat [mc "Invalid GIT_COMMITTER_IDENT:"] "\n\n$me"] + return {} + } + } + + return $GIT_COMMITTER_IDENT +} + +proc do_signoff {} { + global ui_comm + + set me [committer_ident] + if {$me eq {}} return + + set sob "Signed-off-by: $me" + set last [$ui_comm get {end -1c linestart} {end -1c}] + if {$last ne $sob} { + $ui_comm edit separator + if {$last ne {} + && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} { + $ui_comm insert end "\n" + } + $ui_comm insert end "\n$sob" + $ui_comm edit separator + $ui_comm see end + } +} + +proc create_new_commit {} { + global commit_type ui_comm + + set commit_type normal + $ui_comm delete 0.0 end + $ui_comm edit reset + $ui_comm edit modified false + rescan ui_ready +} + +proc commit_tree {} { + global HEAD commit_type file_states ui_comm repo_config + global pch_error + + if {[committer_ident] eq {}} return + if {![lock_index update]} return + + # -- Our in memory state should match the repository. + # + repository_state curType curHEAD curMERGE_HEAD + if {[string match amend* $commit_type] + && $curType eq {normal} + && $curHEAD eq $HEAD} { + } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} { + info_popup [mc "Last scanned state does not match repository state. + +Another Git program has modified this repository since the last scan. A rescan must be performed before another commit can be created. + +The rescan will be automatically started now. +"] + unlock_index + rescan ui_ready + return + } + + # -- At least one file should differ in the index. + # + set files_ready 0 + foreach path [array names file_states] { + switch -glob -- [lindex $file_states($path) 0] { + _? {continue} + A? - + D? - + M? {set files_ready 1} + U? { + error_popup [mc "Unmerged files cannot be committed. + +File %s has merge conflicts. You must resolve them and stage the file before committing. +" [short_path $path]] + unlock_index + return + } + default { + error_popup [mc "Unknown file state %s detected. + +File %s cannot be committed by this program. +" [lindex $s 0] [short_path $path]] + } + } + } + if {!$files_ready && ![string match *merge $curType]} { + info_popup [mc "No changes to commit. + +You must stage at least 1 file before you can commit. +"] + unlock_index + return + } + + # -- A message is required. + # + set msg [string trim [$ui_comm get 1.0 end]] + regsub -all -line {[ \t\r]+$} $msg {} msg + if {$msg eq {}} { + error_popup [mc "Please supply a commit message. + +A good commit message has the following format: + - - First line: Describe in one sentance what you did. ++- First line: Describe in one sentence what you did. +- Second line: Blank +- Remaining lines: Describe why this change is good. +"] + unlock_index + return + } + + # -- Run the pre-commit hook. + # + set pchook [gitdir hooks pre-commit] + + # On Cygwin [file executable] might lie so we need to ask + # the shell if the hook is executable. Yes that's annoying. + # + if {[is_Cygwin] && [file isfile $pchook]} { + set pchook [list sh -c [concat \ + "if test -x \"$pchook\";" \ + "then exec \"$pchook\" 2>&1;" \ + "fi"]] + } elseif {[file executable $pchook]} { + set pchook [list $pchook |& cat] + } else { + commit_writetree $curHEAD $msg + return + } + + ui_status {Calling pre-commit hook...} + set pch_error {} + set fd_ph [open "| $pchook" r] + fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} + fileevent $fd_ph readable \ + [list commit_prehook_wait $fd_ph $curHEAD $msg] +} + +proc commit_prehook_wait {fd_ph curHEAD msg} { + global pch_error + + append pch_error [read $fd_ph] + fconfigure $fd_ph -blocking 1 + if {[eof $fd_ph]} { + if {[catch {close $fd_ph}]} { + ui_status {Commit declined by pre-commit hook.} + hook_failed_popup pre-commit $pch_error + unlock_index + } else { + commit_writetree $curHEAD $msg + } + set pch_error {} + return + } + fconfigure $fd_ph -blocking 0 +} + +proc commit_writetree {curHEAD msg} { + ui_status {Committing changes...} + set fd_wt [git_read write-tree] + fileevent $fd_wt readable \ + [list commit_committree $fd_wt $curHEAD $msg] +} + +proc commit_committree {fd_wt curHEAD msg} { + global HEAD PARENT MERGE_HEAD commit_type + global current_branch + global ui_comm selected_commit_type + global file_states selected_paths rescan_active + global repo_config + + gets $fd_wt tree_id + if {[catch {close $fd_wt} err]} { + error_popup [strcat [mc "write-tree failed:"] "\n\n$err"] + ui_status {Commit failed.} + unlock_index + return + } + + # -- Verify this wasn't an empty change. + # + if {$commit_type eq {normal}} { + set fd_ot [git_read cat-file commit $PARENT] + fconfigure $fd_ot -encoding binary -translation lf + set old_tree [gets $fd_ot] + close $fd_ot + + if {[string equal -length 5 {tree } $old_tree] + && [string length $old_tree] == 45} { + set old_tree [string range $old_tree 5 end] + } else { + error [mc "Commit %s appears to be corrupt" $PARENT] + } + + if {$tree_id eq $old_tree} { + info_popup [mc "No changes to commit. + +No files were modified by this commit and it was not a merge commit. + +A rescan will be automatically started now. +"] + unlock_index + rescan {ui_status [mc "No changes to commit."]} + return + } + } + + # -- Build the message. + # + set msg_p [gitdir COMMIT_EDITMSG] + set msg_wt [open $msg_p w] + fconfigure $msg_wt -translation lf + if {[catch {set enc $repo_config(i18n.commitencoding)}]} { + set enc utf-8 + } + set use_enc [tcl_encoding $enc] + if {$use_enc ne {}} { + fconfigure $msg_wt -encoding $use_enc + } else { + puts stderr [mc "warning: Tcl does not support encoding '%s'." $enc] + fconfigure $msg_wt -encoding utf-8 + } + puts -nonewline $msg_wt $msg + close $msg_wt + + # -- Create the commit. + # + set cmd [list commit-tree $tree_id] + foreach p [concat $PARENT $MERGE_HEAD] { + lappend cmd -p $p + } + lappend cmd <$msg_p + if {[catch {set cmt_id [eval git $cmd]} err]} { + error_popup [strcat [mc "commit-tree failed:"] "\n\n$err"] + ui_status {Commit failed.} + unlock_index + return + } + + # -- Update the HEAD ref. + # + set reflogm commit + if {$commit_type ne {normal}} { + append reflogm " ($commit_type)" + } + set i [string first "\n" $msg] + if {$i >= 0} { + set subject [string range $msg 0 [expr {$i - 1}]] + } else { + set subject $msg + } + append reflogm {: } $subject + if {[catch { + git update-ref -m $reflogm HEAD $cmt_id $curHEAD + } err]} { + error_popup [strcat [mc "update-ref failed:"] "\n\n$err"] + ui_status {Commit failed.} + unlock_index + return + } + + # -- Cleanup after ourselves. + # + catch {file delete $msg_p} + catch {file delete [gitdir MERGE_HEAD]} + catch {file delete [gitdir MERGE_MSG]} + catch {file delete [gitdir SQUASH_MSG]} + catch {file delete [gitdir GITGUI_MSG]} + + # -- Let rerere do its thing. + # + if {[get_config rerere.enabled] eq {}} { + set rerere [file isdirectory [gitdir rr-cache]] + } else { + set rerere [is_config_true rerere.enabled] + } + if {$rerere} { + catch {git rerere} + } + + # -- Run the post-commit hook. + # + set pchook [gitdir hooks post-commit] + if {[is_Cygwin] && [file isfile $pchook]} { + set pchook [list sh -c [concat \ + "if test -x \"$pchook\";" \ + "then exec \"$pchook\";" \ + "fi"]] + } elseif {![file executable $pchook]} { + set pchook {} + } + if {$pchook ne {}} { + catch {exec $pchook &} + } + + $ui_comm delete 0.0 end + $ui_comm edit reset + $ui_comm edit modified false + if {$::GITGUI_BCK_exists} { + catch {file delete [gitdir GITGUI_BCK]} + set ::GITGUI_BCK_exists 0 + } + + if {[is_enabled singlecommit]} do_quit + + # -- Update in memory status + # + set selected_commit_type new + set commit_type normal + set HEAD $cmt_id + set PARENT $cmt_id + set MERGE_HEAD [list] + + foreach path [array names file_states] { + set s $file_states($path) + set m [lindex $s 0] + switch -glob -- $m { + _O - + _M - + _D {continue} + __ - + A_ - + M_ - + D_ { + unset file_states($path) + catch {unset selected_paths($path)} + } + DO { + set file_states($path) [list _O [lindex $s 1] {} {}] + } + AM - + AD - + MM - + MD { + set file_states($path) [list \ + _[string index $m 1] \ + [lindex $s 1] \ + [lindex $s 3] \ + {}] + } + } + } + + display_all_files + unlock_index + reshow_diff + ui_status [mc "Created commit %s: %s" [string range $cmt_id 0 7] $subject] +} diff --cc git-gui/lib/git-gui.ico index 563dd6623,000000000..334cfa5a1 mode 100644,000000..100644 Binary files differ diff --cc git-gui/po/de.po index 3df30edb8,000000000..ac8ae0a20 mode 100644,000000..100644 --- a/git-gui/po/de.po +++ b/git-gui/po/de.po @@@ -1,1878 -1,0 +1,1904 @@@ +# Translation of git-gui to German. +# Copyright (C) 2007 Shawn Pearce, et al. +# This file is distributed under the same license as the git package. +# Christian Stimming , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-10-19 21:10+0200\n" - "PO-Revision-Date: 2007-10-20 15:28+0200\n" ++"POT-Creation-Date: 2007-11-24 10:36+0100\n" ++"PO-Revision-Date: 2007-11-24 10:55+0100\n" +"Last-Translator: Christian Stimming \n" +"Language-Team: German\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + - #: git-gui.sh:41 git-gui.sh:590 git-gui.sh:604 git-gui.sh:617 git-gui.sh:700 - #: git-gui.sh:719 ++#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 ++#: git-gui.sh:733 +msgid "git-gui: fatal error" +msgstr "git-gui: Programmfehler" + - #: git-gui.sh:551 ++#: git-gui.sh:565 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Ungültige Zeichensatz-Angabe in %s:" + - #: git-gui.sh:576 ++#: git-gui.sh:590 +msgid "Main Font" +msgstr "Programmschriftart" + - #: git-gui.sh:577 ++#: git-gui.sh:591 +msgid "Diff/Console Font" +msgstr "Vergleich-Schriftart" + - #: git-gui.sh:591 ++#: git-gui.sh:605 +msgid "Cannot find git in PATH." +msgstr "Git kann im PATH nicht gefunden werden." + - #: git-gui.sh:618 ++#: git-gui.sh:632 +msgid "Cannot parse Git version string:" +msgstr "Git Versionsangabe kann nicht erkannt werden:" + - #: git-gui.sh:636 ++#: git-gui.sh:650 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Die Version von Git kann nicht bestimmt werden.\n" +"\n" +"»%s« behauptet, es sei Version »%s«.\n" +"\n" +"%s benötigt mindestens Git 1.5.0 oder höher.\n" +"\n" +"Soll angenommen werden, »%s« sei Version 1.5.0?\n" + - #: git-gui.sh:874 ++#: git-gui.sh:888 +msgid "Git directory not found:" +msgstr "Git-Verzeichnis nicht gefunden:" + - #: git-gui.sh:881 ++#: git-gui.sh:895 +msgid "Cannot move to top of working directory:" +msgstr "" +"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt " +"werden:" + - #: git-gui.sh:888 ++#: git-gui.sh:902 +msgid "Cannot use funny .git directory:" +msgstr "Unerwartete Struktur des .git Verzeichnis:" + - #: git-gui.sh:893 ++#: git-gui.sh:907 +msgid "No working directory" +msgstr "Kein Arbeitsverzeichnis" + - #: git-gui.sh:1040 ++#: git-gui.sh:1054 +msgid "Refreshing file status..." +msgstr "Dateistatus aktualisieren..." + - #: git-gui.sh:1105 ++#: git-gui.sh:1119 +msgid "Scanning for modified files ..." +msgstr "Nach geänderten Dateien suchen..." + - #: git-gui.sh:1280 lib/browser.tcl:245 ++#: git-gui.sh:1294 lib/browser.tcl:245 +msgid "Ready." +msgstr "Bereit." + - #: git-gui.sh:1546 ++#: git-gui.sh:1560 +msgid "Unmodified" +msgstr "Unverändert" + - #: git-gui.sh:1548 ++#: git-gui.sh:1562 +msgid "Modified, not staged" +msgstr "Verändert, nicht bereitgestellt" + - #: git-gui.sh:1549 git-gui.sh:1554 ++#: git-gui.sh:1563 git-gui.sh:1568 +msgid "Staged for commit" +msgstr "Bereitgestellt zum Eintragen" + - #: git-gui.sh:1550 git-gui.sh:1555 ++#: git-gui.sh:1564 git-gui.sh:1569 +msgid "Portions staged for commit" +msgstr "Teilweise bereitgestellt zum Eintragen" + - #: git-gui.sh:1551 git-gui.sh:1556 ++#: git-gui.sh:1565 git-gui.sh:1570 +msgid "Staged for commit, missing" +msgstr "Bereitgestellt zum Eintragen, fehlend" + - #: git-gui.sh:1553 ++#: git-gui.sh:1567 +msgid "Untracked, not staged" +msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt" + - #: git-gui.sh:1558 ++#: git-gui.sh:1572 +msgid "Missing" +msgstr "Fehlend" + - #: git-gui.sh:1559 ++#: git-gui.sh:1573 +msgid "Staged for removal" +msgstr "Bereitgestellt zum Löschen" + - #: git-gui.sh:1560 ++#: git-gui.sh:1574 +msgid "Staged for removal, still present" +msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden" + - #: git-gui.sh:1562 git-gui.sh:1563 git-gui.sh:1564 git-gui.sh:1565 ++#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 +msgid "Requires merge resolution" +msgstr "Konfliktauflösung nötig" + - #: git-gui.sh:1600 ++#: git-gui.sh:1614 +msgid "Starting gitk... please wait..." +msgstr "Gitk wird gestartet... bitte warten." + - #: git-gui.sh:1609 ++#: git-gui.sh:1623 +#, tcl-format +msgid "" +"Unable to start gitk:\n" +"\n" +"%s does not exist" +msgstr "" +"Gitk kann nicht gestartet werden:\n" +"\n" +"%s existiert nicht" + - #: git-gui.sh:1809 lib/choose_repository.tcl:35 ++#: git-gui.sh:1823 lib/choose_repository.tcl:35 +msgid "Repository" +msgstr "Projektarchiv" + - #: git-gui.sh:1810 ++#: git-gui.sh:1824 +msgid "Edit" +msgstr "Bearbeiten" + - #: git-gui.sh:1812 lib/choose_rev.tcl:560 ++#: git-gui.sh:1826 lib/choose_rev.tcl:560 +msgid "Branch" +msgstr "Zweig" + - #: git-gui.sh:1815 lib/choose_rev.tcl:547 ++#: git-gui.sh:1829 lib/choose_rev.tcl:547 +msgid "Commit@@noun" +msgstr "Version" + - #: git-gui.sh:1818 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "Zusammenführen" + - #: git-gui.sh:1819 lib/choose_rev.tcl:556 ++#: git-gui.sh:1833 lib/choose_rev.tcl:556 +msgid "Remote" +msgstr "Andere Archive" + - #: git-gui.sh:1828 ++#: git-gui.sh:1842 +msgid "Browse Current Branch's Files" +msgstr "Aktuellen Zweig durchblättern" + - #: git-gui.sh:1832 ++#: git-gui.sh:1846 +msgid "Browse Branch Files..." +msgstr "Einen Zweig durchblättern..." + - #: git-gui.sh:1837 ++#: git-gui.sh:1851 +msgid "Visualize Current Branch's History" +msgstr "Aktuellen Zweig darstellen" + - #: git-gui.sh:1841 ++#: git-gui.sh:1855 +msgid "Visualize All Branch History" +msgstr "Alle Zweige darstellen" + - #: git-gui.sh:1848 ++#: git-gui.sh:1862 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Zweig »%s« durchblättern" + - #: git-gui.sh:1850 ++#: git-gui.sh:1864 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Historie von »%s« darstellen" + - #: git-gui.sh:1855 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "Datenbankstatistik" + - #: git-gui.sh:1858 lib/database.tcl:34 ++#: git-gui.sh:1872 lib/database.tcl:34 +msgid "Compress Database" +msgstr "Datenbank komprimieren" + - #: git-gui.sh:1861 ++#: git-gui.sh:1875 +msgid "Verify Database" +msgstr "Datenbank überprüfen" + - #: git-gui.sh:1868 git-gui.sh:1872 git-gui.sh:1876 lib/shortcut.tcl:7 ++#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 +#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 +msgid "Create Desktop Icon" +msgstr "Desktop-Icon erstellen" + - #: git-gui.sh:1881 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 ++#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 +msgid "Quit" +msgstr "Beenden" + - #: git-gui.sh:1888 ++#: git-gui.sh:1902 +msgid "Undo" +msgstr "Rückgängig" + - #: git-gui.sh:1891 ++#: git-gui.sh:1905 +msgid "Redo" +msgstr "Wiederholen" + - #: git-gui.sh:1895 git-gui.sh:2388 ++#: git-gui.sh:1909 git-gui.sh:2403 +msgid "Cut" +msgstr "Ausschneiden" + - #: git-gui.sh:1898 git-gui.sh:2391 git-gui.sh:2462 git-gui.sh:2534 ++#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 +#: lib/console.tcl:67 +msgid "Copy" +msgstr "Kopieren" + - #: git-gui.sh:1901 git-gui.sh:2394 ++#: git-gui.sh:1915 git-gui.sh:2409 +msgid "Paste" +msgstr "Einfügen" + - #: git-gui.sh:1904 git-gui.sh:2397 lib/branch_delete.tcl:26 ++#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "Löschen" + - #: git-gui.sh:1908 git-gui.sh:2401 git-gui.sh:2538 lib/console.tcl:69 ++#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 +msgid "Select All" +msgstr "Alle auswählen" + - #: git-gui.sh:1917 ++#: git-gui.sh:1931 +msgid "Create..." +msgstr "Erstellen..." + - #: git-gui.sh:1923 ++#: git-gui.sh:1937 +msgid "Checkout..." +msgstr "Umstellen..." + - #: git-gui.sh:1929 ++#: git-gui.sh:1943 +msgid "Rename..." +msgstr "Umbenennen..." + - #: git-gui.sh:1934 git-gui.sh:2033 ++#: git-gui.sh:1948 git-gui.sh:2048 +msgid "Delete..." +msgstr "Löschen..." + - #: git-gui.sh:1939 ++#: git-gui.sh:1953 +msgid "Reset..." +msgstr "Zurücksetzen..." + - #: git-gui.sh:1951 git-gui.sh:2335 ++#: git-gui.sh:1965 git-gui.sh:2350 +msgid "New Commit" +msgstr "Neue Version" + - #: git-gui.sh:1959 git-gui.sh:2342 ++#: git-gui.sh:1973 git-gui.sh:2357 +msgid "Amend Last Commit" +msgstr "Letzte Version nachbessern" + - #: git-gui.sh:1968 git-gui.sh:2302 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "Neu laden" + - #: git-gui.sh:1974 ++#: git-gui.sh:1988 +msgid "Stage To Commit" +msgstr "Zum Eintragen bereitstellen" + - #: git-gui.sh:1979 ++#: git-gui.sh:1994 +msgid "Stage Changed Files To Commit" +msgstr "Geänderte Dateien zum Eintragen bereitstellen" + - #: git-gui.sh:1985 ++#: git-gui.sh:2000 +msgid "Unstage From Commit" +msgstr "Aus der Bereitstellung herausnehmen" + - #: git-gui.sh:1990 lib/index.tcl:352 ++#: git-gui.sh:2005 lib/index.tcl:393 +msgid "Revert Changes" +msgstr "Änderungen revidieren" + - #: git-gui.sh:1997 git-gui.sh:2314 git-gui.sh:2412 ++#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 +msgid "Sign Off" +msgstr "Abzeichnen" + - #: git-gui.sh:2001 git-gui.sh:2318 ++#: git-gui.sh:2016 git-gui.sh:2333 +msgid "Commit@@verb" +msgstr "Eintragen" + - #: git-gui.sh:2012 ++#: git-gui.sh:2027 +msgid "Local Merge..." +msgstr "Lokales Zusammenführen..." + - #: git-gui.sh:2017 ++#: git-gui.sh:2032 +msgid "Abort Merge..." +msgstr "Zusammenführen abbrechen..." + - #: git-gui.sh:2029 ++#: git-gui.sh:2044 +msgid "Push..." +msgstr "Versenden..." + - #: git-gui.sh:2040 lib/choose_repository.tcl:40 ++#: git-gui.sh:2055 lib/choose_repository.tcl:40 +msgid "Apple" +msgstr "Apple" + - #: git-gui.sh:2043 git-gui.sh:2065 lib/about.tcl:13 ++#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 +#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 +#, tcl-format +msgid "About %s" +msgstr "Über %s" + - #: git-gui.sh:2047 ++#: git-gui.sh:2062 +msgid "Preferences..." +msgstr "Einstellungen..." + - #: git-gui.sh:2055 git-gui.sh:2580 ++#: git-gui.sh:2070 git-gui.sh:2595 +msgid "Options..." +msgstr "Optionen..." + - #: git-gui.sh:2061 lib/choose_repository.tcl:46 ++#: git-gui.sh:2076 lib/choose_repository.tcl:46 +msgid "Help" +msgstr "Hilfe" + - #: git-gui.sh:2102 ++#: git-gui.sh:2117 +msgid "Online Documentation" +msgstr "Online-Dokumentation" + - #: git-gui.sh:2186 ++#: git-gui.sh:2201 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" - msgstr "" ++msgstr "Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis nicht gefunden" + - #: git-gui.sh:2219 ++#: git-gui.sh:2234 +msgid "Current Branch:" +msgstr "Aktueller Zweig:" + - #: git-gui.sh:2240 ++#: git-gui.sh:2255 +msgid "Staged Changes (Will Commit)" +msgstr "Bereitgestellte Änderungen (zum Eintragen)" + - #: git-gui.sh:2259 ++#: git-gui.sh:2274 +msgid "Unstaged Changes" +msgstr "Nicht bereitgestellte Änderungen" + - #: git-gui.sh:2308 ++#: git-gui.sh:2323 +msgid "Stage Changed" +msgstr "Alles bereitstellen" + - #: git-gui.sh:2324 lib/transport.tcl:93 lib/transport.tcl:182 ++#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 +msgid "Push" +msgstr "Versenden" + - #: git-gui.sh:2354 ++#: git-gui.sh:2369 +msgid "Initial Commit Message:" +msgstr "Erste Versionsbeschreibung:" + - #: git-gui.sh:2355 ++#: git-gui.sh:2370 +msgid "Amended Commit Message:" +msgstr "Nachgebesserte Versionsbeschreibung:" + - #: git-gui.sh:2356 ++#: git-gui.sh:2371 +msgid "Amended Initial Commit Message:" +msgstr "Nachgebesserte erste Versionsbeschreibung:" + - #: git-gui.sh:2357 ++#: git-gui.sh:2372 +msgid "Amended Merge Commit Message:" +msgstr "Nachgebesserte Zusammenführungs-Versionsbeschreibung:" + - #: git-gui.sh:2358 ++#: git-gui.sh:2373 +msgid "Merge Commit Message:" +msgstr "Zusammenführungs-Versionsbeschreibung:" + - #: git-gui.sh:2359 ++#: git-gui.sh:2374 +msgid "Commit Message:" +msgstr "Versionsbeschreibung:" + - #: git-gui.sh:2404 git-gui.sh:2542 lib/console.tcl:71 ++#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 +msgid "Copy All" +msgstr "Alle kopieren" + - #: git-gui.sh:2428 lib/blame.tcl:104 ++#: git-gui.sh:2443 lib/blame.tcl:104 +msgid "File:" +msgstr "Datei:" + - #: git-gui.sh:2530 ++#: git-gui.sh:2545 +msgid "Refresh" +msgstr "Aktualisieren" + - #: git-gui.sh:2551 ++#: git-gui.sh:2566 +msgid "Apply/Reverse Hunk" +msgstr "Änderung anwenden/umkehren" + - #: git-gui.sh:2557 ++#: git-gui.sh:2572 +msgid "Decrease Font Size" +msgstr "Schriftgröße verkleinern" + - #: git-gui.sh:2561 ++#: git-gui.sh:2576 +msgid "Increase Font Size" +msgstr "Schriftgröße vergrößern" + - #: git-gui.sh:2566 ++#: git-gui.sh:2581 +msgid "Show Less Context" +msgstr "Weniger Kontext anzeigen" + - #: git-gui.sh:2573 ++#: git-gui.sh:2588 +msgid "Show More Context" +msgstr "Mehr Kontext anzeigen" + - #: git-gui.sh:2587 ++#: git-gui.sh:2602 +msgid "Unstage Hunk From Commit" +msgstr "Aus der Bereitstellung herausnehmen" + - #: git-gui.sh:2589 ++#: git-gui.sh:2604 +msgid "Stage Hunk For Commit" +msgstr "In die Bereitstellung hinzufügen" + - #: git-gui.sh:2608 ++#: git-gui.sh:2623 +msgid "Initializing..." +msgstr "Initialisieren..." + - #: git-gui.sh:2699 ++#: git-gui.sh:2718 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" ++"Möglicherweise gibt es Probleme mit manchen Umgebungsvariablen.\n" ++"\n" ++"Die folgenden Umgebungsvariablen können vermutlich nicht \n" ++"von %s an Git weitergegeben werden:\n" ++"\n" + - #: git-gui.sh:2729 ++#: git-gui.sh:2748 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" ++"\n" ++"Dies ist ein bekanntes Problem der Tcl-Version, die\n" ++"in Cygwin mitgeliefert wird." + - #: git-gui.sh:2734 ++#: git-gui.sh:2753 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" ++"\n" ++"\n" ++"Um den Namen »%s« zu ändern, sollten Sie die \n" ++"gewünschten Werte für die Einstellung user.name und \n" ++"user.email in Ihre Datei ~/.gitconfig einfügen.\n" + +#: lib/about.tcl:25 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - eine grafische Oberfläche für Git." + +#: lib/blame.tcl:77 +msgid "File Viewer" +msgstr "Datei-Browser" + +#: lib/blame.tcl:81 +msgid "Commit:" +msgstr "Version:" + +#: lib/blame.tcl:249 +msgid "Copy Commit" +msgstr "Version kopieren" + +#: lib/blame.tcl:369 +#, tcl-format +msgid "Reading %s..." +msgstr "%s lesen..." + +#: lib/blame.tcl:473 +msgid "Loading copy/move tracking annotations..." - msgstr "" ++msgstr "Annotierungen für Kopieren/Verschieben werden geladen..." + +#: lib/blame.tcl:493 +msgid "lines annotated" - msgstr "" ++msgstr "Zeilen annotiert" + +#: lib/blame.tcl:674 +msgid "Loading original location annotations..." - msgstr "" ++msgstr "Annotierungen für ursprünglichen Ort werden geladen..." + +#: lib/blame.tcl:677 +msgid "Annotation complete." - msgstr "" ++msgstr "Annotierung vollständig." + +#: lib/blame.tcl:731 +msgid "Loading annotation..." +msgstr "Annotierung laden..." + +#: lib/blame.tcl:787 +msgid "Author:" +msgstr "Autor:" + +#: lib/blame.tcl:791 +msgid "Committer:" +msgstr "Eintragender:" + +#: lib/blame.tcl:796 +msgid "Original File:" +msgstr "Ursprüngliche Datei:" + +#: lib/blame.tcl:910 +msgid "Originally By:" +msgstr "Ursprünglich von:" + +#: lib/blame.tcl:916 +msgid "In File:" +msgstr "In Datei:" + +#: lib/blame.tcl:921 +msgid "Copied Or Moved Here By:" +msgstr "Kopiert oder verschoben durch:" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "Zweig umstellen" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Umstellen" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 +msgid "Cancel" +msgstr "Abbrechen" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:286 +msgid "Revision" +msgstr "Version" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202 +msgid "Options" +msgstr "Optionen" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Übernahmezweig anfordern" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Verbindung zu lokalem Zweig lösen" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Zweig erstellen" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "Neuen Zweig erstellen" + +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 +msgid "Create" +msgstr "Erstellen" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Zweigname" + +#: lib/branch_create.tcl:43 +msgid "Name:" +msgstr "Name:" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Passend zu Übernahmezweig-Name" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Anfangsversion" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Existierenden Zweig aktualisieren:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Nein" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Nur Schnellzusammenführung" + +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 +msgid "Reset" +msgstr "Zurücksetzen" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Arbeitskopie umstellen nach Erstellen" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Bitte wählen Sie einen Übernahmezweig." + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "Übernahmezweig »%s« ist kein Zweig im anderen Projektarchiv." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Bitte geben Sie einen Zweignamen an." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "»%s« ist kein zulässiger Zweigname." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Zweig löschen" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Lokalen Zweig löschen" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Lokale Zweige" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Nur löschen, wenn darin zusammengeführt" + +#: lib/branch_delete.tcl:54 +msgid "Always (Do not perform merge test.)" +msgstr "Immer (ohne Zusammenführungstest)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:" + +#: lib/branch_delete.tcl:115 +msgid "" +"Recovering deleted branches is difficult. \n" +"\n" +" Delete the selected branches?" +msgstr "" +"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\n" +"\n" +"Gewählte Zweige jetzt löschen?" + +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"Fehler beim Löschen der Zweige:\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Zweig umbenennen" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Umbenennen" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Zweig:" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Neuer Name:" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "Bitte wählen Sie einen Zweig zum umbenennen." + +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "Zweig »%s« existiert bereits." + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Fehler beim Umbenennen von »%s«." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Starten..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "Datei-Browser" + +#: lib/browser.tcl:125 lib/browser.tcl:142 +#, tcl-format +msgid "Loading %s..." +msgstr "%s laden..." + +#: lib/browser.tcl:186 +msgid "[Up To Parent]" +msgstr "[Nach oben]" + +#: lib/browser.tcl:266 lib/browser.tcl:272 +msgid "Browse Branch Files" +msgstr "Dateien des Zweigs durchblättern" + +#: lib/browser.tcl:277 lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 +#: lib/choose_repository.tcl:989 +msgid "Browse" +msgstr "Blättern" + +#: lib/checkout_op.tcl:79 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "Änderungen »%s« von »%s« anfordern" + +#: lib/checkout_op.tcl:127 +#, tcl-format +msgid "fatal: Cannot resolve %s" - msgstr "" ++msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden" + +#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31 +msgid "Close" +msgstr "Schließen" + +#: lib/checkout_op.tcl:169 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "Zweig »%s« existiert nicht." + +#: lib/checkout_op.tcl:206 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"Zweig »%s« existiert bereits.\n" +"\n" +"Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres " +"Zusammenführen ist notwendig." + +#: lib/checkout_op.tcl:220 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "Zusammenführungsmethode »%s« nicht unterstützt." + +#: lib/checkout_op.tcl:239 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "Aktualisieren von »%s« fehlgeschlagen." + +#: lib/checkout_op.tcl:251 +msgid "Staging area (index) is already locked." +msgstr "Bereitstellung (»index«) ist zur Bearbeitung gesperrt (»locked«)." + +#: lib/checkout_op.tcl:266 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" +"\n" +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " +"geändert. Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\n" +"\n" +"Es wird gleich neu geladen.\n" + +#: lib/checkout_op.tcl:322 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "Arbeitskopie umstellen auf »%s«..." + +#: lib/checkout_op.tcl:353 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "" +"Zweig umstellen von »%s« abgebrochen (Zusammenführen der Dateien ist " +"notwendig)." + +#: lib/checkout_op.tcl:354 +msgid "File level merge required." +msgstr "Zusammenführen der Dateien ist notwendig." + +#: lib/checkout_op.tcl:358 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Es wird auf Zweig »%s« verblieben." + +#: lib/checkout_op.tcl:429 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n" +"\n" +"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen " +"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«." + +#: lib/checkout_op.tcl:446 +#, tcl-format +msgid "Checked out '%s'." +msgstr "Umgestellt auf »%s«." + +#: lib/checkout_op.tcl:478 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:" + +#: lib/checkout_op.tcl:500 +msgid "Recovering lost commits may not be easy." +msgstr "" +"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt " +"werden." + +#: lib/checkout_op.tcl:505 +#, tcl-format +msgid "Reset '%s'?" +msgstr "»%s« zurücksetzen?" + +#: lib/checkout_op.tcl:510 lib/merge.tcl:164 +msgid "Visualize" +msgstr "Darstellen" + +#: lib/checkout_op.tcl:578 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"Lokaler Zweig kann nicht gesetzt werden.\n" +"\n" +"Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt " +"aktualisiert, aber einige interne Git-Dateien konnten nicht geändert " +"werden.\n" +"\n" +"Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen." + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "Auswählen" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "Schriftfamilie" + +#: lib/choose_font.tcl:73 +msgid "Font Size" +msgstr "Schriftgröße" + +#: lib/choose_font.tcl:90 +msgid "Font Example" +msgstr "Schriftbeispiel" + +#: lib/choose_font.tcl:101 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"Dies ist ein Beispieltext.\n" +"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen." + +#: lib/choose_repository.tcl:27 +msgid "Git Gui" +msgstr "Git Gui" + +#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380 +msgid "Create New Repository" +msgstr "Neues Projektarchiv" + +#: lib/choose_repository.tcl:86 +msgid "New..." +msgstr "Neu..." + +#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 +msgid "Clone Existing Repository" +msgstr "Projektarchiv kopieren" + +#: lib/choose_repository.tcl:99 +msgid "Clone..." +msgstr "Kopieren..." + +#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 +msgid "Open Existing Repository" +msgstr "Projektarchiv öffnen" + +#: lib/choose_repository.tcl:112 +msgid "Open..." +msgstr "Öffnen..." + +#: lib/choose_repository.tcl:125 +msgid "Recent Repositories" +msgstr "Zuletzt benutzte Projektarchive" + +#: lib/choose_repository.tcl:131 +msgid "Open Recent Repository:" +msgstr "Zuletzt benutztes Projektarchiv öffnen:" + +#: lib/choose_repository.tcl:294 +#, tcl-format +msgid "Location %s already exists." +msgstr "Projektarchiv »%s« existiert bereits." + +#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307 +#: lib/choose_repository.tcl:314 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "Projektarchiv »%s« konnte nicht erstellt werden:" + +#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486 +msgid "Directory:" +msgstr "Verzeichnis:" + +#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544 +#: lib/choose_repository.tcl:1013 +msgid "Git Repository" +msgstr "Git Projektarchiv" + +#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437 +#, tcl-format +msgid "Directory %s already exists." +msgstr "Verzeichnis »%s« existiert bereits." + +#: lib/choose_repository.tcl:442 +#, tcl-format +msgid "File %s already exists." +msgstr "Datei »%s« existiert bereits." + +#: lib/choose_repository.tcl:463 +msgid "Clone" +msgstr "Kopieren" + +#: lib/choose_repository.tcl:476 +msgid "URL:" +msgstr "URL:" + +#: lib/choose_repository.tcl:496 +msgid "Clone Type:" +msgstr "Art der Kopie:" + +#: lib/choose_repository.tcl:502 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "Standard (schnell, teilweise redundant, Hardlinks)" + +#: lib/choose_repository.tcl:508 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "Alles kopieren (langsamer, volle Redundanz)" + +#: lib/choose_repository.tcl:514 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)" + +#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 +#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808 +#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "Kein Git-Projektarchiv in »%s« gefunden." + +#: lib/choose_repository.tcl:586 +msgid "Standard only available for local repository." +msgstr "Standard ist nur für lokale Projektarchive verfügbar." + +#: lib/choose_repository.tcl:590 +msgid "Shared only available for local repository." +msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar." + +#: lib/choose_repository.tcl:617 +msgid "Failed to configure origin" - msgstr "" ++msgstr "Der Ursprungsort konnte nicht eingerichtet werden" + +#: lib/choose_repository.tcl:629 +msgid "Counting objects" - msgstr "" ++msgstr "Objekte werden gezählt" + +#: lib/choose_repository.tcl:630 +msgid "buckets" - msgstr "" ++msgstr "Buckets" + +#: lib/choose_repository.tcl:654 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" - msgstr "" ++msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s" + +#: lib/choose_repository.tcl:690 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "Von »%s« konnte nichts kopiert werden." + +#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 +#: lib/choose_repository.tcl:918 +msgid "The 'master' branch has not been initialized." - msgstr "" ++msgstr "Der »master«-Zweig wurde noch nicht initialisiert." + +#: lib/choose_repository.tcl:705 +msgid "Hardlinks are unavailable. Falling back to copying." - msgstr "" ++msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert." + +#: lib/choose_repository.tcl:717 +#, tcl-format +msgid "Cloning from %s" +msgstr "Kopieren von »%s«" + +#: lib/choose_repository.tcl:748 +msgid "Copying objects" +msgstr "Objektdatenbank kopieren" + +#: lib/choose_repository.tcl:749 +msgid "KiB" +msgstr "KB" + +#: lib/choose_repository.tcl:773 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "Objekt kann nicht kopiert werden: %s" + +#: lib/choose_repository.tcl:783 +msgid "Linking objects" +msgstr "Objekte verlinken" + +#: lib/choose_repository.tcl:784 +msgid "objects" +msgstr "Objekte" + +#: lib/choose_repository.tcl:792 +#, tcl-format +msgid "Unable to hardlink object: %s" - msgstr "Objekt kann nicht hartverlinkt werden: %s" ++msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s" + +#: lib/choose_repository.tcl:847 +msgid "Cannot fetch branches and objects. See console output for details." - msgstr "" ++msgstr "Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die Ausgaben auf der Konsole für weitere Angaben." + +#: lib/choose_repository.tcl:858 +msgid "Cannot fetch tags. See console output for details." - msgstr "" ++msgstr "Markierungen konnten nicht angefordert werden. Kontrollieren Sie die Ausgaben auf der Konsole für weitere Angaben." + +#: lib/choose_repository.tcl:882 +msgid "Cannot determine HEAD. See console output for details." - msgstr "" ++msgstr "Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die Ausgaben auf der Konsole für weitere Angaben." + +#: lib/choose_repository.tcl:891 +#, tcl-format +msgid "Unable to cleanup %s" - msgstr "" ++msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden." + +#: lib/choose_repository.tcl:897 +msgid "Clone failed." +msgstr "Kopieren fehlgeschlagen." + +#: lib/choose_repository.tcl:904 +msgid "No default branch obtained." - msgstr "" ++msgstr "Kein voreingestellter Zweig gefunden." + +#: lib/choose_repository.tcl:915 +#, tcl-format +msgid "Cannot resolve %s as a commit." - msgstr "" ++msgstr "»%s« wurde nicht als Version gefunden." + +#: lib/choose_repository.tcl:927 +msgid "Creating working directory" +msgstr "Arbeitskopie erstellen" + - #: lib/choose_repository.tcl:928 lib/index.tcl:15 lib/index.tcl:80 - #: lib/index.tcl:149 ++#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 ++#: lib/index.tcl:193 +msgid "files" +msgstr "Dateien" + +#: lib/choose_repository.tcl:957 +msgid "Initial file checkout failed." - msgstr "" ++msgstr "Erstellen der Arbeitskopie fehlgeschlagen." + +#: lib/choose_repository.tcl:973 +msgid "Open" +msgstr "Öffnen" + +#: lib/choose_repository.tcl:983 +msgid "Repository:" +msgstr "Projektarchiv:" + +#: lib/choose_repository.tcl:1033 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "Projektarchiv »%s« konnte nicht geöffnet werden." + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "Abgetrennte Arbeitskopie-Version" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Version Regexp-Ausdruck:" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "Lokaler Zweig" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "Übernahmezweig" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537 +msgid "Tag" +msgstr "Markierung" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Ungültige Version: %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "Keine Version ausgewählt." + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "Versions-Ausdruck ist leer." + +#: lib/choose_rev.tcl:530 +msgid "Updated" +msgstr "Aktualisiert" + +#: lib/choose_rev.tcl:558 +msgid "URL" +msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Keine Version zur Nachbesserung vorhanden.\n" +"\n" +"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende " +"Version, die Sie nachbessern könnten.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Nachbesserung währen Zusammenführung nicht möglich.\n" +"\n" +"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht " +"beendet. Sie können keine vorige Übertragung nachbessern, solange eine " +"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung " +"beenden oder abbrechen.\n" + +#: lib/commit.tcl:49 +msgid "Error loading commit data for amend:" +msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:" + +#: lib/commit.tcl:76 +msgid "Unable to obtain your identity:" +msgstr "Benutzername konnte nicht bestimmt werden:" + +#: lib/commit.tcl:81 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:" + +#: lib/commit.tcl:133 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" +"\n" +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " +"geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n" +"\n" +"Es wird gleich neu geladen.\n" + +#: lib/commit.tcl:154 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n" +"\n" +"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie " +"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n" + +#: lib/commit.tcl:162 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Unbekannter Dateizustand »%s«.\n" +"\n" +"Datei »%s« kann nicht eingetragen werden.\n" + +#: lib/commit.tcl:170 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Keine Änderungen vorhanden, die eingetragen werden könnten.\n" +"\n" +"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n" + +#: lib/commit.tcl:183 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" - "- First line: Describe in one sentance what you did.\n" ++"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Bitte geben Sie eine Versionsbeschreibung ein.\n" +"\n" +"Eine gute Versionsbeschreibung enthält folgende Abschnitte:\n" +"\n" +"- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\n" +"\n" +"- Zweite Zeile: Leerzeile\n" +"\n" +"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n" + +#: lib/commit.tcl:257 +msgid "write-tree failed:" +msgstr "write-tree fehlgeschlagen:" + +#: lib/commit.tcl:275 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "Version »%s« scheint beschädigt zu sein" + +#: lib/commit.tcl:279 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Keine Änderungen einzutragen.\n" +"\n" +"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts " +"zusammengeführt.\n" +"\n" +"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n" + +#: lib/commit.tcl:286 +msgid "No changes to commit." +msgstr "Keine Änderungen, die eingetragen werden können." + +#: lib/commit.tcl:303 +#, tcl-format +msgid "warning: Tcl does not support encoding '%s'." - msgstr "" ++msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht." + +#: lib/commit.tcl:317 +msgid "commit-tree failed:" +msgstr "commit-tree fehlgeschlagen:" + +#: lib/commit.tcl:339 +msgid "update-ref failed:" +msgstr "update-ref fehlgeschlagen:" + +#: lib/commit.tcl:430 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "Version %s übertragen: %s" + +#: lib/console.tcl:57 +msgid "Working... please wait..." +msgstr "Verarbeitung. Bitte warten..." + +#: lib/console.tcl:183 +msgid "Success" +msgstr "Erfolgreich" + +#: lib/console.tcl:196 +msgid "Error: Command Failed" +msgstr "Fehler: Kommando fehlgeschlagen" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "Anzahl unverknüpfter Objekte" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "Festplattenplatz von unverknüpften Objekten" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "Anzahl komprimierter Objekte" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "Anzahl Komprimierungseinheiten" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "Festplattenplatz von komprimierten Objekten" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "Komprimierte Objekte, die zum Entfernen vorgesehen sind" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "Dateien im Mülleimer" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Objektdatenbank komprimieren" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen" + +#: lib/database.tcl:108 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " +"the database when more than %i loose objects exist.\n" +"\n" +"Compress the database now?" +msgstr "" +"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n" +"\n" +"Für eine optimale Performance wird empfohlen, die Datenbank des " +"Projektarchivs zu komprimieren, sobald mehr als %i nicht verknüpfte Objekte " +"vorliegen.\n" +"\n" +"Soll die Datenbank jetzt komprimiert werden?" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Ungültiges Datum von Git: %s" + +#: lib/diff.tcl:42 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Keine Änderungen feststellbar.\n" +"\n" +"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei " +"von einem anderen Programm modifiziert, aber der Inhalt der Datei ist " +"unverändert.\n" +"\n" +"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen " +"Dateien zu prüfen." + +#: lib/diff.tcl:81 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Vergleich von »%s« laden..." + +#: lib/diff.tcl:114 lib/diff.tcl:184 +#, tcl-format +msgid "Unable to display %s" +msgstr "Datei »%s« kann nicht angezeigt werden" + +#: lib/diff.tcl:115 +msgid "Error loading file:" +msgstr "Fehler beim Laden der Datei:" + +#: lib/diff.tcl:122 +msgid "Git Repository (subproject)" +msgstr "Git-Projektarchiv (Unterprojekt)" + +#: lib/diff.tcl:134 +msgid "* Binary file (not showing content)." +msgstr "* Binärdatei (Inhalt wird nicht angezeigt)" + +#: lib/diff.tcl:185 +msgid "Error loading diff:" +msgstr "Fehler beim Laden des Vergleichs:" + +#: lib/diff.tcl:302 +msgid "Failed to unstage selected hunk." +msgstr "Fehler beim Herausnehmen der gewählten Dateien aus der Bereitstellung." + +#: lib/diff.tcl:309 +msgid "Failed to stage selected hunk." +msgstr "Fehler beim Bereitstellen der gewählten Dateien." + +#: lib/error.tcl:12 lib/error.tcl:102 +msgid "error" +msgstr "Fehler" + +#: lib/error.tcl:28 +msgid "warning" +msgstr "Warnung" + +#: lib/error.tcl:81 +msgid "You must correct the above errors before committing." +msgstr "" +"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können." + - #: lib/index.tcl:241 ++#: lib/index.tcl:6 ++msgid "Unable to unlock the index." ++msgstr "Bereitstellung kann nicht wieder freigegeben werden." ++ ++#: lib/index.tcl:15 ++msgid "Index Error" ++msgstr "Fehler in Bereitstellung" ++ ++#: lib/index.tcl:21 ++msgid "" ++"Updating the Git index failed. A rescan will be automatically started to " ++"resynchronize git-gui." ++msgstr "Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu synchronisieren." ++ ++#: lib/index.tcl:27 ++msgid "Continue" ++msgstr "Fortsetzen" ++ ++#: lib/index.tcl:31 ++msgid "Unlock Index" ++msgstr "Bereitstellung freigeben" ++ ++#: lib/index.tcl:282 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "Datei »%s« aus der Bereitstellung herausnehmen" + - #: lib/index.tcl:285 ++#: lib/index.tcl:326 +#, tcl-format +msgid "Adding %s" +msgstr "»%s« hinzufügen..." + - #: lib/index.tcl:340 ++#: lib/index.tcl:381 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Änderungen in Datei »%s« revidieren?" + - #: lib/index.tcl:342 ++#: lib/index.tcl:383 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Änderungen in den gewählten %i Dateien revidieren?" + - #: lib/index.tcl:348 ++#: lib/index.tcl:389 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Alle nicht bereitgestellten Änderungen werden beim Revidieren verloren gehen." + - #: lib/index.tcl:351 ++#: lib/index.tcl:392 +msgid "Do Nothing" +msgstr "Nichts tun" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n" +"\n" +"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie " +"zusammenführen können.\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" +"\n" +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " +"geändert. Vor einem Zusammenführen muss neu geladen werden.\n" +"\n" +"Es wird gleich neu geladen.\n" + +#: lib/merge.tcl:44 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"Zusammenführung mit Konflikten.\n" +"\n" +"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese " +"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder " +"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst " +"danach kann eine neue Zusammenführung begonnen werden.\n" + +#: lib/merge.tcl:54 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"Es liegen Änderungen vor.\n" +"\n" +"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte " +"Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser " +"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich " +"einfacher beheben oder abbrechen.\n" + +#: lib/merge.tcl:106 +#, tcl-format +msgid "%s of %s" +msgstr "%s von %s" + +#: lib/merge.tcl:119 +#, tcl-format +msgid "Merging %s and %s" +msgstr "Zusammenführen von %s und %s" + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "Zusammenführen erfolgreich abgeschlossen." + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig." + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "Zusammenführen in %s" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "Zusammenzuführende Version" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"Abbruch der Nachbesserung ist nicht möglich.\n" +"\n" +"Sie müssen die Nachbesserung der Version abschließen.\n" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"Zusammenführen abbrechen?\n" +"\n" +"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen " +"verloren.\n" +"\n" +"Zusammenführen jetzt abbrechen?" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Änderungen zurücksetzen?\n" +"\n" +"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen " +"verloren.\n" +"\n" +"Änderungen jetzt zurücksetzen?" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "Abbruch" + +#: lib/merge.tcl:266 +msgid "Abort failed." +msgstr "Abbruch fehlgeschlagen." + +#: lib/merge.tcl:268 +msgid "Abort completed. Ready." +msgstr "Abbruch durchgeführt. Bereit." + +#: lib/option.tcl:82 +msgid "Restore Defaults" +msgstr "Voreinstellungen wiederherstellen" + +#: lib/option.tcl:86 +msgid "Save" +msgstr "Speichern" + +#: lib/option.tcl:96 +#, tcl-format +msgid "%s Repository" +msgstr "Projektarchiv %s" + +#: lib/option.tcl:97 +msgid "Global (All Repositories)" +msgstr "Global (Alle Projektarchive)" + +#: lib/option.tcl:103 +msgid "User Name" +msgstr "Benutzername" + +#: lib/option.tcl:104 +msgid "Email Address" +msgstr "E-Mail-Adresse" + +#: lib/option.tcl:106 +msgid "Summarize Merge Commits" +msgstr "Zusammenführungs-Versionen zusammenfassen" + +#: lib/option.tcl:107 +msgid "Merge Verbosity" +msgstr "Ausführlichkeit der Zusammenführen-Meldungen" + +#: lib/option.tcl:108 +msgid "Show Diffstat After Merge" +msgstr "Vergleichsstatistik nach Zusammenführen anzeigen" + +#: lib/option.tcl:110 +msgid "Trust File Modification Timestamps" +msgstr "Auf Dateiänderungsdatum verlassen" + +#: lib/option.tcl:111 +msgid "Prune Tracking Branches During Fetch" +msgstr "Übernahmezweige entfernen während Anforderung" + +#: lib/option.tcl:112 +msgid "Match Tracking Branches" +msgstr "Passend zu Übernahmezweig" + +#: lib/option.tcl:113 +msgid "Number of Diff Context Lines" +msgstr "Anzahl der Kontextzeilen beim Vergleich" + +#: lib/option.tcl:114 +msgid "New Branch Name Template" +msgstr "Namensvorschlag für neue Zweige" + +#: lib/option.tcl:176 +msgid "Change Font" +msgstr "Schriftart ändern" + +#: lib/option.tcl:180 +#, tcl-format +msgid "Choose %s" +msgstr "%s wählen" + +#: lib/option.tcl:186 +msgid "pt." +msgstr "pt." + +#: lib/option.tcl:200 +msgid "Preferences" +msgstr "Einstellungen" + +#: lib/option.tcl:235 +msgid "Failed to completely save options:" +msgstr "Optionen konnten nicht gespeichert werden:" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Remote Branch" +msgstr "Zweig im anderen Projektarchiv löschen" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "Von Projektarchiv" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 +msgid "Remote:" +msgstr "Anderes Archiv:" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 +msgid "Arbitrary URL:" +msgstr "Kommunikation mit URL:" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "Zweige" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "Löschen, falls" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "Zusammenführen mit:" + +#: lib/remote_branch_delete.tcl:119 +msgid "Always (Do not perform merge checks)" +msgstr "Immer (Keine Zusammenführungsprüfung)" + +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden." + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die " +"notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, " +"zuerst von »%s« anzufordern." + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll." + +#: lib/remote_branch_delete.tcl:216 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "" +"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand " +"möglich.\n" +"\n" +"Sollen die ausgewählten Zweige gelöscht werden?" + +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Zweige auf »%s« werden gelöscht" + +#: lib/remote_branch_delete.tcl:286 +msgid "No repository selected." +msgstr "Kein Projektarchiv ausgewählt." + +#: lib/remote_branch_delete.tcl:291 +#, tcl-format +msgid "Scanning %s..." +msgstr "»%s« laden..." + +#: lib/remote.tcl:165 +msgid "Prune from" +msgstr "Entfernen von" + +#: lib/remote.tcl:170 +msgid "Fetch from" +msgstr "Anfordern von" + +#: lib/remote.tcl:213 +msgid "Push to" +msgstr "Versenden nach" + +#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 +msgid "Cannot write shortcut:" +msgstr "Fehler beim Schreiben der Verknüpfung:" + +#: lib/shortcut.tcl:136 +msgid "Cannot write icon:" +msgstr "Fehler beim Erstellen des Icons:" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s ... %*i von %*i %s (%3i%%)" + +#: lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "»%s« anfordern" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Neue Änderungen von »%s« holen" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "Entfernen von »%s« im anderen Archiv" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Übernahmezweige entfernen, die in »%s« gelöscht wurden" + +#: lib/transport.tcl:25 lib/transport.tcl:71 +#, tcl-format +msgid "push %s" +msgstr "»%s« versenden..." + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Änderungen nach »%s« versenden" + +#: lib/transport.tcl:72 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "%s %s nach %s versenden" + +#: lib/transport.tcl:89 +msgid "Push Branches" +msgstr "Zweige versenden" + +#: lib/transport.tcl:103 +msgid "Source Branches" +msgstr "Herkunftszweige" + +#: lib/transport.tcl:120 +msgid "Destination Repository" +msgstr "Ziel-Projektarchiv" + +#: lib/transport.tcl:158 +msgid "Transfer Options" +msgstr "Netzwerk-Einstellungen" + +#: lib/transport.tcl:160 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "" +"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)" + +#: lib/transport.tcl:164 +msgid "Use thin pack (for slow network connections)" +msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" + +#: lib/transport.tcl:168 +msgid "Include tags" +msgstr "Mit Markierungen übertragen" - - #~ msgid "Next >" - #~ msgstr "Weiter >" - - #~ msgid "Fetch" - #~ msgstr "Anfordern" - - #~ msgid "Unstaged Changes (Will Not Be Committed)" - #~ msgstr "Nicht bereitgestellte Änderungen (werden nicht eingetragen)" diff --cc git-gui/po/git-gui.pot index 00f0f5922,000000000..dfa48ae26 mode 100644,000000..100644 --- a/git-gui/po/git-gui.pot +++ b/git-gui/po/git-gui.pot @@@ -1,1704 -1,0 +1,1742 @@@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-10-10 04:04-0400\n" ++"POT-Creation-Date: 2007-11-24 10:36+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + - #: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 - #: git-gui.sh:763 ++#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 ++#: git-gui.sh:733 +msgid "git-gui: fatal error" +msgstr "" + - #: git-gui.sh:595 ++#: git-gui.sh:565 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "" + - #: git-gui.sh:620 ++#: git-gui.sh:590 +msgid "Main Font" +msgstr "" + - #: git-gui.sh:621 ++#: git-gui.sh:591 +msgid "Diff/Console Font" +msgstr "" + - #: git-gui.sh:635 ++#: git-gui.sh:605 +msgid "Cannot find git in PATH." +msgstr "" + - #: git-gui.sh:662 ++#: git-gui.sh:632 +msgid "Cannot parse Git version string:" +msgstr "" + - #: git-gui.sh:680 ++#: git-gui.sh:650 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" + - #: git-gui.sh:853 ++#: git-gui.sh:888 +msgid "Git directory not found:" +msgstr "" + - #: git-gui.sh:860 ++#: git-gui.sh:895 +msgid "Cannot move to top of working directory:" +msgstr "" + - #: git-gui.sh:867 ++#: git-gui.sh:902 +msgid "Cannot use funny .git directory:" +msgstr "" + - #: git-gui.sh:872 ++#: git-gui.sh:907 +msgid "No working directory" +msgstr "" + - #: git-gui.sh:1019 ++#: git-gui.sh:1054 +msgid "Refreshing file status..." +msgstr "" + - #: git-gui.sh:1084 ++#: git-gui.sh:1119 +msgid "Scanning for modified files ..." +msgstr "" + - #: git-gui.sh:1259 lib/browser.tcl:245 ++#: git-gui.sh:1294 lib/browser.tcl:245 +msgid "Ready." +msgstr "" + - #: git-gui.sh:1525 ++#: git-gui.sh:1560 +msgid "Unmodified" +msgstr "" + - #: git-gui.sh:1527 ++#: git-gui.sh:1562 +msgid "Modified, not staged" +msgstr "" + - #: git-gui.sh:1528 git-gui.sh:1533 ++#: git-gui.sh:1563 git-gui.sh:1568 +msgid "Staged for commit" +msgstr "" + - #: git-gui.sh:1529 git-gui.sh:1534 ++#: git-gui.sh:1564 git-gui.sh:1569 +msgid "Portions staged for commit" +msgstr "" + - #: git-gui.sh:1530 git-gui.sh:1535 ++#: git-gui.sh:1565 git-gui.sh:1570 +msgid "Staged for commit, missing" +msgstr "" + - #: git-gui.sh:1532 ++#: git-gui.sh:1567 +msgid "Untracked, not staged" +msgstr "" + - #: git-gui.sh:1537 ++#: git-gui.sh:1572 +msgid "Missing" +msgstr "" + - #: git-gui.sh:1538 ++#: git-gui.sh:1573 +msgid "Staged for removal" +msgstr "" + - #: git-gui.sh:1539 ++#: git-gui.sh:1574 +msgid "Staged for removal, still present" +msgstr "" + - #: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544 ++#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 +msgid "Requires merge resolution" +msgstr "" + - #: git-gui.sh:1579 ++#: git-gui.sh:1614 +msgid "Starting gitk... please wait..." +msgstr "" + - #: git-gui.sh:1588 ++#: git-gui.sh:1623 +#, tcl-format +msgid "" +"Unable to start gitk:\n" +"\n" +"%s does not exist" +msgstr "" + - #: git-gui.sh:1788 lib/choose_repository.tcl:32 ++#: git-gui.sh:1823 lib/choose_repository.tcl:35 +msgid "Repository" +msgstr "" + - #: git-gui.sh:1789 ++#: git-gui.sh:1824 +msgid "Edit" +msgstr "" + - #: git-gui.sh:1791 lib/choose_rev.tcl:560 ++#: git-gui.sh:1826 lib/choose_rev.tcl:560 +msgid "Branch" +msgstr "" + - #: git-gui.sh:1794 lib/choose_rev.tcl:547 ++#: git-gui.sh:1829 lib/choose_rev.tcl:547 +msgid "Commit@@noun" +msgstr "" + - #: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "" + - #: git-gui.sh:1798 lib/choose_rev.tcl:556 ++#: git-gui.sh:1833 lib/choose_rev.tcl:556 +msgid "Remote" +msgstr "" + - #: git-gui.sh:1807 ++#: git-gui.sh:1842 +msgid "Browse Current Branch's Files" +msgstr "" + - #: git-gui.sh:1811 ++#: git-gui.sh:1846 +msgid "Browse Branch Files..." +msgstr "" + - #: git-gui.sh:1816 ++#: git-gui.sh:1851 +msgid "Visualize Current Branch's History" +msgstr "" + - #: git-gui.sh:1820 ++#: git-gui.sh:1855 +msgid "Visualize All Branch History" +msgstr "" + - #: git-gui.sh:1827 ++#: git-gui.sh:1862 +#, tcl-format +msgid "Browse %s's Files" +msgstr "" + - #: git-gui.sh:1829 ++#: git-gui.sh:1864 +#, tcl-format +msgid "Visualize %s's History" +msgstr "" + - #: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "" + - #: git-gui.sh:1837 lib/database.tcl:34 ++#: git-gui.sh:1872 lib/database.tcl:34 +msgid "Compress Database" +msgstr "" + - #: git-gui.sh:1840 ++#: git-gui.sh:1875 +msgid "Verify Database" +msgstr "" + - #: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9 - #: lib/shortcut.tcl:45 lib/shortcut.tcl:84 ++#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 ++#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 +msgid "Create Desktop Icon" +msgstr "" + - #: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95 ++#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 +msgid "Quit" +msgstr "" + - #: git-gui.sh:1867 ++#: git-gui.sh:1902 +msgid "Undo" +msgstr "" + - #: git-gui.sh:1870 ++#: git-gui.sh:1905 +msgid "Redo" +msgstr "" + - #: git-gui.sh:1874 git-gui.sh:2366 ++#: git-gui.sh:1909 git-gui.sh:2403 +msgid "Cut" +msgstr "" + - #: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512 ++#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 +#: lib/console.tcl:67 +msgid "Copy" +msgstr "" + - #: git-gui.sh:1880 git-gui.sh:2372 ++#: git-gui.sh:1915 git-gui.sh:2409 +msgid "Paste" +msgstr "" + - #: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26 ++#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "" + - #: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69 ++#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 +msgid "Select All" +msgstr "" + - #: git-gui.sh:1896 ++#: git-gui.sh:1931 +msgid "Create..." +msgstr "" + - #: git-gui.sh:1902 ++#: git-gui.sh:1937 +msgid "Checkout..." +msgstr "" + - #: git-gui.sh:1908 ++#: git-gui.sh:1943 +msgid "Rename..." +msgstr "" + - #: git-gui.sh:1913 git-gui.sh:2012 ++#: git-gui.sh:1948 git-gui.sh:2048 +msgid "Delete..." +msgstr "" + - #: git-gui.sh:1918 ++#: git-gui.sh:1953 +msgid "Reset..." +msgstr "" + - #: git-gui.sh:1930 git-gui.sh:2313 ++#: git-gui.sh:1965 git-gui.sh:2350 +msgid "New Commit" +msgstr "" + - #: git-gui.sh:1938 git-gui.sh:2320 ++#: git-gui.sh:1973 git-gui.sh:2357 +msgid "Amend Last Commit" +msgstr "" + - #: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "" + - #: git-gui.sh:1953 ++#: git-gui.sh:1988 +msgid "Stage To Commit" +msgstr "" + - #: git-gui.sh:1958 ++#: git-gui.sh:1994 +msgid "Stage Changed Files To Commit" +msgstr "" + - #: git-gui.sh:1964 ++#: git-gui.sh:2000 +msgid "Unstage From Commit" +msgstr "" + - #: git-gui.sh:1969 lib/index.tcl:352 ++#: git-gui.sh:2005 lib/index.tcl:393 +msgid "Revert Changes" +msgstr "" + - #: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390 ++#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 +msgid "Sign Off" +msgstr "" + - #: git-gui.sh:1980 git-gui.sh:2296 ++#: git-gui.sh:2016 git-gui.sh:2333 +msgid "Commit@@verb" +msgstr "" + - #: git-gui.sh:1991 ++#: git-gui.sh:2027 +msgid "Local Merge..." +msgstr "" + - #: git-gui.sh:1996 ++#: git-gui.sh:2032 +msgid "Abort Merge..." +msgstr "" + - #: git-gui.sh:2008 ++#: git-gui.sh:2044 +msgid "Push..." +msgstr "" + - #: git-gui.sh:2019 lib/choose_repository.tcl:41 ++#: git-gui.sh:2055 lib/choose_repository.tcl:40 +msgid "Apple" +msgstr "" + - #: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 ++#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 ++#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 +#, tcl-format +msgid "About %s" +msgstr "" + - #: git-gui.sh:2026 ++#: git-gui.sh:2062 +msgid "Preferences..." +msgstr "" + - #: git-gui.sh:2034 git-gui.sh:2558 ++#: git-gui.sh:2070 git-gui.sh:2595 +msgid "Options..." +msgstr "" + - #: git-gui.sh:2040 lib/choose_repository.tcl:47 ++#: git-gui.sh:2076 lib/choose_repository.tcl:46 +msgid "Help" +msgstr "" + - #: git-gui.sh:2081 ++#: git-gui.sh:2117 +msgid "Online Documentation" +msgstr "" + - #: git-gui.sh:2165 ++#: git-gui.sh:2201 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" + - #: git-gui.sh:2198 ++#: git-gui.sh:2234 +msgid "Current Branch:" +msgstr "" + - #: git-gui.sh:2219 ++#: git-gui.sh:2255 +msgid "Staged Changes (Will Commit)" +msgstr "" + - #: git-gui.sh:2239 ++#: git-gui.sh:2274 +msgid "Unstaged Changes" +msgstr "" + - #: git-gui.sh:2286 ++#: git-gui.sh:2323 +msgid "Stage Changed" +msgstr "" + - #: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182 ++#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 +msgid "Push" +msgstr "" + - #: git-gui.sh:2332 ++#: git-gui.sh:2369 +msgid "Initial Commit Message:" +msgstr "" + - #: git-gui.sh:2333 ++#: git-gui.sh:2370 +msgid "Amended Commit Message:" +msgstr "" + - #: git-gui.sh:2334 ++#: git-gui.sh:2371 +msgid "Amended Initial Commit Message:" +msgstr "" + - #: git-gui.sh:2335 ++#: git-gui.sh:2372 +msgid "Amended Merge Commit Message:" +msgstr "" + - #: git-gui.sh:2336 ++#: git-gui.sh:2373 +msgid "Merge Commit Message:" +msgstr "" + - #: git-gui.sh:2337 ++#: git-gui.sh:2374 +msgid "Commit Message:" +msgstr "" + - #: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71 ++#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 +msgid "Copy All" +msgstr "" + - #: git-gui.sh:2406 lib/blame.tcl:104 ++#: git-gui.sh:2443 lib/blame.tcl:104 +msgid "File:" +msgstr "" + - #: git-gui.sh:2508 ++#: git-gui.sh:2545 +msgid "Refresh" +msgstr "" + - #: git-gui.sh:2529 ++#: git-gui.sh:2566 +msgid "Apply/Reverse Hunk" +msgstr "" + - #: git-gui.sh:2535 ++#: git-gui.sh:2572 +msgid "Decrease Font Size" +msgstr "" + - #: git-gui.sh:2539 ++#: git-gui.sh:2576 +msgid "Increase Font Size" +msgstr "" + - #: git-gui.sh:2544 ++#: git-gui.sh:2581 +msgid "Show Less Context" +msgstr "" + - #: git-gui.sh:2551 ++#: git-gui.sh:2588 +msgid "Show More Context" +msgstr "" + - #: git-gui.sh:2565 ++#: git-gui.sh:2602 +msgid "Unstage Hunk From Commit" +msgstr "" + - #: git-gui.sh:2567 ++#: git-gui.sh:2604 +msgid "Stage Hunk For Commit" +msgstr "" + - #: git-gui.sh:2586 ++#: git-gui.sh:2623 +msgid "Initializing..." +msgstr "" + - #: git-gui.sh:2677 ++#: git-gui.sh:2718 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" + - #: git-gui.sh:2707 ++#: git-gui.sh:2748 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" + - #: git-gui.sh:2712 ++#: git-gui.sh:2753 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" + +#: lib/about.tcl:25 +msgid "git-gui - a graphical user interface for Git." +msgstr "" + +#: lib/blame.tcl:77 +msgid "File Viewer" +msgstr "" + +#: lib/blame.tcl:81 +msgid "Commit:" +msgstr "" + +#: lib/blame.tcl:249 +msgid "Copy Commit" +msgstr "" + +#: lib/blame.tcl:369 +#, tcl-format +msgid "Reading %s..." +msgstr "" + +#: lib/blame.tcl:473 +msgid "Loading copy/move tracking annotations..." +msgstr "" + +#: lib/blame.tcl:493 +msgid "lines annotated" +msgstr "" + +#: lib/blame.tcl:674 +msgid "Loading original location annotations..." +msgstr "" + +#: lib/blame.tcl:677 +msgid "Annotation complete." +msgstr "" + +#: lib/blame.tcl:731 +msgid "Loading annotation..." +msgstr "" + +#: lib/blame.tcl:787 +msgid "Author:" +msgstr "" + +#: lib/blame.tcl:791 +msgid "Committer:" +msgstr "" + +#: lib/blame.tcl:796 +msgid "Original File:" +msgstr "" + +#: lib/blame.tcl:910 +msgid "Originally By:" +msgstr "" + +#: lib/blame.tcl:916 +msgid "In File:" +msgstr "" + +#: lib/blame.tcl:921 +msgid "Copied Or Moved Here By:" +msgstr "" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 +msgid "Cancel" +msgstr "" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:286 +msgid "Revision" +msgstr "" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202 +msgid "Options" +msgstr "" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "" + - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:199 ++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 +msgid "Create" +msgstr "" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "" + +#: lib/branch_create.tcl:43 +msgid "Name:" +msgstr "" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "" + +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 +msgid "Reset" +msgstr "" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "" + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "" + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "" + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "" + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "" + +#: lib/branch_delete.tcl:54 +msgid "Always (Do not perform merge test.)" +msgstr "" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "" + +#: lib/branch_delete.tcl:115 +msgid "" +"Recovering deleted branches is difficult. \n" +"\n" +" Delete the selected branches?" +msgstr "" + +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "" + +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "" + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "" + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "" + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "" + +#: lib/browser.tcl:125 lib/browser.tcl:142 +#, tcl-format +msgid "Loading %s..." +msgstr "" + +#: lib/browser.tcl:186 +msgid "[Up To Parent]" +msgstr "" + +#: lib/browser.tcl:266 lib/browser.tcl:272 +msgid "Browse Branch Files" +msgstr "" + - #: lib/browser.tcl:277 lib/choose_repository.tcl:215 - #: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315 - #: lib/choose_repository.tcl:811 ++#: lib/browser.tcl:277 lib/choose_repository.tcl:391 ++#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 ++#: lib/choose_repository.tcl:989 +msgid "Browse" +msgstr "" + +#: lib/checkout_op.tcl:79 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "" + +#: lib/checkout_op.tcl:127 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "" + +#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31 +msgid "Close" +msgstr "" + +#: lib/checkout_op.tcl:169 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "" + +#: lib/checkout_op.tcl:206 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" + +#: lib/checkout_op.tcl:220 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "" + +#: lib/checkout_op.tcl:239 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "" + +#: lib/checkout_op.tcl:251 +msgid "Staging area (index) is already locked." +msgstr "" + +#: lib/checkout_op.tcl:266 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" + +#: lib/checkout_op.tcl:322 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "" + +#: lib/checkout_op.tcl:353 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "" + +#: lib/checkout_op.tcl:354 +msgid "File level merge required." +msgstr "" + +#: lib/checkout_op.tcl:358 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "" + +#: lib/checkout_op.tcl:429 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" + +#: lib/checkout_op.tcl:446 +#, tcl-format +msgid "Checked out '%s'." +msgstr "" + +#: lib/checkout_op.tcl:478 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "" + +#: lib/checkout_op.tcl:500 +msgid "Recovering lost commits may not be easy." +msgstr "" + +#: lib/checkout_op.tcl:505 +#, tcl-format +msgid "Reset '%s'?" +msgstr "" + +#: lib/checkout_op.tcl:510 lib/merge.tcl:164 +msgid "Visualize" +msgstr "" + +#: lib/checkout_op.tcl:578 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "" + +#: lib/choose_font.tcl:73 +msgid "Font Size" +msgstr "" + +#: lib/choose_font.tcl:90 +msgid "Font Example" +msgstr "" + +#: lib/choose_font.tcl:101 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" + - #: lib/choose_repository.tcl:25 ++#: lib/choose_repository.tcl:27 +msgid "Git Gui" +msgstr "" + - #: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204 ++#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380 +msgid "Create New Repository" +msgstr "" + - #: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291 ++#: lib/choose_repository.tcl:86 ++msgid "New..." ++msgstr "" ++ ++#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 +msgid "Clone Existing Repository" +msgstr "" + - #: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800 ++#: lib/choose_repository.tcl:99 ++msgid "Clone..." ++msgstr "" ++ ++#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 +msgid "Open Existing Repository" +msgstr "" + - #: lib/choose_repository.tcl:91 - msgid "Next >" ++#: lib/choose_repository.tcl:112 ++msgid "Open..." ++msgstr "" ++ ++#: lib/choose_repository.tcl:125 ++msgid "Recent Repositories" +msgstr "" + - #: lib/choose_repository.tcl:152 ++#: lib/choose_repository.tcl:131 ++msgid "Open Recent Repository:" ++msgstr "" ++ ++#: lib/choose_repository.tcl:294 +#, tcl-format +msgid "Location %s already exists." +msgstr "" + - #: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165 - #: lib/choose_repository.tcl:172 ++#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307 ++#: lib/choose_repository.tcl:314 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "" + - #: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309 ++#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486 +msgid "Directory:" +msgstr "" + - #: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363 - #: lib/choose_repository.tcl:834 ++#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544 ++#: lib/choose_repository.tcl:1013 +msgid "Git Repository" +msgstr "" + - #: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260 ++#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437 +#, tcl-format +msgid "Directory %s already exists." +msgstr "" + - #: lib/choose_repository.tcl:265 ++#: lib/choose_repository.tcl:442 +#, tcl-format +msgid "File %s already exists." +msgstr "" + - #: lib/choose_repository.tcl:286 ++#: lib/choose_repository.tcl:463 +msgid "Clone" +msgstr "" + - #: lib/choose_repository.tcl:299 ++#: lib/choose_repository.tcl:476 +msgid "URL:" +msgstr "" + - #: lib/choose_repository.tcl:319 ++#: lib/choose_repository.tcl:496 +msgid "Clone Type:" +msgstr "" + - #: lib/choose_repository.tcl:325 ++#: lib/choose_repository.tcl:502 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "" + - #: lib/choose_repository.tcl:331 ++#: lib/choose_repository.tcl:508 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "" + - #: lib/choose_repository.tcl:337 ++#: lib/choose_repository.tcl:514 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "" + - #: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418 - #: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630 - #: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848 ++#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 ++#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808 ++#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "" + - #: lib/choose_repository.tcl:405 ++#: lib/choose_repository.tcl:586 +msgid "Standard only available for local repository." +msgstr "" + - #: lib/choose_repository.tcl:409 ++#: lib/choose_repository.tcl:590 +msgid "Shared only available for local repository." +msgstr "" + - #: lib/choose_repository.tcl:439 ++#: lib/choose_repository.tcl:617 +msgid "Failed to configure origin" +msgstr "" + - #: lib/choose_repository.tcl:451 ++#: lib/choose_repository.tcl:629 +msgid "Counting objects" +msgstr "" + - #: lib/choose_repository.tcl:452 ++#: lib/choose_repository.tcl:630 +msgid "buckets" +msgstr "" + - #: lib/choose_repository.tcl:476 ++#: lib/choose_repository.tcl:654 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "" + - #: lib/choose_repository.tcl:512 ++#: lib/choose_repository.tcl:690 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "" + - #: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728 - #: lib/choose_repository.tcl:740 ++#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 ++#: lib/choose_repository.tcl:918 +msgid "The 'master' branch has not been initialized." +msgstr "" + - #: lib/choose_repository.tcl:527 ++#: lib/choose_repository.tcl:705 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "" + - #: lib/choose_repository.tcl:539 ++#: lib/choose_repository.tcl:717 +#, tcl-format +msgid "Cloning from %s" +msgstr "" + - #: lib/choose_repository.tcl:570 ++#: lib/choose_repository.tcl:748 +msgid "Copying objects" +msgstr "" + - #: lib/choose_repository.tcl:571 ++#: lib/choose_repository.tcl:749 +msgid "KiB" +msgstr "" + - #: lib/choose_repository.tcl:595 ++#: lib/choose_repository.tcl:773 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "" + - #: lib/choose_repository.tcl:605 ++#: lib/choose_repository.tcl:783 +msgid "Linking objects" +msgstr "" + - #: lib/choose_repository.tcl:606 ++#: lib/choose_repository.tcl:784 +msgid "objects" +msgstr "" + - #: lib/choose_repository.tcl:614 ++#: lib/choose_repository.tcl:792 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "" + - #: lib/choose_repository.tcl:669 ++#: lib/choose_repository.tcl:847 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "" + - #: lib/choose_repository.tcl:680 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch tags. See console output for details." +msgstr "" + - #: lib/choose_repository.tcl:704 ++#: lib/choose_repository.tcl:882 +msgid "Cannot determine HEAD. See console output for details." +msgstr "" + - #: lib/choose_repository.tcl:713 ++#: lib/choose_repository.tcl:891 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "" + - #: lib/choose_repository.tcl:719 ++#: lib/choose_repository.tcl:897 +msgid "Clone failed." +msgstr "" + - #: lib/choose_repository.tcl:726 ++#: lib/choose_repository.tcl:904 +msgid "No default branch obtained." +msgstr "" + - #: lib/choose_repository.tcl:737 ++#: lib/choose_repository.tcl:915 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "" + - #: lib/choose_repository.tcl:749 ++#: lib/choose_repository.tcl:927 +msgid "Creating working directory" +msgstr "" + - #: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80 - #: lib/index.tcl:149 ++#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 ++#: lib/index.tcl:193 +msgid "files" +msgstr "" + - #: lib/choose_repository.tcl:779 ++#: lib/choose_repository.tcl:957 +msgid "Initial file checkout failed." +msgstr "" + - #: lib/choose_repository.tcl:795 ++#: lib/choose_repository.tcl:973 +msgid "Open" +msgstr "" + - #: lib/choose_repository.tcl:805 ++#: lib/choose_repository.tcl:983 +msgid "Repository:" +msgstr "" + - #: lib/choose_repository.tcl:854 ++#: lib/choose_repository.tcl:1033 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537 +msgid "Tag" +msgstr "" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "" + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "" + +#: lib/choose_rev.tcl:530 +msgid "Updated" +msgstr "" + +#: lib/choose_rev.tcl:558 +msgid "URL" +msgstr "" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" + +#: lib/commit.tcl:49 +msgid "Error loading commit data for amend:" +msgstr "" + +#: lib/commit.tcl:76 +msgid "Unable to obtain your identity:" +msgstr "" + +#: lib/commit.tcl:81 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "" + +#: lib/commit.tcl:133 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" + +#: lib/commit.tcl:154 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" + +#: lib/commit.tcl:162 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" + +#: lib/commit.tcl:170 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" + +#: lib/commit.tcl:183 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" - "- First line: Describe in one sentance what you did.\n" ++"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" + +#: lib/commit.tcl:257 +msgid "write-tree failed:" +msgstr "" + +#: lib/commit.tcl:275 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "" + +#: lib/commit.tcl:279 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" + +#: lib/commit.tcl:286 +msgid "No changes to commit." +msgstr "" + +#: lib/commit.tcl:303 +#, tcl-format +msgid "warning: Tcl does not support encoding '%s'." +msgstr "" + +#: lib/commit.tcl:317 +msgid "commit-tree failed:" +msgstr "" + +#: lib/commit.tcl:339 +msgid "update-ref failed:" +msgstr "" + +#: lib/commit.tcl:430 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "" + +#: lib/console.tcl:57 +msgid "Working... please wait..." +msgstr "" + +#: lib/console.tcl:183 +msgid "Success" +msgstr "" + +#: lib/console.tcl:196 +msgid "Error: Command Failed" +msgstr "" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "" + +#: lib/database.tcl:108 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " +"the database when more than %i loose objects exist.\n" +"\n" +"Compress the database now?" +msgstr "" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "" + +#: lib/diff.tcl:42 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" + +#: lib/diff.tcl:81 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "" + +#: lib/diff.tcl:114 lib/diff.tcl:184 +#, tcl-format +msgid "Unable to display %s" +msgstr "" + +#: lib/diff.tcl:115 +msgid "Error loading file:" +msgstr "" + +#: lib/diff.tcl:122 +msgid "Git Repository (subproject)" +msgstr "" + +#: lib/diff.tcl:134 +msgid "* Binary file (not showing content)." +msgstr "" + +#: lib/diff.tcl:185 +msgid "Error loading diff:" +msgstr "" + +#: lib/diff.tcl:302 +msgid "Failed to unstage selected hunk." +msgstr "" + +#: lib/diff.tcl:309 +msgid "Failed to stage selected hunk." +msgstr "" + +#: lib/error.tcl:12 lib/error.tcl:102 +msgid "error" +msgstr "" + +#: lib/error.tcl:28 +msgid "warning" +msgstr "" + +#: lib/error.tcl:81 +msgid "You must correct the above errors before committing." +msgstr "" + - #: lib/index.tcl:241 ++#: lib/index.tcl:6 ++msgid "Unable to unlock the index." ++msgstr "" ++ ++#: lib/index.tcl:15 ++msgid "Index Error" ++msgstr "" ++ ++#: lib/index.tcl:21 ++msgid "" ++"Updating the Git index failed. A rescan will be automatically started to " ++"resynchronize git-gui." ++msgstr "" ++ ++#: lib/index.tcl:27 ++msgid "Continue" ++msgstr "" ++ ++#: lib/index.tcl:31 ++msgid "Unlock Index" ++msgstr "" ++ ++#: lib/index.tcl:282 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "" + - #: lib/index.tcl:285 ++#: lib/index.tcl:326 +#, tcl-format +msgid "Adding %s" +msgstr "" + - #: lib/index.tcl:340 ++#: lib/index.tcl:381 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "" + - #: lib/index.tcl:342 ++#: lib/index.tcl:383 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "" + - #: lib/index.tcl:348 ++#: lib/index.tcl:389 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" + - #: lib/index.tcl:351 ++#: lib/index.tcl:392 +msgid "Do Nothing" +msgstr "" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" + +#: lib/merge.tcl:44 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" + +#: lib/merge.tcl:54 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" + +#: lib/merge.tcl:106 +#, tcl-format +msgid "%s of %s" +msgstr "" + +#: lib/merge.tcl:119 +#, tcl-format +msgid "Merging %s and %s" +msgstr "" + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "" + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "" + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "" + +#: lib/merge.tcl:266 +msgid "Abort failed." +msgstr "" + +#: lib/merge.tcl:268 +msgid "Abort completed. Ready." +msgstr "" + +#: lib/option.tcl:82 +msgid "Restore Defaults" +msgstr "" + +#: lib/option.tcl:86 +msgid "Save" +msgstr "" + +#: lib/option.tcl:96 +#, tcl-format +msgid "%s Repository" +msgstr "" + +#: lib/option.tcl:97 +msgid "Global (All Repositories)" +msgstr "" + +#: lib/option.tcl:103 +msgid "User Name" +msgstr "" + +#: lib/option.tcl:104 +msgid "Email Address" +msgstr "" + +#: lib/option.tcl:106 +msgid "Summarize Merge Commits" +msgstr "" + +#: lib/option.tcl:107 +msgid "Merge Verbosity" +msgstr "" + +#: lib/option.tcl:108 +msgid "Show Diffstat After Merge" +msgstr "" + +#: lib/option.tcl:110 +msgid "Trust File Modification Timestamps" +msgstr "" + +#: lib/option.tcl:111 +msgid "Prune Tracking Branches During Fetch" +msgstr "" + +#: lib/option.tcl:112 +msgid "Match Tracking Branches" +msgstr "" + +#: lib/option.tcl:113 +msgid "Number of Diff Context Lines" +msgstr "" + +#: lib/option.tcl:114 +msgid "New Branch Name Template" +msgstr "" + +#: lib/option.tcl:176 +msgid "Change Font" +msgstr "" + +#: lib/option.tcl:180 +#, tcl-format +msgid "Choose %s" +msgstr "" + +#: lib/option.tcl:186 +msgid "pt." +msgstr "" + +#: lib/option.tcl:200 +msgid "Preferences" +msgstr "" + +#: lib/option.tcl:235 +msgid "Failed to completely save options:" +msgstr "" + - #: lib/remote.tcl:165 - msgid "Prune from" - msgstr "" - - #: lib/remote.tcl:170 - msgid "Fetch from" - msgstr "" - - #: lib/remote.tcl:213 - msgid "Push to" - msgstr "" - +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Remote Branch" +msgstr "" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 +msgid "Remote:" +msgstr "" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 +msgid "Arbitrary URL:" +msgstr "" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "" + +#: lib/remote_branch_delete.tcl:119 +msgid "Always (Do not perform merge checks)" +msgstr "" + +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "" + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "" + +#: lib/remote_branch_delete.tcl:216 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "" + +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "" + +#: lib/remote_branch_delete.tcl:286 +msgid "No repository selected." +msgstr "" + +#: lib/remote_branch_delete.tcl:291 +#, tcl-format +msgid "Scanning %s..." +msgstr "" + - #: lib/shortcut.tcl:26 lib/shortcut.tcl:74 - msgid "Cannot write script:" ++#: lib/remote.tcl:165 ++msgid "Prune from" ++msgstr "" ++ ++#: lib/remote.tcl:170 ++msgid "Fetch from" ++msgstr "" ++ ++#: lib/remote.tcl:213 ++msgid "Push to" ++msgstr "" ++ ++#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++msgid "Cannot write shortcut:" +msgstr "" + - #: lib/shortcut.tcl:149 ++#: lib/shortcut.tcl:136 +msgid "Cannot write icon:" +msgstr "" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "" + +#: lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "" + +#: lib/transport.tcl:25 lib/transport.tcl:71 +#, tcl-format +msgid "push %s" +msgstr "" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "" + +#: lib/transport.tcl:72 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "" + +#: lib/transport.tcl:89 +msgid "Push Branches" +msgstr "" + +#: lib/transport.tcl:103 +msgid "Source Branches" +msgstr "" + +#: lib/transport.tcl:120 +msgid "Destination Repository" +msgstr "" + +#: lib/transport.tcl:158 +msgid "Transfer Options" +msgstr "" + +#: lib/transport.tcl:160 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "" + +#: lib/transport.tcl:164 +msgid "Use thin pack (for slow network connections)" +msgstr "" + +#: lib/transport.tcl:168 +msgid "Include tags" +msgstr "" diff --cc git-gui/po/glossary/it.po index 8e3d9a2f0,000000000..bb46b48d6 mode 100644,000000..100644 --- a/git-gui/po/glossary/it.po +++ b/git-gui/po/glossary/it.po @@@ -1,180 -1,0 +1,184 @@@ +# Translation of git-gui glossary to Italian +# Copyright (C) 2007 Shawn Pearce, et al. +# This file is distributed under the same license as the git package. +# Christian Stimming , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: git-gui glossary\n" - "POT-Creation-Date: 2007-10-05 22:30+0200\n" ++"POT-Creation-Date: 2007-10-19 21:43+0200\n" +"PO-Revision-Date: 2007-10-10 15:24+0200\n" +"Last-Translator: Michele Ballabio \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" +msgid "" +"English Term (Dear translator: This file will never be visible to the user!)" +msgstr "" +"Traduzione italiana.\n" +"Altri SCM in italiano:\n" +" http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_it." +"po (username=guest, password empty),\n" +" http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/it_IT.po?" +"view=markup ,\n" +" http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/it_IT/rapidsvn.po " +"(username=guest, password empty)" + +#. "" +msgid "amend" +msgstr "correggere, correzione" + +#. "" +msgid "annotate" +msgstr "annotare, annotazione" + +#. "A 'branch' is an active line of development." +msgid "branch [noun]" +msgstr "ramo, diramazione, ramificazione" + +#. "" +msgid "branch [verb]" +msgstr "creare ramo, ramificare, diramare" + +#. "" +msgid "checkout [noun]" +msgstr "attivazione, checkout, revisione attiva, prelievo (TortoiseCVS)?" + +#. "The action of updating the working tree to a revision which was stored in the object database." +msgid "checkout [verb]" +msgstr "" - "attivare, effettuare un checkout, attivare revisione, prelevare (TortoiseCVS), " - "ritirare (TSVN)?" ++"attivare, effettuare un checkout, attivare revisione, prelevare " ++"(TortoiseCVS), ritirare (TSVN)?" + +#. "" +msgid "clone [verb]" +msgstr "clonare" + +#. "A single point in the git history." +msgid "commit [noun]" +msgstr "revisione, commit, deposito (TortoiseCVS), invio (TSVN)?" + +#. "The action of storing a new snapshot of the project's state in the git history." +msgid "commit [verb]" +msgstr "" +"creare una nuova revisione, archiviare, effettuare un commit, depositare " +"(nel server), fare un deposito (TortoiseCVS), inviare (TSVN)?" + +#. "" +msgid "diff [noun]" +msgstr "differenza, confronto, comparazione, raffronto" + +#. "" +msgid "diff [verb]" +msgstr "confronta, mostra le differenze" + +#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." +msgid "fast forward merge" +msgstr "fusione in 'fast-forward', fusione in avanti veloce" + +#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." +msgid "fetch" +msgstr "recuperare, prelevare, prendere da, recuperare (TSVN)" + +#. "A collection of files. The index is a stored version of your working tree." +msgid "index (in git-gui: staging area)" +msgstr "indice" + +#. "A successful merge results in the creation of a new commit representing the result of the merge." +msgid "merge [noun]" +msgstr "fusione, unione" + +#. "To bring the contents of another branch into the current branch." +msgid "merge [verb]" +msgstr "effettuare la fusione, unire, fondere, eseguire la fusione" + +#. "" +msgid "message" +msgstr "messaggio, commento" + - #. "" ++#. "Deletes all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." +msgid "prune" +msgstr "potatura" + +#. "Pulling a branch means to fetch it and merge it." +msgid "pull" +msgstr "" +"prendi (recupera) e fondi (unisci)? (in pratica una traduzione di fetch + " +"merge)" + +#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" +msgid "push" +msgstr "propaga" + +#. "" +msgid "redo" +msgstr "ripeti, rifai" + ++#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." ++msgid "remote" ++msgstr "remoto" ++ +#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" +msgid "repository" +msgstr "archivio, repository, database? deposito (rapidsvn)?" + +#. "" +msgid "reset" +msgstr "ripristinare, annullare, azzerare, ripristinare" + +#. "" +msgid "revert" +msgstr "" +"annullare, inverti (rapidsvn), ritorna allo stato precedente, annulla le " +"modifiche della revisione" + +#. "A particular state of files and directories which was stored in the object database." +msgid "revision" +msgstr "revisione (TortoiseSVN)" + +#. "" +msgid "sign off" +msgstr "sign off, firma" + +#. "" +msgid "staging area" +msgstr "" +"area di preparazione, zona di preparazione, modifiche in preparazione? " +"modifiche in allestimento?" + +#. "" +msgid "status" +msgstr "stato" + +#. "A ref pointing to a tag or commit object" +msgid "tag [noun]" +msgstr "etichetta, etichettatura (TortoiseCVS)" + +#. "" +msgid "tag [verb]" +msgstr "etichettare" + +#. "A regular git branch that is used to follow changes from another repository." +msgid "tracking branch" +msgstr "" - "duplicato locale di ramo remoto, ramo in 'tracking', ramo inseguitore? ramo di {inseguimento,allineamento," - "rilevamento,puntamento}?" ++"duplicato locale di ramo remoto, ramo in 'tracking', ramo inseguitore? ramo " ++"di {inseguimento,allineamento,rilevamento,puntamento}?" + +#. "" +msgid "undo" +msgstr "annulla" + +#. "" +msgid "update" +msgstr "aggiornamento, aggiornare" + +#. "" +msgid "verify" +msgstr "verifica, verificare" + +#. "The tree of actual checked out files." +msgid "working copy, working tree" +msgstr "directory di lavoro, copia di lavoro" diff --cc git-gui/po/hu.po index e8c04f7ae,000000000..627c05eb9 mode 100644,000000..100644 --- a/git-gui/po/hu.po +++ b/git-gui/po/hu.po @@@ -1,1895 -1,0 +1,1937 @@@ +# Hungarian translations for git-gui-i package. +# Copyright (C) 2007 THE git-gui-i'S COPYRIGHT HOLDER +# This file is distributed under the same license as the git-gui-i package. +# Miklos Vajna , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: git-gui-i 18n\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-10-10 04:04-0400\n" - "PO-Revision-Date: 2007-07-27 13:15+0200\n" ++"POT-Creation-Date: 2007-11-24 10:36+0100\n" ++"PO-Revision-Date: 2007-12-04 01:15+0100\n" +"Last-Translator: Miklos Vajna \n" +"Language-Team: Hungarian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + - #: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 - #: git-gui.sh:763 ++#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 ++#: git-gui.sh:733 +msgid "git-gui: fatal error" - msgstr "" ++msgstr "git-gui: végzetes hiba" + - #: git-gui.sh:595 - #, fuzzy, tcl-format ++#: git-gui.sh:565 ++#, tcl-format +msgid "Invalid font specified in %s:" - msgstr "Érvénytelen font lett megadva a grafikus felületben.%s:" ++msgstr "Érvénytelen font lett megadva itt: %s:" + - #: git-gui.sh:620 ++#: git-gui.sh:590 +msgid "Main Font" +msgstr "Fő betűtípus" + - #: git-gui.sh:621 ++#: git-gui.sh:591 +msgid "Diff/Console Font" +msgstr "Diff/konzol betűtípus" + - #: git-gui.sh:635 ++#: git-gui.sh:605 +msgid "Cannot find git in PATH." +msgstr "A git nem található a PATH-ban." + - #: git-gui.sh:662 ++#: git-gui.sh:632 +msgid "Cannot parse Git version string:" +msgstr "Nem értelmezhető a Git verzió sztring:" + - #: git-gui.sh:680 ++#: git-gui.sh:650 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Nem állípítható meg a Git verziója.\n" +"\n" +"A(z) %s szerint a verzió '%s'.\n" +"\n" +"A(z) %s a Git 1.5.0 vagy későbbi verzióját igényli.\n" +"\n" +"Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\n" + - #: git-gui.sh:853 ++#: git-gui.sh:888 +msgid "Git directory not found:" +msgstr "A Git könyvtár nem található:" + - #: git-gui.sh:860 - #, fuzzy ++#: git-gui.sh:895 +msgid "Cannot move to top of working directory:" - msgstr "Nem használható vicces .git könyvtár:" ++msgstr "Nem lehet a munkakönyvtár tetejére lépni:" + - #: git-gui.sh:867 ++#: git-gui.sh:902 +msgid "Cannot use funny .git directory:" +msgstr "Nem használható vicces .git könyvtár:" + - #: git-gui.sh:872 ++#: git-gui.sh:907 +msgid "No working directory" +msgstr "Nincs munkakönyvtár" + - #: git-gui.sh:1019 ++#: git-gui.sh:1054 +msgid "Refreshing file status..." +msgstr "A fájlok státuszának frissítése..." + - #: git-gui.sh:1084 ++#: git-gui.sh:1119 +msgid "Scanning for modified files ..." +msgstr "Módosított fájlok keresése ..." + - #: git-gui.sh:1259 lib/browser.tcl:245 ++#: git-gui.sh:1294 lib/browser.tcl:245 +msgid "Ready." +msgstr "Kész." + - #: git-gui.sh:1525 ++#: git-gui.sh:1560 +msgid "Unmodified" +msgstr "Nem módosított" + - #: git-gui.sh:1527 ++#: git-gui.sh:1562 +msgid "Modified, not staged" +msgstr "Módosított, de nem kiválasztott" + - #: git-gui.sh:1528 git-gui.sh:1533 ++#: git-gui.sh:1563 git-gui.sh:1568 +msgid "Staged for commit" +msgstr "Kiválasztva commitolásra" + - #: git-gui.sh:1529 git-gui.sh:1534 ++#: git-gui.sh:1564 git-gui.sh:1569 +msgid "Portions staged for commit" +msgstr "Részek kiválasztva commitolásra" + - #: git-gui.sh:1530 git-gui.sh:1535 ++#: git-gui.sh:1565 git-gui.sh:1570 +msgid "Staged for commit, missing" +msgstr "Kiválasztva commitolásra, hiányzó" + - #: git-gui.sh:1532 ++#: git-gui.sh:1567 +msgid "Untracked, not staged" +msgstr "Nem követett, nem kiválasztott" + - #: git-gui.sh:1537 ++#: git-gui.sh:1572 +msgid "Missing" +msgstr "Hiányzó" + - #: git-gui.sh:1538 ++#: git-gui.sh:1573 +msgid "Staged for removal" +msgstr "Kiválasztva eltávolításra" + - #: git-gui.sh:1539 ++#: git-gui.sh:1574 +msgid "Staged for removal, still present" +msgstr "Kiválasztva eltávolításra, jelenleg is elérhető" + - #: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544 ++#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 +msgid "Requires merge resolution" +msgstr "Merge feloldás szükséges" + - #: git-gui.sh:1579 ++#: git-gui.sh:1614 +msgid "Starting gitk... please wait..." +msgstr "A gitk indítása... várjunk..." + - #: git-gui.sh:1588 ++#: git-gui.sh:1623 +#, tcl-format +msgid "" +"Unable to start gitk:\n" +"\n" +"%s does not exist" +msgstr "" +"A gitk indítása sikertelen:\n" +"\n" +"A(z) %s nem létezik" + - #: git-gui.sh:1788 lib/choose_repository.tcl:32 ++#: git-gui.sh:1823 lib/choose_repository.tcl:35 +msgid "Repository" +msgstr "Repó" + - #: git-gui.sh:1789 ++#: git-gui.sh:1824 +msgid "Edit" +msgstr "Szerkesztés" + - #: git-gui.sh:1791 lib/choose_rev.tcl:560 ++#: git-gui.sh:1826 lib/choose_rev.tcl:560 +msgid "Branch" +msgstr "Branch" + - #: git-gui.sh:1794 lib/choose_rev.tcl:547 - #, fuzzy ++#: git-gui.sh:1829 lib/choose_rev.tcl:547 +msgid "Commit@@noun" - msgstr "Commit" ++msgstr "Commit@@főnév" + - #: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "Merge" + - #: git-gui.sh:1798 lib/choose_rev.tcl:556 - #, fuzzy ++#: git-gui.sh:1833 lib/choose_rev.tcl:556 +msgid "Remote" - msgstr "Távoli:" ++msgstr "Távoli" + - #: git-gui.sh:1807 ++#: git-gui.sh:1842 +msgid "Browse Current Branch's Files" +msgstr "A jelenlegi branch fájljainak böngészése" + - #: git-gui.sh:1811 ++#: git-gui.sh:1846 +msgid "Browse Branch Files..." +msgstr "A branch fájljainak böngészése..." + - #: git-gui.sh:1816 ++#: git-gui.sh:1851 +msgid "Visualize Current Branch's History" +msgstr "A jelenlegi branch történetének vizualizálása" + - #: git-gui.sh:1820 ++#: git-gui.sh:1855 +msgid "Visualize All Branch History" +msgstr "Az összes branch történetének vizualizálása" + - #: git-gui.sh:1827 ++#: git-gui.sh:1862 +#, tcl-format +msgid "Browse %s's Files" +msgstr "A(z) %s branch fájljainak böngészése" + - #: git-gui.sh:1829 ++#: git-gui.sh:1864 +#, tcl-format +msgid "Visualize %s's History" +msgstr "A(z) %s branch történetének vizualizálása" + - #: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "Adatbázis statisztikák" + - #: git-gui.sh:1837 lib/database.tcl:34 ++#: git-gui.sh:1872 lib/database.tcl:34 +msgid "Compress Database" +msgstr "Adatbázis tömörítése" + - #: git-gui.sh:1840 ++#: git-gui.sh:1875 +msgid "Verify Database" +msgstr "Adatbázis ellenőrzése" + - #: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9 - #: lib/shortcut.tcl:45 lib/shortcut.tcl:84 ++#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 ++#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 +msgid "Create Desktop Icon" +msgstr "Asztal ikon létrehozása" + - #: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95 ++#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 +msgid "Quit" +msgstr "Kilépés" + - #: git-gui.sh:1867 ++#: git-gui.sh:1902 +msgid "Undo" +msgstr "Visszavonás" + - #: git-gui.sh:1870 ++#: git-gui.sh:1905 +msgid "Redo" +msgstr "Mégis" + - #: git-gui.sh:1874 git-gui.sh:2366 ++#: git-gui.sh:1909 git-gui.sh:2403 +msgid "Cut" +msgstr "Kivágás" + - #: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512 ++#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 +#: lib/console.tcl:67 +msgid "Copy" +msgstr "Másolás" + - #: git-gui.sh:1880 git-gui.sh:2372 ++#: git-gui.sh:1915 git-gui.sh:2409 +msgid "Paste" +msgstr "Beillesztés" + - #: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26 ++#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "Törlés" + - #: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69 ++#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 +msgid "Select All" +msgstr "Mindent kiválaszt" + - #: git-gui.sh:1896 ++#: git-gui.sh:1931 +msgid "Create..." +msgstr "Létrehozás..." + - #: git-gui.sh:1902 ++#: git-gui.sh:1937 +msgid "Checkout..." +msgstr "Checkout..." + - #: git-gui.sh:1908 ++#: git-gui.sh:1943 +msgid "Rename..." +msgstr "Átnevezés..." + - #: git-gui.sh:1913 git-gui.sh:2012 ++#: git-gui.sh:1948 git-gui.sh:2048 +msgid "Delete..." +msgstr "Törlés..." + - #: git-gui.sh:1918 ++#: git-gui.sh:1953 +msgid "Reset..." +msgstr "Visszaállítás..." + - #: git-gui.sh:1930 git-gui.sh:2313 ++#: git-gui.sh:1965 git-gui.sh:2350 +msgid "New Commit" +msgstr "Új commit" + - #: git-gui.sh:1938 git-gui.sh:2320 ++#: git-gui.sh:1973 git-gui.sh:2357 +msgid "Amend Last Commit" +msgstr "Utolsó commit javítása" + - #: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "Keresés újra" + - #: git-gui.sh:1953 ++#: git-gui.sh:1988 +msgid "Stage To Commit" +msgstr "Kiválasztás commitolásra" + - #: git-gui.sh:1958 ++#: git-gui.sh:1994 +msgid "Stage Changed Files To Commit" +msgstr "Módosított fájlok kiválasztása commitolásra" + - #: git-gui.sh:1964 ++#: git-gui.sh:2000 +msgid "Unstage From Commit" +msgstr "Commitba való kiválasztás visszavonása" + - #: git-gui.sh:1969 lib/index.tcl:352 ++#: git-gui.sh:2005 lib/index.tcl:393 +msgid "Revert Changes" +msgstr "Változtatások visszaállítása" + - #: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390 ++#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 +msgid "Sign Off" +msgstr "Aláír" + - #: git-gui.sh:1980 git-gui.sh:2296 - #, fuzzy ++#: git-gui.sh:2016 git-gui.sh:2333 +msgid "Commit@@verb" - msgstr "Commit" ++msgstr "Commit@@ige" + - #: git-gui.sh:1991 ++#: git-gui.sh:2027 +msgid "Local Merge..." +msgstr "Helyi merge..." + - #: git-gui.sh:1996 ++#: git-gui.sh:2032 +msgid "Abort Merge..." +msgstr "Merge megszakítása..." + - #: git-gui.sh:2008 ++#: git-gui.sh:2044 +msgid "Push..." +msgstr "Push..." + - #: git-gui.sh:2019 lib/choose_repository.tcl:41 ++#: git-gui.sh:2055 lib/choose_repository.tcl:40 +msgid "Apple" +msgstr "Apple" + - #: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 ++#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 ++#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 +#, tcl-format +msgid "About %s" +msgstr "Névjegy: %s" + - #: git-gui.sh:2026 ++#: git-gui.sh:2062 +msgid "Preferences..." - msgstr "" ++msgstr "Beállítások..." + - #: git-gui.sh:2034 git-gui.sh:2558 ++#: git-gui.sh:2070 git-gui.sh:2595 +msgid "Options..." +msgstr "Opciók..." + - #: git-gui.sh:2040 lib/choose_repository.tcl:47 ++#: git-gui.sh:2076 lib/choose_repository.tcl:46 +msgid "Help" +msgstr "Segítség" + - #: git-gui.sh:2081 ++#: git-gui.sh:2117 +msgid "Online Documentation" +msgstr "Online dokumentáció" + - #: git-gui.sh:2165 ++#: git-gui.sh:2201 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" - msgstr "" ++msgstr "végzetes hiba: nem érhető el a(z) %s útvonal: Nincs ilyen fájl vagy könyvtár" + - #: git-gui.sh:2198 ++#: git-gui.sh:2234 +msgid "Current Branch:" +msgstr "Jelenlegi branch:" + - #: git-gui.sh:2219 - #, fuzzy ++#: git-gui.sh:2255 +msgid "Staged Changes (Will Commit)" +msgstr "Kiválasztott változtatások (commitolva lesz)" + - #: git-gui.sh:2239 - #, fuzzy ++#: git-gui.sh:2274 +msgid "Unstaged Changes" - msgstr "Változtatások kiválasztása" ++msgstr "Kiválasztatlan változtatások" + - #: git-gui.sh:2286 ++#: git-gui.sh:2323 +msgid "Stage Changed" +msgstr "Változtatások kiválasztása" + - #: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182 ++#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 +msgid "Push" +msgstr "Push" + - #: git-gui.sh:2332 ++#: git-gui.sh:2369 +msgid "Initial Commit Message:" +msgstr "Kezdeti commit üzenet:" + - #: git-gui.sh:2333 ++#: git-gui.sh:2370 +msgid "Amended Commit Message:" +msgstr "Javító commit üzenet:" + - #: git-gui.sh:2334 ++#: git-gui.sh:2371 +msgid "Amended Initial Commit Message:" +msgstr "Kezdeti javító commit üzenet:" + - #: git-gui.sh:2335 ++#: git-gui.sh:2372 +msgid "Amended Merge Commit Message:" +msgstr "Javító merge commit üzenet:" + - #: git-gui.sh:2336 ++#: git-gui.sh:2373 +msgid "Merge Commit Message:" +msgstr "Merge commit üzenet:" + - #: git-gui.sh:2337 ++#: git-gui.sh:2374 +msgid "Commit Message:" +msgstr "Commit üzenet:" + - #: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71 ++#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 +msgid "Copy All" +msgstr "Összes másolása" + - #: git-gui.sh:2406 lib/blame.tcl:104 ++#: git-gui.sh:2443 lib/blame.tcl:104 +msgid "File:" +msgstr "Fájl:" + - #: git-gui.sh:2508 ++#: git-gui.sh:2545 +msgid "Refresh" +msgstr "Frissítés" + - #: git-gui.sh:2529 ++#: git-gui.sh:2566 +msgid "Apply/Reverse Hunk" +msgstr "Hunk alkalmazása/visszaállítása" + - #: git-gui.sh:2535 ++#: git-gui.sh:2572 +msgid "Decrease Font Size" +msgstr "Font méret csökkentése" + - #: git-gui.sh:2539 ++#: git-gui.sh:2576 +msgid "Increase Font Size" +msgstr "Fönt méret növelése" + - #: git-gui.sh:2544 ++#: git-gui.sh:2581 +msgid "Show Less Context" +msgstr "Kevesebb környezet mutatása" + - #: git-gui.sh:2551 ++#: git-gui.sh:2588 +msgid "Show More Context" +msgstr "Több környezet mutatása" + - #: git-gui.sh:2565 ++#: git-gui.sh:2602 +msgid "Unstage Hunk From Commit" +msgstr "Hunk törlése commitból" + - #: git-gui.sh:2567 ++#: git-gui.sh:2604 +msgid "Stage Hunk For Commit" +msgstr "Hunk kiválasztása commitba" + - #: git-gui.sh:2586 ++#: git-gui.sh:2623 +msgid "Initializing..." +msgstr "Inicializálás..." + - #: git-gui.sh:2677 ++#: git-gui.sh:2718 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" ++"Lehetséges, hogy környezeti problémák vannak.\n" ++"\n" ++"A következő környezeti változók valószínűleg\n" ++"figyelmen kívül lesznek hagyva a(z) %s által\n" ++"indított folyamatok által:\n" ++"\n" + - #: git-gui.sh:2707 ++#: git-gui.sh:2748 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" ++"\n" ++"Ez a Cygwin által terjesztett Tcl binárisban\n" ++"lévő ismert hiba miatt van." + - #: git-gui.sh:2712 ++#: git-gui.sh:2753 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" ++"\n" ++"\n" ++"Egy jó helyettesítés a(z) %s számára\n" ++"a user.name és user.email beállítások\n" ++"elhelyezése a személyes\n" ++"~/.gitconfig fájlba.\n" + +#: lib/about.tcl:25 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - egy grafikus felület a Githez." + +#: lib/blame.tcl:77 +msgid "File Viewer" +msgstr "Fájl néző" + +#: lib/blame.tcl:81 +msgid "Commit:" +msgstr "Commit:" + +#: lib/blame.tcl:249 +msgid "Copy Commit" +msgstr "Commit másolása" + +#: lib/blame.tcl:369 +#, tcl-format +msgid "Reading %s..." +msgstr "A(z) %s olvasása..." + +#: lib/blame.tcl:473 +msgid "Loading copy/move tracking annotations..." - msgstr "" ++msgstr "A másolást/átnevezést követő annotációk betöltése..." + +#: lib/blame.tcl:493 +msgid "lines annotated" - msgstr "" ++msgstr "sor annotálva" + +#: lib/blame.tcl:674 +msgid "Loading original location annotations..." - msgstr "" ++msgstr "Az eredeti hely annotációk betöltése..." + +#: lib/blame.tcl:677 +msgid "Annotation complete." - msgstr "" ++msgstr "Az annotáció kész." + +#: lib/blame.tcl:731 - #, fuzzy +msgid "Loading annotation..." - msgstr "A(z) %s betöltése..." ++msgstr "Az annotáció betöltése..." + +#: lib/blame.tcl:787 +msgid "Author:" - msgstr "" ++msgstr "Szerző:" + +#: lib/blame.tcl:791 - #, fuzzy +msgid "Committer:" - msgstr "Commit:" ++msgstr "Commiter:" + +#: lib/blame.tcl:796 +msgid "Original File:" - msgstr "" ++msgstr "Eredeti fájl:" + +#: lib/blame.tcl:910 +msgid "Originally By:" - msgstr "" ++msgstr "Eredeti szerző:" + +#: lib/blame.tcl:916 - #, fuzzy +msgid "In File:" - msgstr "Fájl:" ++msgstr "Ebben a fájlban:" + +#: lib/blame.tcl:921 +msgid "Copied Or Moved Here By:" - msgstr "" ++msgstr "Ide másolta vagy helyezte:" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "Branch checkoutolása" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Checkout" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 +msgid "Cancel" +msgstr "Mégsem" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:286 +msgid "Revision" +msgstr "Revízió" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202 +msgid "Options" +msgstr "Opciók" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Követő branch letöltése" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Helyi branch leválasztása" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Branch létrehozása" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "Új branch létrehozása" + - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:199 ++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 +msgid "Create" +msgstr "Létrehozás" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Branch neve" + +#: lib/branch_create.tcl:43 +msgid "Name:" +msgstr "Név:" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Egyeztetendő követési branch név" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "A következő revíziótól" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Létező branch frissítése" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Nem" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Csak fast forward" + +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 +msgid "Reset" +msgstr "Visszaállítás" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Checkout létrehozás után" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Válasszunk ki egy követő branchet." + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "A(z) %s követő branch nem branch a távoli repóban." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Adjunk megy egy branch nevet." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "A(z) '%s' nem egy elfogadható branch név." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Branch törlése" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Helyi branch törlése" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Helyi branchek" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Csak már merge-ölt törlése" + +#: lib/branch_delete.tcl:54 +msgid "Always (Do not perform merge test.)" +msgstr "Mindig (Ne legyen merge teszt.)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:" + +#: lib/branch_delete.tcl:115 +msgid "" +"Recovering deleted branches is difficult. \n" +"\n" +" Delete the selected branches?" +msgstr "" +"A törölt branchek visszaállítása bonyolult. \n" +"\n" +" Biztosan törli a kiválasztott brancheket?" + +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"Nem sikerült törölni a következő brancheket:\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Branch átnevezése" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Átnevezés" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Branch:" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Új név:" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "Válasszunk ki egy átnevezendő branchet." + +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "A(z) '%s' branch már létezik." + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Nem sikerült átnevezni: '%s'." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Indítás..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "Fájl böngésző" + +#: lib/browser.tcl:125 lib/browser.tcl:142 +#, tcl-format +msgid "Loading %s..." +msgstr "A(z) %s betöltése..." + +#: lib/browser.tcl:186 +msgid "[Up To Parent]" +msgstr "[Fel a szülőhöz]" + +#: lib/browser.tcl:266 lib/browser.tcl:272 +msgid "Browse Branch Files" +msgstr "A branch fájljainak böngészése" + - #: lib/browser.tcl:277 lib/choose_repository.tcl:215 - #: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315 - #: lib/choose_repository.tcl:811 ++#: lib/browser.tcl:277 lib/choose_repository.tcl:391 ++#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 ++#: lib/choose_repository.tcl:989 +msgid "Browse" +msgstr "Böngészés" + +#: lib/checkout_op.tcl:79 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "A(z) %s letöltése innen: %s" + +#: lib/checkout_op.tcl:127 +#, tcl-format +msgid "fatal: Cannot resolve %s" - msgstr "" ++msgstr "végzetes: Nem lehet feloldani a következőt: %s" + +#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31 +msgid "Close" +msgstr "Bezárás" + +#: lib/checkout_op.tcl:169 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "A(z) '%s' branch nem létezik." + +#: lib/checkout_op.tcl:206 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"A(z) '%s' branch már létezik.\n" +"\n" +"Nem lehet fast-forwardolni a következőhöz: %s.\n" +"Egy merge szükséges." + +#: lib/checkout_op.tcl:220 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "A(z) '%s' merge strategy nem támogatott." + +#: lib/checkout_op.tcl:239 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "Nem sikerült frissíteni a következőt: '%s'." + +#: lib/checkout_op.tcl:251 +msgid "Staging area (index) is already locked." +msgstr "A kiválasztási terület (index) már zárolva van." + +#: lib/checkout_op.tcl:266 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Az utolsó keresési állapot nem egyezik meg a repó állpotával.\n" +"\n" +"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy " +"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani " +"lehetne.\n" +"\n" +"Az újrakeresés most automatikusan el fog indulni.\n" + +#: lib/checkout_op.tcl:322 - #, fuzzy, tcl-format ++#, tcl-format +msgid "Updating working directory to '%s'..." - msgstr "Nincs munkakönyvtár" ++msgstr "A munkkönyvtár frissiítése a következőre: '%s'..." + +#: lib/checkout_op.tcl:353 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "A(z) '%s' checkoutja megszakítva (fájlszintű merge-ölés szükséges)." + +#: lib/checkout_op.tcl:354 +msgid "File level merge required." +msgstr "Fájlszintű merge-ölés szükséges." + +#: lib/checkout_op.tcl:358 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Jelenleg a(z) '%s' branchen." + +#: lib/checkout_op.tcl:429 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Már nem egy helyi branchen vagyunk.\n" +"\n" +"Ha egy branchen szeretnénk lenni, hozzunk létre egyet az 'Ez a leválasztott " +"checkout'-ból." + +#: lib/checkout_op.tcl:446 - #, fuzzy, tcl-format ++#, tcl-format +msgid "Checked out '%s'." - msgstr "Checkout..." ++msgstr "'%s' kifejtve." + +#: lib/checkout_op.tcl:478 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "" +"A(z) '%s' -> '%s' visszaállítás a következő commitok elvesztését jelenti:" + +#: lib/checkout_op.tcl:500 +msgid "Recovering lost commits may not be easy." +msgstr "Az elveszett commitok helyreállítása nem biztos, hogy egyszerű." + +#: lib/checkout_op.tcl:505 +#, tcl-format +msgid "Reset '%s'?" +msgstr "Visszaállítjuk a következőt: '%s'?" + +#: lib/checkout_op.tcl:510 lib/merge.tcl:164 +msgid "Visualize" +msgstr "Vizualizálás" + +#: lib/checkout_op.tcl:578 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"Nem sikerült beállítani a jelenlegi branchet.\n" +"\n" +"A munkakönyvtár csak részben váltott át. A fájlok sikeresen frissítve " +"lettek, de nem sikerült frissíteni egy belső Git fájlt.\n" +"\n" +"Ennek nem szabad megtörténnie. A(z) %s most kilép és feladja." + +#: lib/choose_font.tcl:39 - #, fuzzy +msgid "Select" - msgstr "Mindent kiválaszt" ++msgstr "Kiválaszt" + +#: lib/choose_font.tcl:53 +msgid "Font Family" - msgstr "" ++msgstr "Font család" + +#: lib/choose_font.tcl:73 - #, fuzzy +msgid "Font Size" - msgstr "Font méret csökkentése" ++msgstr "Font méret" + +#: lib/choose_font.tcl:90 +msgid "Font Example" - msgstr "" ++msgstr "Font példa" + +#: lib/choose_font.tcl:101 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" ++"Ez egy példa szöveg.\n" ++"Ha ez megfelel, ez lehet a betűtípus." + - #: lib/choose_repository.tcl:25 ++#: lib/choose_repository.tcl:27 +msgid "Git Gui" - msgstr "" ++msgstr "Git Gui" + - #: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204 - #, fuzzy ++#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380 +msgid "Create New Repository" - msgstr "Forrás repó" ++msgstr "Új repó létrehozása" ++ ++#: lib/choose_repository.tcl:86 ++msgid "New..." ++msgstr "Új..." + - #: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291 - #, fuzzy ++#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 +msgid "Clone Existing Repository" - msgstr "Cél repó" ++msgstr "Létező repó másolása" ++ ++#: lib/choose_repository.tcl:99 ++msgid "Clone..." ++msgstr "Másolás..." + - #: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800 - #, fuzzy ++#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 +msgid "Open Existing Repository" - msgstr "Cél repó" ++msgstr "Létező könyvtár megnyitása" + - #: lib/choose_repository.tcl:91 - msgid "Next >" - msgstr "" ++#: lib/choose_repository.tcl:112 ++msgid "Open..." ++msgstr "Meggyitás..." ++ ++#: lib/choose_repository.tcl:125 ++msgid "Recent Repositories" ++msgstr "Legutóbbi repók" + - #: lib/choose_repository.tcl:152 - #, fuzzy, tcl-format ++#: lib/choose_repository.tcl:131 ++msgid "Open Recent Repository:" ++msgstr "Legutóbbi repók megnyitása:" ++ ++#: lib/choose_repository.tcl:294 ++#, tcl-format +msgid "Location %s already exists." - msgstr "A(z) '%s' branch már létezik." ++msgstr "A(z) '%s' hely már létezik." + - #: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165 - #: lib/choose_repository.tcl:172 - #, fuzzy, tcl-format ++#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307 ++#: lib/choose_repository.tcl:314 ++#, tcl-format +msgid "Failed to create repository %s:" - msgstr "Nem sikerült teljesen elmenteni a beállításokat:" ++msgstr "Nem sikerült letrehozni a(z) %s repót:" + - #: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309 ++#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486 +msgid "Directory:" - msgstr "" ++msgstr "Könyvtár:" + - #: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363 - #: lib/choose_repository.tcl:834 - #, fuzzy ++#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544 ++#: lib/choose_repository.tcl:1013 +msgid "Git Repository" - msgstr "Repó" ++msgstr "Git repó" + - #: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260 - #, fuzzy, tcl-format ++#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437 ++#, tcl-format +msgid "Directory %s already exists." - msgstr "A(z) '%s' branch már létezik." ++msgstr "A(z) '%s' könyvtár már létezik." + - #: lib/choose_repository.tcl:265 - #, fuzzy, tcl-format ++#: lib/choose_repository.tcl:442 ++#, tcl-format +msgid "File %s already exists." - msgstr "A(z) '%s' branch már létezik." ++msgstr "A(z) '%s' fájl már létezik." + - #: lib/choose_repository.tcl:286 - #, fuzzy ++#: lib/choose_repository.tcl:463 +msgid "Clone" +msgstr "Bezárás" + - #: lib/choose_repository.tcl:299 ++#: lib/choose_repository.tcl:476 +msgid "URL:" - msgstr "" ++msgstr "URL:" + - #: lib/choose_repository.tcl:319 ++#: lib/choose_repository.tcl:496 +msgid "Clone Type:" - msgstr "" ++msgstr "Másolás típusa:" + - #: lib/choose_repository.tcl:325 ++#: lib/choose_repository.tcl:502 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" - msgstr "" ++msgstr "Általános (Gyors, félig-redundáns, hardlinkek)" + - #: lib/choose_repository.tcl:331 ++#: lib/choose_repository.tcl:508 +msgid "Full Copy (Slower, Redundant Backup)" - msgstr "" ++msgstr "Teljes másolás (Lassabb, redundáns biztonsági mentés)" + - #: lib/choose_repository.tcl:337 ++#: lib/choose_repository.tcl:514 +msgid "Shared (Fastest, Not Recommended, No Backup)" - msgstr "" ++msgstr "Megosztott (Leggyorsabb, nem ajánlott, nincs mentés)" + - #: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418 - #: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630 - #: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848 - #, fuzzy, tcl-format ++#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 ++#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808 ++#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027 ++#, tcl-format +msgid "Not a Git repository: %s" - msgstr "Nincs kiválasztott repó." ++msgstr "Nem Git repó: %s" + - #: lib/choose_repository.tcl:405 ++#: lib/choose_repository.tcl:586 +msgid "Standard only available for local repository." - msgstr "" ++msgstr "A standard csak helyi repókra érhető el." + - #: lib/choose_repository.tcl:409 ++#: lib/choose_repository.tcl:590 +msgid "Shared only available for local repository." - msgstr "" ++msgstr "A megosztott csak helyi repókra érhető el." + - #: lib/choose_repository.tcl:439 ++#: lib/choose_repository.tcl:617 +msgid "Failed to configure origin" - msgstr "" ++msgstr "Nem sikerült beállítani az origint" + - #: lib/choose_repository.tcl:451 ++#: lib/choose_repository.tcl:629 +msgid "Counting objects" - msgstr "" ++msgstr "Objektumok számolása" + - #: lib/choose_repository.tcl:452 ++#: lib/choose_repository.tcl:630 +msgid "buckets" - msgstr "" ++msgstr "vödrök" + - #: lib/choose_repository.tcl:476 ++#: lib/choose_repository.tcl:654 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" - msgstr "" ++msgstr "Nem sikerült másolni az objects/info/alternates-t: %s" + - #: lib/choose_repository.tcl:512 - #, fuzzy, tcl-format ++#: lib/choose_repository.tcl:690 ++#, tcl-format +msgid "Nothing to clone from %s." - msgstr "Új változások letöltése innen: %s" ++msgstr "Semmi másolni való nincs innen: %s" + - #: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728 - #: lib/choose_repository.tcl:740 ++#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 ++#: lib/choose_repository.tcl:918 +msgid "The 'master' branch has not been initialized." - msgstr "" ++msgstr "A 'master' branch nincs inicializálva." + - #: lib/choose_repository.tcl:527 ++#: lib/choose_repository.tcl:705 +msgid "Hardlinks are unavailable. Falling back to copying." - msgstr "" ++msgstr "Nem érhetőek el hardlinkek. Másolás használata." + - #: lib/choose_repository.tcl:539 - #, fuzzy, tcl-format ++#: lib/choose_repository.tcl:717 ++#, tcl-format +msgid "Cloning from %s" - msgstr "A(z) %s letöltése innen: %s" ++msgstr "Másolás innen: %s" + - #: lib/choose_repository.tcl:570 - #, fuzzy ++#: lib/choose_repository.tcl:748 +msgid "Copying objects" - msgstr "Az objektum adatbázis tömörítése" ++msgstr "Objektumok másolása" + - #: lib/choose_repository.tcl:571 ++#: lib/choose_repository.tcl:749 +msgid "KiB" - msgstr "" ++msgstr "KiB" + - #: lib/choose_repository.tcl:595 ++#: lib/choose_repository.tcl:773 +#, tcl-format +msgid "Unable to copy object: %s" - msgstr "" ++msgstr "Nem sikerült másolni az objektumot: %s" + - #: lib/choose_repository.tcl:605 ++#: lib/choose_repository.tcl:783 +msgid "Linking objects" - msgstr "" ++msgstr "Objektumok összefűzése" + - #: lib/choose_repository.tcl:606 ++#: lib/choose_repository.tcl:784 +msgid "objects" - msgstr "" ++msgstr "objektum" + - #: lib/choose_repository.tcl:614 ++#: lib/choose_repository.tcl:792 +#, tcl-format +msgid "Unable to hardlink object: %s" - msgstr "" ++msgstr "Nem sikerült hardlinkelni az objektumot: %s" + - #: lib/choose_repository.tcl:669 ++#: lib/choose_repository.tcl:847 +msgid "Cannot fetch branches and objects. See console output for details." - msgstr "" ++msgstr "Nem sikerült letölteni a branch-eket és az objektumokat. Bővebben a konzolos kimenetben." + - #: lib/choose_repository.tcl:680 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch tags. See console output for details." - msgstr "" ++msgstr "Nem sikerült letölteni a tageket. Bővebben a konzolos kimenetben." + - #: lib/choose_repository.tcl:704 ++#: lib/choose_repository.tcl:882 +msgid "Cannot determine HEAD. See console output for details." - msgstr "" ++msgstr "Nem sikerült megállapítani a HEAD-et. Bővebben a konzolos kimenetben." + - #: lib/choose_repository.tcl:713 ++#: lib/choose_repository.tcl:891 +#, tcl-format +msgid "Unable to cleanup %s" - msgstr "" ++msgstr "Nem sikerült tiszítani: %s." + - #: lib/choose_repository.tcl:719 - #, fuzzy ++#: lib/choose_repository.tcl:897 +msgid "Clone failed." - msgstr "A félbeszakítás nem sikerült." ++msgstr "A másolás nem sikerült." + - #: lib/choose_repository.tcl:726 ++#: lib/choose_repository.tcl:904 +msgid "No default branch obtained." - msgstr "" ++msgstr "Nincs alapértelmezett branch." + - #: lib/choose_repository.tcl:737 ++#: lib/choose_repository.tcl:915 +#, tcl-format +msgid "Cannot resolve %s as a commit." - msgstr "" ++msgstr "Nem sikerült felöldani a(z) %s objektumot commitként." + - #: lib/choose_repository.tcl:749 - #, fuzzy ++#: lib/choose_repository.tcl:927 +msgid "Creating working directory" - msgstr "Nincs munkakönyvtár" ++msgstr "Munkakönyvtár létrehozása" + - #: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80 - #: lib/index.tcl:149 ++#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 ++#: lib/index.tcl:193 +msgid "files" - msgstr "" ++msgstr "fájl" + - #: lib/choose_repository.tcl:779 ++#: lib/choose_repository.tcl:957 +msgid "Initial file checkout failed." - msgstr "" ++msgstr "A kezdeti fájl-kibontás sikertelen." + - #: lib/choose_repository.tcl:795 ++#: lib/choose_repository.tcl:973 +msgid "Open" - msgstr "" ++msgstr "Megnyitás" + - #: lib/choose_repository.tcl:805 - #, fuzzy ++#: lib/choose_repository.tcl:983 +msgid "Repository:" - msgstr "Repó" ++msgstr "Repó:" + - #: lib/choose_repository.tcl:854 - #, fuzzy, tcl-format ++#: lib/choose_repository.tcl:1033 ++#, tcl-format +msgid "Failed to open repository %s:" - msgstr "Nem sikerült teljesen elmenteni a beállításokat:" ++msgstr "Nem sikerült megnyitni a(z) %s repót:" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "Ez a leválasztott checkout" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Revízió kifejezés:" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "Helyi branch" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "Követő branch" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537 +msgid "Tag" +msgstr "Tag" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Érvénytelen revízió: %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "Nincs kiválasztva revízió." + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "A revízió kifejezés üres." + +#: lib/choose_rev.tcl:530 +msgid "Updated" - msgstr "" ++msgstr "Frissítve" + +#: lib/choose_rev.tcl:558 +msgid "URL" - msgstr "" ++msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Nincs semmi javítanivaló.\n" +"\n" +"Az első commit létrehozása előtt nincs semmilyen commit amit javitani " +"lehetne.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Nem lehet javítani merge alatt.\n" +"\n" +"A jelenlegi merge még nem teljesen fejeződött be. Csak akkor javíthat egy " +"előbbi commitot, hogyha megszakítja a jelenlegi merge folyamatot.\n" + +#: lib/commit.tcl:49 +msgid "Error loading commit data for amend:" +msgstr "Hiba a javítandó commit adat betöltése közben:" + +#: lib/commit.tcl:76 +msgid "Unable to obtain your identity:" +msgstr "Nem sikerült megállapítani az azonosítót:" + +#: lib/commit.tcl:81 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "Érvénytelen GIT_COMMITTER_IDENT:" + +#: lib/commit.tcl:133 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Az utolsó keresési állapot nem egyezik meg a repó állapotával.\n" +"\n" +"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy " +"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani " +"lehetne.\n" +"\n" +"Az újrakeresés most automatikusan el fog indulni.\n" + +#: lib/commit.tcl:154 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"Nem commitolhatunk fájlokat merge előtt.\n" +"\n" +"A(z) %s fájlban ütközések vannak. Egyszer azokat ki kell javítani, majd " +"hozzá ki kell választani a fájlt mielőtt commitolni lehetne.\n" + +#: lib/commit.tcl:162 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Ismeretlen fájl típus %s érzékelve.\n" +"\n" +"A(z) %s fájlt nem tudja ez a program commitolni.\n" + +#: lib/commit.tcl:170 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Nincs commitolandó változtatás.\n" +"\n" +"Legalább egy fájl ki kell választani, hogy commitolni lehessen.\n" + +#: lib/commit.tcl:183 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" - "- First line: Describe in one sentance what you did.\n" ++"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Adjunk megy egy commit üzenetet.\n" +"\n" +"Egy jó commit üzenetnek a következő a formátuma:\n" +"\n" +"- Első sor: Egy mondatban leírja, hogy mit csináltunk.\n" +"- Második sor: Üres\n" +"- A többi sor: Leírja, hogy miért jó ez a változtatás.\n" + +#: lib/commit.tcl:257 +msgid "write-tree failed:" +msgstr "a write-tree sikertelen:" + +#: lib/commit.tcl:275 +#, tcl-format +msgid "Commit %s appears to be corrupt" - msgstr "" ++msgstr "A(z) %s commit sérültnek tűnik" + +#: lib/commit.tcl:279 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Nincs commitolandó változtatás.\n" +"\n" +"Egyetlen fájlt se módosított ez a commit és merge commit se volt.\n" +"\n" +"Az újrakeresés most automatikusan el fog indulni.\n" + +#: lib/commit.tcl:286 +msgid "No changes to commit." +msgstr "Nincs commitolandó változtatás." + +#: lib/commit.tcl:303 +#, tcl-format +msgid "warning: Tcl does not support encoding '%s'." - msgstr "" ++msgstr "figyelmeztetés: a Tcl nem támogatja a(z) '%s' kódolást." + +#: lib/commit.tcl:317 +msgid "commit-tree failed:" +msgstr "a commit-tree sikertelen:" + +#: lib/commit.tcl:339 +msgid "update-ref failed:" +msgstr "az update-ref sikertelen:" + +#: lib/commit.tcl:430 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "Létrejött a %s commit: %s" + +#: lib/console.tcl:57 +msgid "Working... please wait..." +msgstr "Munka folyamatban.. Várjunk..." + +#: lib/console.tcl:183 +msgid "Success" +msgstr "Siker" + +#: lib/console.tcl:196 +msgid "Error: Command Failed" +msgstr "Hiba: a parancs sikertelen" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "Elvesztett objektumok száma" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "Elveszett objektumok által elfoglalt lemezterület" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "Csomagolt objektumok számra" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "Csomagok száma" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "A csomagolt objektumok által használt lemezterület" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "Eltávolításra váró csomagolt objektumok számra" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "Hulladék fájlok" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Az objektum adatbázis tömörítése" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Az objektum adatbázis ellenőrzése az fsck-objects használatával" + +#: lib/database.tcl:108 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " +"the database when more than %i loose objects exist.\n" +"\n" +"Compress the database now?" +msgstr "" ++"Ennek a repónak jelenleg %i különálló objektuma van.\n" ++"\n" ++"Az optimális teljesítményhez erősen ajánlott az adatbázis tömörítése, ha " ++"több mint %i objektum létezik.\n" ++"\n" ++"Lehet most tömöríteni az adatbázist?" + +#: lib/date.tcl:25 - #, fuzzy, tcl-format ++#, tcl-format +msgid "Invalid date from Git: %s" - msgstr "Érvénytelen revízió: %s" ++msgstr "Érvénytelen dátum a Git-től: %s" + +#: lib/diff.tcl:42 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Nincsenek változások.\n" +"\n" +"A(z) %s módosítatlan.\n" +"\n" +"A fájl módosítási dátumát frissítette egy másik alkalmazás, de a fájl " +"tartalma változatlan.\n" +"\n" +"Egy újrakeresés fog indulni a hasonló állapotú fájlok megtalálása érdekében." + +#: lib/diff.tcl:81 - #, fuzzy, tcl-format ++#, tcl-format +msgid "Loading diff of %s..." - msgstr "A(z) %s betöltése..." ++msgstr "A(z) %s diff-jének betöltése..." + +#: lib/diff.tcl:114 lib/diff.tcl:184 +#, tcl-format +msgid "Unable to display %s" - msgstr "" ++msgstr "Nem lehet megjeleníteni a következőt: %s" + +#: lib/diff.tcl:115 +msgid "Error loading file:" +msgstr "Hiba a fájl betöltése közben:" + +#: lib/diff.tcl:122 +msgid "Git Repository (subproject)" - msgstr "" ++msgstr "Git repó (alprojekt)" + +#: lib/diff.tcl:134 +msgid "* Binary file (not showing content)." - msgstr "" ++msgstr "* Bináris fájl (tartalom elrejtése)." + +#: lib/diff.tcl:185 +msgid "Error loading diff:" +msgstr "Hiba a diff betöltése közben:" + +#: lib/diff.tcl:302 +msgid "Failed to unstage selected hunk." +msgstr "Nem visszavonni a hunk kiválasztását." + +#: lib/diff.tcl:309 +msgid "Failed to stage selected hunk." +msgstr "Nem sikerült kiválasztani a hunkot." + +#: lib/error.tcl:12 lib/error.tcl:102 +msgid "error" +msgstr "hiba" + +#: lib/error.tcl:28 +msgid "warning" +msgstr "figyelmeztetés" + +#: lib/error.tcl:81 +msgid "You must correct the above errors before committing." +msgstr "Ki kell javítanunk a fenti hibákat commit előtt." + - #: lib/index.tcl:241 - #, fuzzy, tcl-format ++#: lib/index.tcl:6 ++msgid "Unable to unlock the index." ++msgstr "Nem sikerült az index zárolásának feloldása." ++ ++#: lib/index.tcl:15 ++msgid "Index Error" ++msgstr "Index hiba" ++ ++#: lib/index.tcl:21 ++msgid "" ++"Updating the Git index failed. A rescan will be automatically started to " ++"resynchronize git-gui." ++msgstr "" ++"A Git index frissítése sikertelen volt. Egy újraolvasás automatikusan elindult, hogy " ++"a git-gui újra szinkonban legyen." ++ ++#: lib/index.tcl:27 ++msgid "Continue" ++msgstr "Folytatás" ++ ++#: lib/index.tcl:31 ++msgid "Unlock Index" ++msgstr "Index zárolásának feloldása" ++ ++#: lib/index.tcl:282 ++#, tcl-format +msgid "Unstaging %s from commit" - msgstr "Commitba való kiválasztás visszavonása" ++msgstr "A(z) %s commitba való kiválasztásának visszavonása" + - #: lib/index.tcl:285 - #, fuzzy, tcl-format ++#: lib/index.tcl:326 ++#, tcl-format +msgid "Adding %s" - msgstr "A(z) %s olvasása..." ++msgstr "A(z) %s hozzáadása..." + - #: lib/index.tcl:340 ++#: lib/index.tcl:381 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Visszaállítja a változtatásokat a(z) %s fájlban?" + - #: lib/index.tcl:342 ++#: lib/index.tcl:383 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Visszaállítja a változtatásokat ebben e %i fájlban?" + - #: lib/index.tcl:348 ++#: lib/index.tcl:389 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Minden nem kiválasztott változtatás el fog veszni ezáltal a visszaállítás " +"által." + - #: lib/index.tcl:351 ++#: lib/index.tcl:392 +msgid "Do Nothing" +msgstr "Ne csináljunk semmit" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"Javítás közben nem lehetséges a merge.\n" +"\n" +"Egyszer be kell fejezni ennek a commitnak a javítását, majd kezdődhet egy " +"merge.\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"Az utolsó keresési állapot nem egyezik meg a repó állapotával.\n" +"\n" +"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy " +"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani " +"lehetne.\n" +"\n" +"Az újrakeresés most automatikusan el fog indulni.\n" + +#: lib/merge.tcl:44 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"Jelenleg egy ütközés feloldása közben vagyunk.\n" +"\n" +"A(z) %s fájlban ütközések vannak.\n" +"\n" +"Fel kell oldanunk őket, kiválasztani a fájlt, és commitolni hogy befejezzük " +"a jelenlegi merge-t. Csak ezután kezdhetünk el egy újabbat.\n" + +#: lib/merge.tcl:54 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"Jelenleg egy változtatás közben vagyunk.\n" +"\n" +"A(z) %s fájl megváltozott.\n" +"\n" +"Először be kell fejeznünk a jelenlegi commitot, hogy elkezdhessünk egy merge-" +"t. Ez segíteni fog, hogy félbeszakíthassunk egy merge-t.\n" + +#: lib/merge.tcl:106 +#, tcl-format +msgid "%s of %s" +msgstr "%s / %s" + +#: lib/merge.tcl:119 +#, tcl-format +msgid "Merging %s and %s" +msgstr "A(z) %s és a(z) %s merge-ölése" + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "A merge sikeresen befejeződött." + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "A merge sikertelen. Fel kell oldanunk az ütközéseket." + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "Merge-ölés a következőbe: %s" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "Merge-ölni szándékozott revízió" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"A commit javítás közben megszakítva.\n" +"\n" +"Be kell fejeznünk ennek a commitnak a javítását.\n" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"Megszakítjuk a merge-t?\n" +"\n" +"A jelenlegi merge megszakítása *MINDEN* nem commitolt változtatás " +"elvesztését jelenti.\n" +"\n" +"Folytatjuk a jelenlegi merge megszakítását?" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Visszavonjuk a módosításokat?\n" +"\n" +"A módosítások visszavonása *MINDEN* nem commitolt változtatás elvesztését " +"jelenti.\n" +"\n" +"Folytatjuk a jelenlegi módosítások visszavonását?" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "Félbeszakítás" + +#: lib/merge.tcl:266 +msgid "Abort failed." +msgstr "A félbeszakítás nem sikerült." + +#: lib/merge.tcl:268 +msgid "Abort completed. Ready." +msgstr "A megkeszakítás befejeződött. Kész." + +#: lib/option.tcl:82 +msgid "Restore Defaults" +msgstr "Alapértelmezés visszaállítása" + +#: lib/option.tcl:86 +msgid "Save" +msgstr "Mentés" + +#: lib/option.tcl:96 +#, tcl-format +msgid "%s Repository" +msgstr "%s Repó" + +#: lib/option.tcl:97 +msgid "Global (All Repositories)" +msgstr "Globális (minden repó)" + +#: lib/option.tcl:103 +msgid "User Name" +msgstr "Felhasználónév" + +#: lib/option.tcl:104 +msgid "Email Address" +msgstr "Email cím" + +#: lib/option.tcl:106 +msgid "Summarize Merge Commits" +msgstr "A merge commitok összegzése" + +#: lib/option.tcl:107 +msgid "Merge Verbosity" +msgstr "Merge beszédesség" + +#: lib/option.tcl:108 +msgid "Show Diffstat After Merge" +msgstr "Diffstat mutatása merge után" + +#: lib/option.tcl:110 +msgid "Trust File Modification Timestamps" +msgstr "A fájl módosítási dátumok megbízhatóak" + +#: lib/option.tcl:111 +msgid "Prune Tracking Branches During Fetch" +msgstr "A követő branchek eltávolítása letöltés alatt" + +#: lib/option.tcl:112 +msgid "Match Tracking Branches" +msgstr "A követő branchek egyeztetése" + +#: lib/option.tcl:113 +msgid "Number of Diff Context Lines" +msgstr "A diff környezeti sorok száma" + +#: lib/option.tcl:114 +msgid "New Branch Name Template" +msgstr "Új branch név sablon" + +#: lib/option.tcl:176 - #, fuzzy +msgid "Change Font" - msgstr "Fő betűtípus" ++msgstr "Betűtípus megváltoztatása" + +#: lib/option.tcl:180 +#, tcl-format +msgid "Choose %s" - msgstr "" ++msgstr "%s választása" + +#: lib/option.tcl:186 +msgid "pt." - msgstr "" ++msgstr "pt." + +#: lib/option.tcl:200 +msgid "Preferences" - msgstr "" ++msgstr "Beállítások" + +#: lib/option.tcl:235 +msgid "Failed to completely save options:" +msgstr "Nem sikerült teljesen elmenteni a beállításokat:" + - #: lib/remote.tcl:165 - #, fuzzy - msgid "Prune from" - msgstr "Törlés innen: %s..." - - # tcl-format - #: lib/remote.tcl:170 - #, fuzzy - msgid "Fetch from" - msgstr "Letöltés innen: %s..." - - #: lib/remote.tcl:213 - #, fuzzy - msgid "Push to" - msgstr "Push" - +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Remote Branch" +msgstr "Távoli branch törlése" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "Forrás repó" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 +msgid "Remote:" +msgstr "Távoli:" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 +msgid "Arbitrary URL:" +msgstr "Tetszőleges URL:" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "Branchek" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "Törlés csak akkor ha" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "Merge-ölt a következőbe:" + +#: lib/remote_branch_delete.tcl:119 +msgid "Always (Do not perform merge checks)" +msgstr "Mindig (Ne végezzen merge vizsgálatokat)" + +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "Egy branch szükséges a 'Merge-ölt a következőbe'-hez." + +#: lib/remote_branch_delete.tcl:184 - #, fuzzy, tcl-format ++#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" - msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:" ++msgstr "" ++"A következő branchek nem teljesen lettek merge-ölve ebbe: %s:" ++"\n" ++" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"Egy vagy több merge teszt hibát jelzett, mivel nem töltöttük le a megfelelő " +"commitokat. Próbáljunk meg letölteni a következőből: %s először." + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "Válasszunk ki egy vagy több branchet törlésre." + +#: lib/remote_branch_delete.tcl:216 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "" +"A törölt branchek visszaállítása nehéz.\n" +"\n" +"Töröljük a kiválasztott brancheket?" + +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Brancek törlése innen: %s" + +#: lib/remote_branch_delete.tcl:286 +msgid "No repository selected." +msgstr "Nincs kiválasztott repó." + +#: lib/remote_branch_delete.tcl:291 +#, tcl-format +msgid "Scanning %s..." +msgstr "Keresés itt: %s..." + - #: lib/shortcut.tcl:26 lib/shortcut.tcl:74 - msgid "Cannot write script:" - msgstr "Nem sikerült írni a scriptet:" ++#: lib/remote.tcl:165 ++msgid "Prune from" ++msgstr "Törlés innen" + - #: lib/shortcut.tcl:149 ++# tcl-format ++#: lib/remote.tcl:170 ++msgid "Fetch from" ++msgstr "Letöltés innen" ++ ++#: lib/remote.tcl:213 ++msgid "Push to" ++msgstr "Push ide" ++ ++#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++msgid "Cannot write shortcut:" ++msgstr "Nem sikerült írni a gyorsbillentyűt:" ++ ++#: lib/shortcut.tcl:136 +msgid "Cannot write icon:" +msgstr "Nem sikerült írni az ikont:" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s ... %*i / %*i %s (%3i%%)" + +#: lib/transport.tcl:6 - #, fuzzy, tcl-format ++#, tcl-format +msgid "fetch %s" - msgstr "Letöltés" ++msgstr "a(z) %s letöltése" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Új változások letöltése innen: %s" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" - msgstr "" ++msgstr "a(z) %s távoli törlése" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "A %s repóból törölt követő branchek törlése" + +#: lib/transport.tcl:25 lib/transport.tcl:71 +#, tcl-format +msgid "push %s" - msgstr "" ++msgstr "%s push-olása" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Változások pusholása ide: %s" + +#: lib/transport.tcl:72 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "Pusholás: %s %s, ide: %s" + +#: lib/transport.tcl:89 +msgid "Push Branches" +msgstr "Branchek pusholása" + +#: lib/transport.tcl:103 +msgid "Source Branches" +msgstr "Forrás branchek" + +#: lib/transport.tcl:120 +msgid "Destination Repository" +msgstr "Cél repó" + +#: lib/transport.tcl:158 +msgid "Transfer Options" +msgstr "Átviteli opciók" + +#: lib/transport.tcl:160 +msgid "Force overwrite existing branch (may discard changes)" - msgstr "" ++msgstr "Létező branch felülírásának erőltetése (lehet, hogy el fog dobni változtatásokat)" + +#: lib/transport.tcl:164 +msgid "Use thin pack (for slow network connections)" +msgstr "Vékony csomagok használata (lassú hálózati kapcsolatok számára)" + +#: lib/transport.tcl:168 +msgid "Include tags" +msgstr "Tageket is" + +#~ msgid "Cannot find the git directory:" +#~ msgstr "Nem található a git könyvtár:" + +#~ msgid "Unstaged Changes (Will Not Be Committed)" +#~ msgstr "Nem kiválasztott változtatások (nem lesz commitolva)" + +#~ msgid "Push to %s..." +#~ msgstr "Pusholás ide: %s..." + +#~ msgid "Add To Commit" +#~ msgstr "Hozzáadás a commithoz" + +#~ msgid "Add Existing To Commit" +#~ msgstr "Hozzáadás létező commithoz" + +#~ msgid "Running miga..." +#~ msgstr "A miga futtatása..." + +#~ msgid "Add Existing" +#~ msgstr "Létező hozzáadása" + +#~ msgid "" +#~ "Abort commit?\n" +#~ "\n" +#~ "Aborting the current commit will cause *ALL* uncommitted changes to be " +#~ "lost.\n" +#~ "\n" +#~ "Continue with aborting the current commit?" +#~ msgstr "" +#~ "Megszakítjuk a commitot?\n" +#~ "\n" +#~ "A jelenlegi commit megszakítása *MINDEN* nem commitolt változtatás " +#~ "elvesztését jelenti.\n" +#~ "\n" +#~ "Folytatjuk a jelenlegi commit megszakítását?" + +#~ msgid "Aborting... please wait..." +#~ msgstr "Megszakítás... várjunk..." diff --cc git-gui/po/it.po index 766841410,000000000..33a839917 mode 100644,000000..100644 --- a/git-gui/po/it.po +++ b/git-gui/po/it.po @@@ -1,1872 -1,0 +1,1913 @@@ +# Translation of git-gui to Italian +# Copyright (C) 2007 Shawn Pearce +# This file is distributed under the same license as the git-gui package. +# Paolo Ciarrocchi , 2007 +# Michele Ballabio , 2007. +# +# +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-10-10 14:42+0200\n" - "PO-Revision-Date: 2007-10-10 15:27+0200\n" - "Last-Translator: Paolo Ciarrocchi \n" ++"POT-Creation-Date: 2007-11-09 11:18+0100\n" ++"PO-Revision-Date: 2007-11-01 21:05+0100\n" ++"Last-Translator: Michele Ballabio \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + - #: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 - #: git-gui.sh:763 ++#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 ++#: git-gui.sh:733 +msgid "git-gui: fatal error" +msgstr "git-gui: errore grave" + - #: git-gui.sh:595 ++#: git-gui.sh:565 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "Caratteri non validi specificati in %s:" + - #: git-gui.sh:620 ++#: git-gui.sh:590 +msgid "Main Font" +msgstr "Caratteri principali" + - #: git-gui.sh:621 ++#: git-gui.sh:591 +msgid "Diff/Console Font" +msgstr "Caratteri per confronti e terminale" + - #: git-gui.sh:635 ++#: git-gui.sh:605 +msgid "Cannot find git in PATH." +msgstr "Impossibile trovare git nel PATH" + - #: git-gui.sh:662 ++#: git-gui.sh:632 +msgid "Cannot parse Git version string:" +msgstr "Impossibile determinare la versione di Git:" + - #: git-gui.sh:680 ++#: git-gui.sh:650 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" - "La versione di GIT non può essere determinata.\n" ++"La versione di Git non può essere determinata.\n" +"\n" +"%s riporta che la versione è '%s'.\n" +"\n" +"%s richiede almeno Git 1.5.0 o superiore.\n" +"\n" +"Assumere che '%s' sia alla versione 1.5.0?\n" + - #: git-gui.sh:853 ++#: git-gui.sh:888 +msgid "Git directory not found:" +msgstr "Non trovo la directory di git: " + - #: git-gui.sh:860 ++#: git-gui.sh:895 +msgid "Cannot move to top of working directory:" +msgstr "Impossibile spostarsi sulla directory principale del progetto:" + - #: git-gui.sh:867 ++#: git-gui.sh:902 +msgid "Cannot use funny .git directory:" +msgstr "Impossibile usare una .git directory strana:" + - #: git-gui.sh:872 ++#: git-gui.sh:907 +msgid "No working directory" +msgstr "Nessuna directory di lavoro" + - #: git-gui.sh:1019 ++#: git-gui.sh:1054 +msgid "Refreshing file status..." +msgstr "Controllo dello stato dei file in corso..." + - #: git-gui.sh:1084 ++#: git-gui.sh:1119 +msgid "Scanning for modified files ..." +msgstr "Ricerca di file modificati in corso..." + - #: git-gui.sh:1259 lib/browser.tcl:245 ++#: git-gui.sh:1294 lib/browser.tcl:245 +msgid "Ready." +msgstr "Pronto." + - #: git-gui.sh:1525 ++#: git-gui.sh:1560 +msgid "Unmodified" +msgstr "Non modificato" + - #: git-gui.sh:1527 ++#: git-gui.sh:1562 +msgid "Modified, not staged" +msgstr "Modificato, non preparato per una nuova revisione" + - #: git-gui.sh:1528 git-gui.sh:1533 ++#: git-gui.sh:1563 git-gui.sh:1568 +msgid "Staged for commit" +msgstr "Preparato per una nuova revisione" + - #: git-gui.sh:1529 git-gui.sh:1534 ++#: git-gui.sh:1564 git-gui.sh:1569 +msgid "Portions staged for commit" +msgstr "Parti preparate per una nuova revisione" + - #: git-gui.sh:1530 git-gui.sh:1535 ++#: git-gui.sh:1565 git-gui.sh:1570 +msgid "Staged for commit, missing" +msgstr "Preparato per una nuova revisione, mancante" + - #: git-gui.sh:1532 ++#: git-gui.sh:1567 +msgid "Untracked, not staged" +msgstr "Non tracciato, non preparato per una nuova revisione" + - #: git-gui.sh:1537 ++#: git-gui.sh:1572 +msgid "Missing" +msgstr "Mancante" + - #: git-gui.sh:1538 ++#: git-gui.sh:1573 +msgid "Staged for removal" +msgstr "Preparato per la rimozione" + - #: git-gui.sh:1539 ++#: git-gui.sh:1574 +msgid "Staged for removal, still present" +msgstr "Preparato alla rimozione, ancora presente" + - #: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544 ++#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 +msgid "Requires merge resolution" +msgstr "Richiede risoluzione dei conflitti" + - #: git-gui.sh:1579 ++#: git-gui.sh:1614 +msgid "Starting gitk... please wait..." +msgstr "Avvio di gitk... attendere..." + - #: git-gui.sh:1588 ++#: git-gui.sh:1623 +#, tcl-format +msgid "" +"Unable to start gitk:\n" +"\n" +"%s does not exist" +msgstr "" +"Impossibile avviare gitk:\n" +"\n" +"%s non esiste" + - #: git-gui.sh:1788 lib/choose_repository.tcl:32 ++#: git-gui.sh:1823 lib/choose_repository.tcl:35 +msgid "Repository" +msgstr "Archivio" + - #: git-gui.sh:1789 ++#: git-gui.sh:1824 +msgid "Edit" +msgstr "Modifica" + - #: git-gui.sh:1791 lib/choose_rev.tcl:560 ++#: git-gui.sh:1826 lib/choose_rev.tcl:560 +msgid "Branch" +msgstr "Ramo" + - #: git-gui.sh:1794 lib/choose_rev.tcl:547 ++#: git-gui.sh:1829 lib/choose_rev.tcl:547 +msgid "Commit@@noun" +msgstr "Revisione" + - #: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "Fusione (Merge)" + - #: git-gui.sh:1798 lib/choose_rev.tcl:556 ++#: git-gui.sh:1833 lib/choose_rev.tcl:556 +msgid "Remote" +msgstr "Remoto" + - #: git-gui.sh:1807 ++#: git-gui.sh:1842 +msgid "Browse Current Branch's Files" - msgstr "Esplora i file del ramo corrente" ++msgstr "Esplora i file del ramo attuale" + - #: git-gui.sh:1811 ++#: git-gui.sh:1846 +msgid "Browse Branch Files..." +msgstr "Esplora i file del ramo..." + - #: git-gui.sh:1816 ++#: git-gui.sh:1851 +msgid "Visualize Current Branch's History" - msgstr "Visualizza la cronologia del ramo corrente" ++msgstr "Visualizza la cronologia del ramo attuale" + - #: git-gui.sh:1820 ++#: git-gui.sh:1855 +msgid "Visualize All Branch History" +msgstr "Visualizza la cronologia di tutti i rami" + - #: git-gui.sh:1827 ++#: git-gui.sh:1862 +#, tcl-format +msgid "Browse %s's Files" +msgstr "Esplora i file di %s" + - #: git-gui.sh:1829 ++#: git-gui.sh:1864 +#, tcl-format +msgid "Visualize %s's History" +msgstr "Visualizza la cronologia di %s" + - #: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "Statistiche dell'archivio" + - #: git-gui.sh:1837 lib/database.tcl:34 ++#: git-gui.sh:1872 lib/database.tcl:34 +msgid "Compress Database" +msgstr "Comprimi l'archivio" + - #: git-gui.sh:1840 ++#: git-gui.sh:1875 +msgid "Verify Database" +msgstr "Verifica l'archivio" + - #: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9 - #: lib/shortcut.tcl:45 lib/shortcut.tcl:84 ++#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 ++#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 +msgid "Create Desktop Icon" +msgstr "Crea icona desktop" + - #: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95 ++#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 +msgid "Quit" +msgstr "Esci" + - #: git-gui.sh:1867 ++#: git-gui.sh:1902 +msgid "Undo" +msgstr "Annulla" + - #: git-gui.sh:1870 ++#: git-gui.sh:1905 +msgid "Redo" +msgstr "Ripeti" + - #: git-gui.sh:1874 git-gui.sh:2366 ++#: git-gui.sh:1909 git-gui.sh:2403 +msgid "Cut" +msgstr "Taglia" + - #: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512 ++#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 +#: lib/console.tcl:67 +msgid "Copy" +msgstr "Copia" + - #: git-gui.sh:1880 git-gui.sh:2372 ++#: git-gui.sh:1915 git-gui.sh:2409 +msgid "Paste" +msgstr "Incolla" + - #: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26 ++#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "Elimina" + - #: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69 ++#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 +msgid "Select All" +msgstr "Seleziona tutto" + - #: git-gui.sh:1896 ++#: git-gui.sh:1931 +msgid "Create..." +msgstr "Crea..." + - #: git-gui.sh:1902 ++#: git-gui.sh:1937 +msgid "Checkout..." +msgstr "Attiva..." + - #: git-gui.sh:1908 ++#: git-gui.sh:1943 +msgid "Rename..." +msgstr "Rinomina" + - #: git-gui.sh:1913 git-gui.sh:2012 ++#: git-gui.sh:1948 git-gui.sh:2048 +msgid "Delete..." +msgstr "Elimina..." + - #: git-gui.sh:1918 ++#: git-gui.sh:1953 +msgid "Reset..." +msgstr "Ripristina..." + - #: git-gui.sh:1930 git-gui.sh:2313 ++#: git-gui.sh:1965 git-gui.sh:2350 +msgid "New Commit" +msgstr "Nuova revisione" + - #: git-gui.sh:1938 git-gui.sh:2320 ++#: git-gui.sh:1973 git-gui.sh:2357 +msgid "Amend Last Commit" +msgstr "Correggi l'ultima revisione" + - #: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "Analizza nuovamente" + - #: git-gui.sh:1953 ++#: git-gui.sh:1988 +msgid "Stage To Commit" +msgstr "Prepara per una nuova revisione" + - #: git-gui.sh:1958 ++#: git-gui.sh:1994 +msgid "Stage Changed Files To Commit" +msgstr "Prepara i file modificati per una nuova revisione" + - #: git-gui.sh:1964 ++#: git-gui.sh:2000 +msgid "Unstage From Commit" +msgstr "Annulla preparazione" + - #: git-gui.sh:1969 lib/index.tcl:352 ++#: git-gui.sh:2005 lib/index.tcl:393 +msgid "Revert Changes" +msgstr "Annulla modifiche" + - #: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390 ++#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 +msgid "Sign Off" +msgstr "Sign Off" + - #: git-gui.sh:1980 git-gui.sh:2296 ++#: git-gui.sh:2016 git-gui.sh:2333 +msgid "Commit@@verb" +msgstr "Nuova revisione" + - #: git-gui.sh:1991 ++#: git-gui.sh:2027 +msgid "Local Merge..." +msgstr "Fusione locale..." + - #: git-gui.sh:1996 ++#: git-gui.sh:2032 +msgid "Abort Merge..." +msgstr "Interrompi fusione..." + - #: git-gui.sh:2008 ++#: git-gui.sh:2044 +msgid "Push..." +msgstr "Propaga..." + - #: git-gui.sh:2019 lib/choose_repository.tcl:41 ++#: git-gui.sh:2055 lib/choose_repository.tcl:40 +msgid "Apple" +msgstr "Apple" + - #: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 ++#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 ++#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 +#, tcl-format +msgid "About %s" +msgstr "Informazioni su %s" + - #: git-gui.sh:2026 ++#: git-gui.sh:2062 +msgid "Preferences..." +msgstr "Preferenze..." + - #: git-gui.sh:2034 git-gui.sh:2558 ++#: git-gui.sh:2070 git-gui.sh:2595 +msgid "Options..." +msgstr "Opzioni..." + - #: git-gui.sh:2040 lib/choose_repository.tcl:47 ++#: git-gui.sh:2076 lib/choose_repository.tcl:46 +msgid "Help" +msgstr "Aiuto" + - #: git-gui.sh:2081 ++#: git-gui.sh:2117 +msgid "Online Documentation" +msgstr "Documentazione sul web" + - #: git-gui.sh:2165 ++#: git-gui.sh:2201 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" +msgstr "" +"errore grave: impossibile effettuare lo stat del path %s: file o directory " +"non trovata" + - #: git-gui.sh:2198 ++#: git-gui.sh:2234 +msgid "Current Branch:" +msgstr "Ramo attuale:" + - #: git-gui.sh:2219 ++#: git-gui.sh:2255 +msgid "Staged Changes (Will Commit)" +msgstr "Modifiche preparate (saranno nella nuova revisione)" + - #: git-gui.sh:2239 ++#: git-gui.sh:2274 +msgid "Unstaged Changes" +msgstr "Modifiche non preparate" + - #: git-gui.sh:2286 ++#: git-gui.sh:2323 +msgid "Stage Changed" +msgstr "Prepara modificati" + - #: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182 ++#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 +msgid "Push" +msgstr "Propaga (Push)" + - #: git-gui.sh:2332 ++#: git-gui.sh:2369 +msgid "Initial Commit Message:" +msgstr "Messaggio di revisione iniziale:" + - #: git-gui.sh:2333 ++#: git-gui.sh:2370 +msgid "Amended Commit Message:" +msgstr "Messaggio di revisione corretto:" + - #: git-gui.sh:2334 ++#: git-gui.sh:2371 +msgid "Amended Initial Commit Message:" +msgstr "Messaggio iniziale di revisione corretto:" + - #: git-gui.sh:2335 ++#: git-gui.sh:2372 +msgid "Amended Merge Commit Message:" +msgstr "Messaggio di fusione corretto:" + - #: git-gui.sh:2336 ++#: git-gui.sh:2373 +msgid "Merge Commit Message:" +msgstr "Messaggio di fusione:" + - #: git-gui.sh:2337 ++#: git-gui.sh:2374 +msgid "Commit Message:" +msgstr "Messaggio di revisione:" + - #: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71 ++#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 +msgid "Copy All" +msgstr "Copia tutto" + - #: git-gui.sh:2406 lib/blame.tcl:104 ++#: git-gui.sh:2443 lib/blame.tcl:104 +msgid "File:" +msgstr "File:" + - #: git-gui.sh:2508 ++#: git-gui.sh:2545 +msgid "Refresh" +msgstr "Rinfresca" + - #: git-gui.sh:2529 ++#: git-gui.sh:2566 +msgid "Apply/Reverse Hunk" +msgstr "Applica/Inverti sezione" + - #: git-gui.sh:2535 ++#: git-gui.sh:2572 +msgid "Decrease Font Size" +msgstr "Diminuisci dimensione caratteri" + - #: git-gui.sh:2539 ++#: git-gui.sh:2576 +msgid "Increase Font Size" +msgstr "Aumenta dimensione caratteri" + - #: git-gui.sh:2544 ++#: git-gui.sh:2581 +msgid "Show Less Context" +msgstr "Mostra meno contesto" + - #: git-gui.sh:2551 ++#: git-gui.sh:2588 +msgid "Show More Context" +msgstr "Mostra più contesto" + - #: git-gui.sh:2565 ++#: git-gui.sh:2602 +msgid "Unstage Hunk From Commit" +msgstr "Sezione non preparata per una nuova revisione" + - #: git-gui.sh:2567 ++#: git-gui.sh:2604 +msgid "Stage Hunk For Commit" +msgstr "Prepara sezione per una nuova revisione" + - #: git-gui.sh:2586 ++#: git-gui.sh:2623 +msgid "Initializing..." +msgstr "Inizializzazione..." + - #: git-gui.sh:2677 ++#: git-gui.sh:2718 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"Possibili problemi con le variabili d'ambiente.\n" +"\n" +"Le seguenti variabili d'ambiente saranno probabilmente\n" +"ignorate da tutti i sottoprocessi di Git avviati\n" +"da %s:\n" +"\n" + - #: git-gui.sh:2707 ++#: git-gui.sh:2748 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"Ciò è dovuto a un problema conosciuto\n" +"causato dall'eseguibile Tcl distribuito da Cygwin." + - #: git-gui.sh:2712 ++#: git-gui.sh:2753 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"Una buona alternativa a %s\n" +"consiste nell'assegnare valori alle variabili di configurazione\n" +"user.name e user.email nel tuo file ~/.gitconfig personale.\n" + +#: lib/about.tcl:25 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - un'interfaccia grafica per Git." + +#: lib/blame.tcl:77 +msgid "File Viewer" +msgstr "Mostra file" + +#: lib/blame.tcl:81 +msgid "Commit:" +msgstr "Revisione:" + +#: lib/blame.tcl:249 +msgid "Copy Commit" +msgstr "Copia revisione" + +#: lib/blame.tcl:369 +#, tcl-format +msgid "Reading %s..." +msgstr "Lettura di %s..." + +#: lib/blame.tcl:473 +msgid "Loading copy/move tracking annotations..." +msgstr "Caricamento annotazioni per copie/spostamenti..." + +#: lib/blame.tcl:493 +msgid "lines annotated" +msgstr "linee annotate" + +#: lib/blame.tcl:674 +msgid "Loading original location annotations..." +msgstr "Caricamento annotazioni per posizione originaria..." + +#: lib/blame.tcl:677 +msgid "Annotation complete." +msgstr "Annotazione completata." + +#: lib/blame.tcl:731 +msgid "Loading annotation..." +msgstr "Caricamento annotazioni..." + +#: lib/blame.tcl:787 +msgid "Author:" +msgstr "Autore:" + +#: lib/blame.tcl:791 +msgid "Committer:" +msgstr "Revisione creata da:" + +#: lib/blame.tcl:796 +msgid "Original File:" +msgstr "File originario:" + +#: lib/blame.tcl:910 +msgid "Originally By:" +msgstr "In origine da:" + +#: lib/blame.tcl:916 +msgid "In File:" +msgstr "Nel file:" + +#: lib/blame.tcl:921 +msgid "Copied Or Moved Here By:" +msgstr "Copiato o spostato qui da:" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "Attiva ramo" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Attiva" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 +msgid "Cancel" +msgstr "Annulla" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:286 +msgid "Revision" +msgstr "Revisione" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202 +msgid "Options" +msgstr "Opzioni" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Recupera duplicato locale di ramo remoto" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Stacca da ramo locale" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Crea ramo" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "Crea nuovo ramo" + - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:199 ++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 +msgid "Create" +msgstr "Crea" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Nome del ramo" + +#: lib/branch_create.tcl:43 +msgid "Name:" +msgstr "Nome:" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Appaia nome del duplicato locale di ramo remoto" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Revisione iniziale" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Aggiorna ramo esistente:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "No" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Solo fast forward" + +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 +msgid "Reset" +msgstr "Ripristina" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Attiva dopo la creazione" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Scegliere un duplicato locale di ramo remoto" + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "" +"Il duplicato locale del ramo remoto %s non è un ramo nell'archivio remoto." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Inserire un nome per il ramo." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "'%s' non è utilizzabile come nome di ramo." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Elimina ramo" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Elimina ramo locale" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Rami locali" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Cancella solo se fuso con un altro ramo" + +#: lib/branch_delete.tcl:54 +msgid "Always (Do not perform merge test.)" +msgstr "Sempre (Non effettuare verifiche di fusione)." + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "I rami seguenti non sono stati fusi completamente in %s:" + +#: lib/branch_delete.tcl:115 +msgid "" +"Recovering deleted branches is difficult. \n" +"\n" +" Delete the selected branches?" +msgstr "" +"Ricomporre rami cancellati può essere complicato. \n" +"\n" +" Eliminare i rami selezionati?" + +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" - "Cancellazione rami fallita:\n" ++"Impossibile cancellare i rami:\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Rinomina ramo" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Rinomina" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Ramo:" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Nuovo Nome:" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "Scegliere un ramo da rinominare." + +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "Il ramo '%s' esiste già." + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Impossibile rinominare '%s'." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Avvio in corso..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "File browser" + +#: lib/browser.tcl:125 lib/browser.tcl:142 +#, tcl-format +msgid "Loading %s..." +msgstr "Caricamento %s..." + +#: lib/browser.tcl:186 +msgid "[Up To Parent]" +msgstr "[Directory superiore]" + +#: lib/browser.tcl:266 lib/browser.tcl:272 +msgid "Browse Branch Files" +msgstr "Esplora i file del ramo" + - #: lib/browser.tcl:277 lib/choose_repository.tcl:215 - #: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315 - #: lib/choose_repository.tcl:811 ++#: lib/browser.tcl:277 lib/choose_repository.tcl:391 ++#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 ++#: lib/choose_repository.tcl:989 +msgid "Browse" +msgstr "Sfoglia" + +#: lib/checkout_op.tcl:79 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "Recupero %s da %s" + +#: lib/checkout_op.tcl:127 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "errore grave: impossibile risolvere %s" + +#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31 +msgid "Close" +msgstr "Chiudi" + +#: lib/checkout_op.tcl:169 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "Il ramo '%s' non esiste." + +#: lib/checkout_op.tcl:206 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"Il ramo '%s' esiste già.\n" +"\n" +"Non può effettuare un 'fast-forward' a %s.\n" +"E' necessaria una fusione." + +#: lib/checkout_op.tcl:220 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "La strategia di fusione '%s' non è supportata." + +#: lib/checkout_op.tcl:239 +#, tcl-format +msgid "Failed to update '%s'." - msgstr "Aggiornamento di '%s' fallito." ++msgstr "Impossibile aggiornare '%s'." + +#: lib/checkout_op.tcl:251 +msgid "Staging area (index) is already locked." - msgstr "L'area di preparazione per una nuova revisione (indice) è già bloccata." ++msgstr "" ++"L'area di preparazione per una nuova revisione (indice) è già bloccata." + +#: lib/checkout_op.tcl:266 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n" +"\n" +"Un altro programma Git ha modificato questo archivio dall'ultima analisi. " +"Bisogna effettuare una nuova analisi prima di poter cambiare il ramo " - "corrente.\n" ++"attuale.\n" +"\n" +"La nuova analisi comincerà ora.\n" + +#: lib/checkout_op.tcl:322 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "Aggiornamento della directory di lavoro a '%s' in corso..." + +#: lib/checkout_op.tcl:353 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "Attivazione di '%s' fallita (richiesta una fusione a livello file)." + +#: lib/checkout_op.tcl:354 +msgid "File level merge required." +msgstr "E' richiesta una fusione a livello file." + +#: lib/checkout_op.tcl:358 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "Si rimarrà sul ramo '%s'." + +#: lib/checkout_op.tcl:429 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"Non si è più su un ramo locale\n" +"\n" +"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questa " +"revisione attiva staccata'." + +#: lib/checkout_op.tcl:446 +#, tcl-format +msgid "Checked out '%s'." +msgstr "Attivazione di '%s' completata." + +#: lib/checkout_op.tcl:478 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "" +"Ripristinare '%s' a '%s' comporterà la perdita delle seguenti revisioni:" + +#: lib/checkout_op.tcl:500 +msgid "Recovering lost commits may not be easy." +msgstr "Ricomporre le revisioni perdute potrebbe non essere semplice." + +#: lib/checkout_op.tcl:505 +#, tcl-format +msgid "Reset '%s'?" +msgstr "Ripristinare '%s'?" + +#: lib/checkout_op.tcl:510 lib/merge.tcl:164 +msgid "Visualize" +msgstr "Visualizza" + +#: lib/checkout_op.tcl:578 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" - "Preparazione ramo corrente fallita.\n" ++"Impossibile preparare il ramo attuale.\n" +"\n" +"Questa directory di lavoro è stata convertita solo parzialmente. I file sono " +"stati aggiornati correttamente, ma l'aggiornamento di un file di Git ha " +"prodotto degli errori.\n" +"\n" +"Questo non sarebbe dovuto succedere. %s ora terminerà senza altre azioni." + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "Seleziona" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "Famiglia di caratteri" + +#: lib/choose_font.tcl:73 +msgid "Font Size" +msgstr "Dimensione caratteri" + +#: lib/choose_font.tcl:90 +msgid "Font Example" +msgstr "Esempio caratteri" + +#: lib/choose_font.tcl:101 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"Questo è un testo d'esempio.\n" +"Se ti piace questo testo, può essere il carattere giusto." + - #: lib/choose_repository.tcl:25 ++#: lib/choose_repository.tcl:27 +msgid "Git Gui" +msgstr "Git Gui" + - #: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204 ++#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380 +msgid "Create New Repository" +msgstr "Crea nuovo archivio" + - #: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291 ++#: lib/choose_repository.tcl:86 ++msgid "New..." ++msgstr "Nuovo..." ++ ++#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 +msgid "Clone Existing Repository" +msgstr "Clona archivio esistente" + - #: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800 ++#: lib/choose_repository.tcl:99 ++msgid "Clone..." ++msgstr "Clona..." ++ ++#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 +msgid "Open Existing Repository" +msgstr "Apri archivio esistente" + - #: lib/choose_repository.tcl:91 - msgid "Next >" - msgstr "Successivo >" ++#: lib/choose_repository.tcl:112 ++msgid "Open..." ++msgstr "Apri..." ++ ++#: lib/choose_repository.tcl:125 ++msgid "Recent Repositories" ++msgstr "Archivi recenti" ++ ++#: lib/choose_repository.tcl:131 ++msgid "Open Recent Repository:" ++msgstr "Apri archivio recente:" + - #: lib/choose_repository.tcl:152 ++#: lib/choose_repository.tcl:294 +#, tcl-format +msgid "Location %s already exists." +msgstr "La posizione %s esiste già." + - #: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165 - #: lib/choose_repository.tcl:172 ++#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307 ++#: lib/choose_repository.tcl:314 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "Impossibile creare l'archivio %s:" + - #: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309 ++#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486 +msgid "Directory:" +msgstr "Directory:" + - #: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363 - #: lib/choose_repository.tcl:834 ++#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544 ++#: lib/choose_repository.tcl:1013 +msgid "Git Repository" +msgstr "Archivio Git" + - #: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260 ++#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437 +#, tcl-format +msgid "Directory %s already exists." +msgstr "La directory %s esiste già." + - #: lib/choose_repository.tcl:265 ++#: lib/choose_repository.tcl:442 +#, tcl-format +msgid "File %s already exists." +msgstr "Il file %s esiste già." + - #: lib/choose_repository.tcl:286 ++#: lib/choose_repository.tcl:463 +msgid "Clone" +msgstr "Clona" + - #: lib/choose_repository.tcl:299 ++#: lib/choose_repository.tcl:476 +msgid "URL:" +msgstr "URL:" + - #: lib/choose_repository.tcl:319 ++#: lib/choose_repository.tcl:496 +msgid "Clone Type:" +msgstr "Tipo di clone:" + - #: lib/choose_repository.tcl:325 ++#: lib/choose_repository.tcl:502 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "Standard (veloce, semi-ridondante, con hardlink)" + - #: lib/choose_repository.tcl:331 ++#: lib/choose_repository.tcl:508 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "Copia completa (più lento, backup ridondante)" + - #: lib/choose_repository.tcl:337 ++#: lib/choose_repository.tcl:514 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "Shared (il più veloce, non raccomandato, nessun backup)" + - #: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418 - #: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630 - #: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848 ++#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 ++#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808 ++#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "%s non è un archivio Git." + - #: lib/choose_repository.tcl:405 ++#: lib/choose_repository.tcl:586 +msgid "Standard only available for local repository." +msgstr "Standard è disponibile solo per archivi locali." + - #: lib/choose_repository.tcl:409 ++#: lib/choose_repository.tcl:590 +msgid "Shared only available for local repository." +msgstr "Shared è disponibile solo per archivi locali." + - #: lib/choose_repository.tcl:439 ++#: lib/choose_repository.tcl:617 +msgid "Failed to configure origin" +msgstr "Impossibile configurare origin" + - #: lib/choose_repository.tcl:451 ++#: lib/choose_repository.tcl:629 +msgid "Counting objects" +msgstr "Calcolo oggetti" + - #: lib/choose_repository.tcl:452 ++#: lib/choose_repository.tcl:630 +msgid "buckets" +msgstr "" + - #: lib/choose_repository.tcl:476 ++#: lib/choose_repository.tcl:654 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "Impossibile copiare oggetti/info/alternate: %s" + - #: lib/choose_repository.tcl:512 ++#: lib/choose_repository.tcl:690 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "Niente da clonare da %s." + - #: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728 - #: lib/choose_repository.tcl:740 ++#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 ++#: lib/choose_repository.tcl:918 +msgid "The 'master' branch has not been initialized." +msgstr "Il ramo 'master' non è stato inizializzato." + - #: lib/choose_repository.tcl:527 ++#: lib/choose_repository.tcl:705 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "Impossibile utilizzare gli hardlink. Si ricorrerà alla copia." + - #: lib/choose_repository.tcl:539 ++#: lib/choose_repository.tcl:717 +#, tcl-format +msgid "Cloning from %s" +msgstr "Clonazione da %s" + - #: lib/choose_repository.tcl:570 ++#: lib/choose_repository.tcl:748 +msgid "Copying objects" +msgstr "Copia degli oggetti" + - #: lib/choose_repository.tcl:571 ++#: lib/choose_repository.tcl:749 +msgid "KiB" +msgstr "KiB" + - #: lib/choose_repository.tcl:595 ++#: lib/choose_repository.tcl:773 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "Impossibile copiare oggetto: %s" + - #: lib/choose_repository.tcl:605 ++#: lib/choose_repository.tcl:783 +msgid "Linking objects" +msgstr "Collegamento oggetti" + - #: lib/choose_repository.tcl:606 ++#: lib/choose_repository.tcl:784 +msgid "objects" +msgstr "oggetti" + - #: lib/choose_repository.tcl:614 ++#: lib/choose_repository.tcl:792 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "Hardlink impossibile sull'oggetto: %s" + - #: lib/choose_repository.tcl:669 ++#: lib/choose_repository.tcl:847 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "" +"Impossibile recuperare rami e oggetti. Controllare i dettagli forniti dalla " +"console." + - #: lib/choose_repository.tcl:680 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch tags. See console output for details." +msgstr "" +"Impossibile recuperare le etichette. Controllare i dettagli forniti dalla " +"console." + - #: lib/choose_repository.tcl:704 ++#: lib/choose_repository.tcl:882 +msgid "Cannot determine HEAD. See console output for details." +msgstr "" +"Impossibile determinare HEAD. Controllare i dettagli forniti dalla console." + - #: lib/choose_repository.tcl:713 ++#: lib/choose_repository.tcl:891 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "Impossibile ripulire %s" + - #: lib/choose_repository.tcl:719 ++#: lib/choose_repository.tcl:897 +msgid "Clone failed." - msgstr "Clonazione fallita." ++msgstr "Clonazione non riuscita." + - #: lib/choose_repository.tcl:726 ++#: lib/choose_repository.tcl:904 +msgid "No default branch obtained." +msgstr "Non è stato trovato un ramo predefinito." + - #: lib/choose_repository.tcl:737 ++#: lib/choose_repository.tcl:915 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "Impossibile risolvere %s come una revisione." + - #: lib/choose_repository.tcl:749 ++#: lib/choose_repository.tcl:927 +msgid "Creating working directory" +msgstr "Creazione directory di lavoro" + - #: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80 - #: lib/index.tcl:149 ++#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 ++#: lib/index.tcl:193 +msgid "files" +msgstr "file" + - #: lib/choose_repository.tcl:779 ++#: lib/choose_repository.tcl:957 +msgid "Initial file checkout failed." - msgstr "Attivazione iniziale impossibile." ++msgstr "Attivazione iniziale non riuscita." + - #: lib/choose_repository.tcl:795 ++#: lib/choose_repository.tcl:973 +msgid "Open" +msgstr "Apri" + - #: lib/choose_repository.tcl:805 ++#: lib/choose_repository.tcl:983 +msgid "Repository:" +msgstr "Archivio:" + - #: lib/choose_repository.tcl:854 ++#: lib/choose_repository.tcl:1033 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "Impossibile accedere all'archivio %s:" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "Questa revisione attiva staccata" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "Espressione di revisione:" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "Ramo locale" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "Duplicato locale di ramo remoto" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537 +msgid "Tag" +msgstr "Etichetta" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "Revisione non valida: %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "Nessuna revisione selezionata." + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "L'espressione di revisione è vuota." + +#: lib/choose_rev.tcl:530 +msgid "Updated" +msgstr "Aggiornato" + +#: lib/choose_rev.tcl:558 +msgid "URL" +msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"Non c'è niente da correggere.\n" +"\n" - "Stai per creare la revisione iniziale. Non esiste una revisione " - "precedente da correggere.\n" ++"Stai per creare la revisione iniziale. Non esiste una revisione precedente " ++"da correggere.\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"Non è possibile effettuare una correzione durante una fusione.\n" +"\n" +"In questo momento si sta effettuando una fusione che non è stata del tutto " +"completata. Non puoi correggere la revisione precedente a meno che prima tu " +"non interrompa l'operazione di fusione in corso.\n" + +#: lib/commit.tcl:49 +msgid "Error loading commit data for amend:" +msgstr "Errore durante il caricamento dei dati della revisione da correggere:" + +#: lib/commit.tcl:76 +msgid "Unable to obtain your identity:" +msgstr "Impossibile ottenere la tua identità:" + +#: lib/commit.tcl:81 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "GIT_COMMITTER_IDENT non valida:" + +#: lib/commit.tcl:133 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n" +"\n" +"Un altro programma Git ha modificato questo archivio dall'ultima analisi. " +"Bisogna effettuare una nuova analisi prima di poter creare una nuova " +"revisione.\n" +"\n" +"La nuova analisi comincerà ora.\n" + +#: lib/commit.tcl:154 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"Non è possibile creare una revisione con file non sottoposti a fusione.\n" +"\n" +"Il file %s presenta dei conflitti. Devi risolverli e preparare il file per " +"creare una nuova revisione prima di effettuare questa azione.\n" + +#: lib/commit.tcl:162 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"Stato di file %s sconosciuto.\n" +"\n" +"Questo programma non può creare una revisione contenente il file %s.\n" + +#: lib/commit.tcl:170 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"Nessuna modifica per la nuova revisione.\n" +"\n" - "Devi preparare per una nuova revisione almeno 1 file prima di effettuare questa " - "operazione.\n" ++"Devi preparare per una nuova revisione almeno 1 file prima di effettuare " ++"questa operazione.\n" + +#: lib/commit.tcl:183 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentance what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"Bisogna fornire un messaggio di revisione.\n" +"\n" +"Un buon messaggio di revisione ha il seguente formato:\n" +"\n" +"- Prima linea: descrivi in una frase ciò che hai fatto.\n" +"- Seconda linea: vuota.\n" +"- Terza linea: spiega a cosa serve la tua modifica.\n" + +#: lib/commit.tcl:257 +msgid "write-tree failed:" - msgstr "write-tree fallito:" ++msgstr "write-tree non riuscito:" + +#: lib/commit.tcl:275 +#, tcl-format +msgid "Commit %s appears to be corrupt" - msgstr "La revisione %s sembra essere corrotta" ++msgstr "La revisione %s sembra essere danneggiata" + +#: lib/commit.tcl:279 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"Nessuna modifica per la nuova revisione.\n" +"\n" +"Questa revisione non modifica alcun file e non effettua alcuna fusione.\n" +"\n" +"Si procederà subito ad una nuova analisi.\n" + +#: lib/commit.tcl:286 +msgid "No changes to commit." +msgstr "Nessuna modifica per la nuova revisione." + +#: lib/commit.tcl:303 +#, tcl-format +msgid "warning: Tcl does not support encoding '%s'." +msgstr "attenzione: Tcl non supporta la codifica '%s'." + +#: lib/commit.tcl:317 +msgid "commit-tree failed:" - msgstr "commit-tree fallito:" ++msgstr "commit-tree non riuscito:" + +#: lib/commit.tcl:339 +msgid "update-ref failed:" - msgstr "update-ref fallito:" ++msgstr "update-ref non riuscito:" + +#: lib/commit.tcl:430 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "Creata revisione %s: %s" + +#: lib/console.tcl:57 +msgid "Working... please wait..." +msgstr "Elaborazione in corso... attendere..." + +#: lib/console.tcl:183 +msgid "Success" +msgstr "Successo" + +#: lib/console.tcl:196 +msgid "Error: Command Failed" - msgstr "Errore: comando fallito" ++msgstr "Errore: comando non riuscito" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "Numero di oggetti slegati" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "Spazio su disco utilizzato da oggetti slegati" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "Numero di oggetti impacchettati" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "Numero di pacchetti" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "Spazio su disco utilizzato da oggetti impacchettati" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "Oggetti impacchettati che attendono la potatura" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "File inutili" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "Compressione dell'archivio in corso" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "Verifica dell'archivio con fsck-objects in corso" + +#: lib/database.tcl:108 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " +"the database when more than %i loose objects exist.\n" +"\n" +"Compress the database now?" +msgstr "" +"Questo archivio attualmente ha circa %i oggetti slegati.\n" +"\n" +"Per mantenere buone prestazioni si raccomanda di comprimere l'archivio " +"quando sono presenti più di %i oggetti slegati.\n" +"\n" +"Comprimere l'archivio ora?" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Git ha restituito una data non valida: %s" + +#: lib/diff.tcl:42 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Non sono state trovate differenze.\n" +"\n" +"%s non ha modifiche.\n" +"\n" +"La data di modifica di questo file è stata cambiata da un'altra " +"applicazione, ma il contenuto del file è rimasto invariato.\n" +"\n" +"Si procederà automaticamente ad una nuova analisi per trovare altri file che " +"potrebbero avere lo stesso stato." + +#: lib/diff.tcl:81 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Caricamento delle differenze di %s..." + +#: lib/diff.tcl:114 lib/diff.tcl:184 +#, tcl-format +msgid "Unable to display %s" +msgstr "Impossibile visualizzare %s" + +#: lib/diff.tcl:115 +msgid "Error loading file:" +msgstr "Errore nel caricamento del file:" + +#: lib/diff.tcl:122 +msgid "Git Repository (subproject)" +msgstr "Archivio Git (sottoprogetto)" + +#: lib/diff.tcl:134 +msgid "* Binary file (not showing content)." +msgstr "* File binario (il contenuto non sarà mostrato)." + +#: lib/diff.tcl:185 +msgid "Error loading diff:" +msgstr "Errore nel caricamento delle differenze:" + +#: lib/diff.tcl:302 +msgid "Failed to unstage selected hunk." - msgstr "La sezione scelta è ancora pronta per una nuova revisione." ++msgstr "Impossibile rimuovere la sezione scelta dalla nuova revisione." + +#: lib/diff.tcl:309 +msgid "Failed to stage selected hunk." +msgstr "Impossibile preparare la sezione scelta per una nuova revisione." + +#: lib/error.tcl:12 lib/error.tcl:102 +msgid "error" +msgstr "errore" + +#: lib/error.tcl:28 +msgid "warning" +msgstr "attenzione" + +#: lib/error.tcl:81 +msgid "You must correct the above errors before committing." - msgstr "Bisogna correggere gli errori suddetti prima di creare una nuova revisione." ++msgstr "" ++"Bisogna correggere gli errori suddetti prima di creare una nuova revisione." + - #: lib/index.tcl:241 ++#: lib/index.tcl:6 ++msgid "Unable to unlock the index." ++msgstr "Impossibile sbloccare l'accesso all'indice" ++ ++#: lib/index.tcl:15 ++msgid "Index Error" ++msgstr "Errore nell'indice" ++ ++#: lib/index.tcl:21 ++msgid "" ++"Updating the Git index failed. A rescan will be automatically started to " ++"resynchronize git-gui." ++msgstr "" ++"Impossibile aggiornare l'indice. Ora sarà avviata una nuova analisi che " ++"aggiornerà git-gui." ++ ++#: lib/index.tcl:27 ++msgid "Continue" ++msgstr "Continua" ++ ++#: lib/index.tcl:31 ++msgid "Unlock Index" ++msgstr "Sblocca l'accesso all'indice" ++ ++#: lib/index.tcl:282 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "%s non farà parte della prossima revisione" + - #: lib/index.tcl:285 ++#: lib/index.tcl:326 +#, tcl-format +msgid "Adding %s" +msgstr "Aggiunta di %s in corso" + - #: lib/index.tcl:340 ++#: lib/index.tcl:381 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Annullare le modifiche nel file %s?" + - #: lib/index.tcl:342 ++#: lib/index.tcl:383 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Annullare le modifiche in questi %i file?" + - #: lib/index.tcl:348 ++#: lib/index.tcl:389 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Tutte le modifiche non preparate per una nuova revisione saranno perse per " +"sempre." + - #: lib/index.tcl:351 ++#: lib/index.tcl:392 +msgid "Do Nothing" +msgstr "Non fare niente" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"Non posso effettuare fusioni durante una correzione.\n" +"\n" +"Bisogna finire di correggere questa revisione prima di iniziare una " +"qualunque fusione.\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n" +"\n" +"Un altro programma Git ha modificato questo archivio dall'ultima analisi." +"Bisogna effettuare una nuova analisi prima di poter effettuare una fusione.\n" +"\n" +"La nuova analisi comincerà ora.\n" + +#: lib/merge.tcl:44 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"Sei nel mezzo di una fusione con conflitti.\n" +"\n" +"Il file %s ha dei conflitti.\n" +"\n" +"Bisogna risolvere i conflitti, preparare il file per una nuova revisione ed " - "infine crearla per completare la fusione corrente. Solo a questo punto " - "potrai iniziare un'altra fusione.\n" ++"infine crearla per completare la fusione attuale. Solo a questo punto potrai " ++"iniziare un'altra fusione.\n" + +#: lib/merge.tcl:54 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"Sei nel mezzo di una modifica.\n" +"\n" +"Il file %s è stato modificato.\n" +"\n" - "Bisogna completare la creazione della revisione corrente prima di iniziare una fusione. " - "In questo modo sarà più facile interrompere una fusione non riuscita, nel " - "caso ce ne fosse bisogno.\n" ++"Bisogna completare la creazione della revisione attuale prima di iniziare " ++"una fusione. In questo modo sarà più facile interrompere una fusione non " ++"riuscita, nel caso ce ne fosse bisogno.\n" + +#: lib/merge.tcl:106 +#, tcl-format +msgid "%s of %s" +msgstr "%s di %s" + +#: lib/merge.tcl:119 +#, tcl-format +msgid "Merging %s and %s" +msgstr "Fusione di %s e %s in corso" + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "Fusione completata con successo." + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." - msgstr "Fusione fallita. Bisogna risolvere i conflitti." ++msgstr "Fusione non riuscita. Bisogna risolvere i conflitti." + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "Fusione in %s" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "Revisione da fondere" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"Interruzione impossibile durante una correzione.\n" +"\n" +"Bisogna finire di correggere questa revisione.\n" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"Interrompere fusione?\n" +"\n" - "L'interruzione della fusione corrente causerà la perdita di *TUTTE* le " ++"L'interruzione della fusione attuale causerà la perdita di *TUTTE* le " +"modifiche non ancora presenti nell'archivio.\n" +"\n" - "Continuare con l'interruzione della fusione corrente?" ++"Continuare con l'interruzione della fusione attuale?" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"Ripristinare la revisione corrente e annullare le modifiche?\n" +"\n" +"L'annullamento delle modifiche causerà la perdita di *TUTTE* le modifiche " +"non ancora presenti nell'archivio.\n" +"\n" - "Continuare con l'annullamento delle modifiche correnti?" ++"Continuare con l'annullamento delle modifiche attuali?" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "Interruzione in corso" + +#: lib/merge.tcl:266 +msgid "Abort failed." - msgstr "Interruzione fallita." ++msgstr "Interruzione non riuscita." + +#: lib/merge.tcl:268 +msgid "Abort completed. Ready." +msgstr "Interruzione completata. Pronto." + +#: lib/option.tcl:82 +msgid "Restore Defaults" - msgstr "Ripristina predefiniti" ++msgstr "Ripristina valori predefiniti" + +#: lib/option.tcl:86 +msgid "Save" +msgstr "Salva" + +#: lib/option.tcl:96 +#, tcl-format +msgid "%s Repository" +msgstr "Archivio di %s" + +#: lib/option.tcl:97 +msgid "Global (All Repositories)" +msgstr "Tutti gli archivi" + +#: lib/option.tcl:103 +msgid "User Name" +msgstr "Nome utente" + +#: lib/option.tcl:104 +msgid "Email Address" +msgstr "Indirizzo Email" + +#: lib/option.tcl:106 +msgid "Summarize Merge Commits" +msgstr "Riepilogo nelle revisioni di fusione" + +#: lib/option.tcl:107 +msgid "Merge Verbosity" +msgstr "Prolissità della fusione" + +#: lib/option.tcl:108 +msgid "Show Diffstat After Merge" +msgstr "Mostra statistiche delle differenze dopo la fusione" + +#: lib/option.tcl:110 +msgid "Trust File Modification Timestamps" +msgstr "Fidati delle date di modifica dei file" + +#: lib/option.tcl:111 +msgid "Prune Tracking Branches During Fetch" +msgstr "" +"Effettua potatura dei duplicati locali di rami remoti durante il recupero" + +#: lib/option.tcl:112 +msgid "Match Tracking Branches" +msgstr "Appaia duplicati locali di rami remoti" + +#: lib/option.tcl:113 +msgid "Number of Diff Context Lines" +msgstr "Numero di linee di contesto nelle differenze" + +#: lib/option.tcl:114 +msgid "New Branch Name Template" +msgstr "Modello per il nome di un nuovo ramo" + +#: lib/option.tcl:176 +msgid "Change Font" +msgstr "Cambia caratteri" + +#: lib/option.tcl:180 +#, tcl-format +msgid "Choose %s" +msgstr "Scegli %s" + +#: lib/option.tcl:186 +msgid "pt." +msgstr "pt." + +#: lib/option.tcl:200 +msgid "Preferences" +msgstr "Preferenze" + +#: lib/option.tcl:235 +msgid "Failed to completely save options:" +msgstr "Impossibile salvare completamente le opzioni:" + +#: lib/remote.tcl:165 +msgid "Prune from" +msgstr "Effettua potatura da" + +#: lib/remote.tcl:170 +msgid "Fetch from" +msgstr "Recupera da" + +#: lib/remote.tcl:213 +msgid "Push to" +msgstr "Propaga verso" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Remote Branch" +msgstr "Cancella ramo remoto" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "Da archivio" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 +msgid "Remote:" +msgstr "Remoto:" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 +msgid "Arbitrary URL:" +msgstr "URL specifico:" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "Rami" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "Elimina solo se" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "Fuso in:" + +#: lib/remote_branch_delete.tcl:119 +msgid "Always (Do not perform merge checks)" +msgstr "Sempre (non verificare le fusioni)" + +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "Si richiede un ramo per 'Fuso in'." + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"I rami seguenti non sono stati fusi completamente in %s:\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" - "Una o più verifiche di fusione sono fallite perché mancano le revisioni " - "necessarie. Prova prima a recuperarle da %s." ++"Impossibile verificare una o più fusioni: mancano le revisioni necessarie. " ++"Prova prima a recuperarle da %s." + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "Scegliere uno o più rami da cancellare." + +#: lib/remote_branch_delete.tcl:216 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "" +"Ricomporre rami cancellati è difficile.\n" +"\n" +"Cancellare i rami selezionati?" + +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Cancellazione rami da %s" + +#: lib/remote_branch_delete.tcl:286 +msgid "No repository selected." +msgstr "Nessun archivio selezionato." + +#: lib/remote_branch_delete.tcl:291 +#, tcl-format +msgid "Scanning %s..." +msgstr "Analisi in corso %s..." + - #: lib/shortcut.tcl:26 lib/shortcut.tcl:74 - msgid "Cannot write script:" - msgstr "Impossibile scrivere script:" ++#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++msgid "Cannot write shortcut:" ++msgstr "Impossibile scrivere shortcut:" + - #: lib/shortcut.tcl:149 ++#: lib/shortcut.tcl:136 +msgid "Cannot write icon:" +msgstr "Impossibile scrivere icona:" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" - msgstr "%s ... %*i di %*i %s (%3i%%)" ++msgstr "%1$s ... %6$s: %2$*i di %4$*i (%7$3i%%)" + +#: lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "recupera da %s" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Recupero nuove modifiche da %s" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "potatura remota di %s" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Effettua potatura dei duplicati locali di rami remoti cancellati da %s" + +#: lib/transport.tcl:25 lib/transport.tcl:71 +#, tcl-format +msgid "push %s" +msgstr "propaga verso %s" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Propagazione modifiche a %s" + +#: lib/transport.tcl:72 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "Propagazione %s %s a %s" + +#: lib/transport.tcl:89 +msgid "Push Branches" +msgstr "Propaga rami" + +#: lib/transport.tcl:103 +msgid "Source Branches" +msgstr "Rami di origine" + +#: lib/transport.tcl:120 +msgid "Destination Repository" +msgstr "Archivio di destinazione" + +#: lib/transport.tcl:158 +msgid "Transfer Options" +msgstr "Opzioni di trasferimento" + +#: lib/transport.tcl:160 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "Sovrascrivi ramo esistente (alcune modifiche potrebbero essere perse)" + +#: lib/transport.tcl:164 +msgid "Use thin pack (for slow network connections)" +msgstr "Utilizza 'thin pack' (per connessioni lente)" + +#: lib/transport.tcl:168 +msgid "Include tags" +msgstr "Includi etichette" - diff --cc git-gui/po/ja.po index f3a547b1b,000000000..e2cf5bdc0 mode 100644,000000..100644 --- a/git-gui/po/ja.po +++ b/git-gui/po/ja.po @@@ -1,1843 -1,0 +1,1883 @@@ +# Translation of git-gui to Japanese +# Copyright (C) 2007 Shawn Pearce +# This file is distributed under the same license as the git-gui package. +# しらいし ななこ , 2007. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-10-10 04:04-0400\n" - "PO-Revision-Date: 2007-10-31 16:23+0900\n" ++"POT-Creation-Date: 2007-11-24 10:36+0100\n" ++"PO-Revision-Date: 2007-12-05 06:12+0900\n" +"Last-Translator: しらいし ななこ \n" +"Language-Team: Japanese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + - #: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 - #: git-gui.sh:763 ++#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 ++#: git-gui.sh:733 +msgid "git-gui: fatal error" +msgstr "git-gui: 致命的なエラー" + - #: git-gui.sh:595 ++#: git-gui.sh:565 +#, tcl-format +msgid "Invalid font specified in %s:" +msgstr "%s に無効なフォントが指定されています:" + - #: git-gui.sh:620 ++#: git-gui.sh:590 +msgid "Main Font" +msgstr "主フォント" + - #: git-gui.sh:621 ++#: git-gui.sh:591 +msgid "Diff/Console Font" +msgstr "diff/コンソール・フォント" + - #: git-gui.sh:635 ++#: git-gui.sh:605 +msgid "Cannot find git in PATH." +msgstr "PATH 中に git が見つかりません" + - #: git-gui.sh:662 ++#: git-gui.sh:632 +msgid "Cannot parse Git version string:" +msgstr "Git バージョン名が理解できません:" + - #: git-gui.sh:680 ++#: git-gui.sh:650 +#, tcl-format +msgid "" +"Git version cannot be determined.\n" +"\n" +"%s claims it is version '%s'.\n" +"\n" +"%s requires at least Git 1.5.0 or later.\n" +"\n" +"Assume '%s' is version 1.5.0?\n" +msgstr "" +"Git のバージョンが確認できません。\n" +"\n" +"%s はバージョン '%s' とのことです。\n" +"\n" +"%s は最低でも 1.5.0 かそれ以降の Git が必要です\n" +"\n" +"'%s' はバージョン 1.5.0 と思って良いですか？\n" + - #: git-gui.sh:853 ++#: git-gui.sh:888 +msgid "Git directory not found:" +msgstr "Git ディレクトリが見つかりません:" + - #: git-gui.sh:860 ++#: git-gui.sh:895 +msgid "Cannot move to top of working directory:" +msgstr "作業ディレクトリの最上位に移動できません" + - #: git-gui.sh:867 ++#: git-gui.sh:902 +msgid "Cannot use funny .git directory:" +msgstr "変な .git ディレクトリは使えません" + - #: git-gui.sh:872 ++#: git-gui.sh:907 +msgid "No working directory" +msgstr "作業ディレクトリがありません" + - #: git-gui.sh:1019 ++#: git-gui.sh:1054 +msgid "Refreshing file status..." +msgstr "ファイル状態を更新しています…" + - #: git-gui.sh:1084 ++#: git-gui.sh:1119 +msgid "Scanning for modified files ..." +msgstr "変更されたファイルをスキャンしています…" + - #: git-gui.sh:1259 lib/browser.tcl:245 ++#: git-gui.sh:1294 lib/browser.tcl:245 +msgid "Ready." +msgstr "準備完了" + - #: git-gui.sh:1525 ++#: git-gui.sh:1560 +msgid "Unmodified" +msgstr "変更無し" + - #: git-gui.sh:1527 ++#: git-gui.sh:1562 +msgid "Modified, not staged" +msgstr "変更あり、コミット未予定" + - #: git-gui.sh:1528 git-gui.sh:1533 ++#: git-gui.sh:1563 git-gui.sh:1568 +msgid "Staged for commit" +msgstr "コミット予定済" + - #: git-gui.sh:1529 git-gui.sh:1534 ++#: git-gui.sh:1564 git-gui.sh:1569 +msgid "Portions staged for commit" +msgstr "部分的にコミット予定済" + - #: git-gui.sh:1530 git-gui.sh:1535 ++#: git-gui.sh:1565 git-gui.sh:1570 +msgid "Staged for commit, missing" +msgstr "コミット予定済、ファイル無し" + - #: git-gui.sh:1532 ++#: git-gui.sh:1567 +msgid "Untracked, not staged" +msgstr "管理外、コミット未予定" + - #: git-gui.sh:1537 ++#: git-gui.sh:1572 +msgid "Missing" +msgstr "ファイル無し" + - #: git-gui.sh:1538 ++#: git-gui.sh:1573 +msgid "Staged for removal" +msgstr "削除予定済" + - #: git-gui.sh:1539 ++#: git-gui.sh:1574 +msgid "Staged for removal, still present" +msgstr "削除予定済、ファイル未削除" + - #: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544 ++#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 +msgid "Requires merge resolution" +msgstr "要マージ解決" + - #: git-gui.sh:1579 ++#: git-gui.sh:1614 +msgid "Starting gitk... please wait..." +msgstr "gitk を起動中…お待ち下さい…" + - #: git-gui.sh:1588 ++#: git-gui.sh:1623 +#, tcl-format +msgid "" +"Unable to start gitk:\n" +"\n" +"%s does not exist" +msgstr "" +"gitk を起動できません:\n" +"\n" +"%s がありません" + - #: git-gui.sh:1788 lib/choose_repository.tcl:32 ++#: git-gui.sh:1823 lib/choose_repository.tcl:35 +msgid "Repository" +msgstr "リポジトリ" + - #: git-gui.sh:1789 ++#: git-gui.sh:1824 +msgid "Edit" +msgstr "編集" + - #: git-gui.sh:1791 lib/choose_rev.tcl:560 ++#: git-gui.sh:1826 lib/choose_rev.tcl:560 +msgid "Branch" +msgstr "ブランチ" + - #: git-gui.sh:1794 lib/choose_rev.tcl:547 ++#: git-gui.sh:1829 lib/choose_rev.tcl:547 +msgid "Commit@@noun" +msgstr "コミット" + - #: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 ++#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +msgid "Merge" +msgstr "マージ" + - #: git-gui.sh:1798 lib/choose_rev.tcl:556 ++#: git-gui.sh:1833 lib/choose_rev.tcl:556 +msgid "Remote" +msgstr "リモート" + - #: git-gui.sh:1807 ++#: git-gui.sh:1842 +msgid "Browse Current Branch's Files" +msgstr "現在のブランチのファイルを見る" + - #: git-gui.sh:1811 ++#: git-gui.sh:1846 +msgid "Browse Branch Files..." +msgstr "ブランチのファイルを見る…" + - #: git-gui.sh:1816 ++#: git-gui.sh:1851 +msgid "Visualize Current Branch's History" +msgstr "現在のブランチの履歴を見る" + - #: git-gui.sh:1820 ++#: git-gui.sh:1855 +msgid "Visualize All Branch History" +msgstr "全てのブランチの履歴を見る" + - #: git-gui.sh:1827 ++#: git-gui.sh:1862 +#, tcl-format +msgid "Browse %s's Files" +msgstr "ブランチ %s のファイルを見る" + - #: git-gui.sh:1829 ++#: git-gui.sh:1864 +#, tcl-format +msgid "Visualize %s's History" +msgstr "ブランチ %s の履歴を見る" + - #: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67 ++#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 +msgid "Database Statistics" +msgstr "データベース統計" + - #: git-gui.sh:1837 lib/database.tcl:34 ++#: git-gui.sh:1872 lib/database.tcl:34 +msgid "Compress Database" +msgstr "データベース圧縮" + - #: git-gui.sh:1840 ++#: git-gui.sh:1875 +msgid "Verify Database" +msgstr "データベース検証" + - #: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9 - #: lib/shortcut.tcl:45 lib/shortcut.tcl:84 ++#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 ++#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 +msgid "Create Desktop Icon" +msgstr "デスクトップ・アイコンを作る" + - #: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95 ++#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 +msgid "Quit" +msgstr "終了" + - #: git-gui.sh:1867 ++#: git-gui.sh:1902 +msgid "Undo" +msgstr "元に戻す" + - #: git-gui.sh:1870 ++#: git-gui.sh:1905 +msgid "Redo" +msgstr "やり直し" + - #: git-gui.sh:1874 git-gui.sh:2366 ++#: git-gui.sh:1909 git-gui.sh:2403 +msgid "Cut" +msgstr "切り取り" + - #: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512 ++#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 +#: lib/console.tcl:67 +msgid "Copy" +msgstr "コピー" + - #: git-gui.sh:1880 git-gui.sh:2372 ++#: git-gui.sh:1915 git-gui.sh:2409 +msgid "Paste" +msgstr "貼り付け" + - #: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26 ++#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 +msgid "Delete" +msgstr "削除" + - #: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69 ++#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 +msgid "Select All" +msgstr "全て選択" + - #: git-gui.sh:1896 ++#: git-gui.sh:1931 +msgid "Create..." +msgstr "作成…" + - #: git-gui.sh:1902 ++#: git-gui.sh:1937 +msgid "Checkout..." +msgstr "チェックアウト" + - #: git-gui.sh:1908 ++#: git-gui.sh:1943 +msgid "Rename..." +msgstr "名前変更…" + - #: git-gui.sh:1913 git-gui.sh:2012 ++#: git-gui.sh:1948 git-gui.sh:2048 +msgid "Delete..." +msgstr "削除…" + - #: git-gui.sh:1918 ++#: git-gui.sh:1953 +msgid "Reset..." +msgstr "リセット…" + - #: git-gui.sh:1930 git-gui.sh:2313 ++#: git-gui.sh:1965 git-gui.sh:2350 +msgid "New Commit" +msgstr "新規コミット" + - #: git-gui.sh:1938 git-gui.sh:2320 ++#: git-gui.sh:1973 git-gui.sh:2357 +msgid "Amend Last Commit" +msgstr "最新コミットを訂正" + - #: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99 ++#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 +msgid "Rescan" +msgstr "再スキャン" + - #: git-gui.sh:1953 ++#: git-gui.sh:1988 +msgid "Stage To Commit" +msgstr "コミット予定する" + - #: git-gui.sh:1958 ++#: git-gui.sh:1994 +msgid "Stage Changed Files To Commit" +msgstr "変更されたファイルをコミット予定" + - #: git-gui.sh:1964 ++#: git-gui.sh:2000 +msgid "Unstage From Commit" +msgstr "コミットから降ろす" + - #: git-gui.sh:1969 lib/index.tcl:352 ++#: git-gui.sh:2005 lib/index.tcl:393 +msgid "Revert Changes" +msgstr "変更を元に戻す" + - #: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390 ++#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 +msgid "Sign Off" +msgstr "署名" + - #: git-gui.sh:1980 git-gui.sh:2296 ++#: git-gui.sh:2016 git-gui.sh:2333 +msgid "Commit@@verb" +msgstr "コミット" + - #: git-gui.sh:1991 ++#: git-gui.sh:2027 +msgid "Local Merge..." +msgstr "ローカル・マージ…" + - #: git-gui.sh:1996 ++#: git-gui.sh:2032 +msgid "Abort Merge..." +msgstr "マージ中止…" + - #: git-gui.sh:2008 ++#: git-gui.sh:2044 +msgid "Push..." +msgstr "プッシュ…" + - #: git-gui.sh:2019 lib/choose_repository.tcl:41 ++#: git-gui.sh:2055 lib/choose_repository.tcl:40 +msgid "Apple" +msgstr "りんご" + - #: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 ++#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 ++#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 +#, tcl-format +msgid "About %s" +msgstr "%s について" + - #: git-gui.sh:2026 ++#: git-gui.sh:2062 +msgid "Preferences..." +msgstr "設定…" + - #: git-gui.sh:2034 git-gui.sh:2558 ++#: git-gui.sh:2070 git-gui.sh:2595 +msgid "Options..." +msgstr "オプション…" + - #: git-gui.sh:2040 lib/choose_repository.tcl:47 ++#: git-gui.sh:2076 lib/choose_repository.tcl:46 +msgid "Help" +msgstr "ヘルプ" + - #: git-gui.sh:2081 ++#: git-gui.sh:2117 +msgid "Online Documentation" +msgstr "オンライン・ドキュメント" + - #: git-gui.sh:2165 ++#: git-gui.sh:2201 +#, tcl-format +msgid "fatal: cannot stat path %s: No such file or directory" - msgstr "致命的: パス %s が stat できません。そのようなファイルやディレクトリはありません" ++msgstr "" ++"致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま" ++"せん" + - #: git-gui.sh:2198 ++#: git-gui.sh:2234 +msgid "Current Branch:" +msgstr "現在のブランチ" + - #: git-gui.sh:2219 ++#: git-gui.sh:2255 +msgid "Staged Changes (Will Commit)" +msgstr "ステージングされた（コミット予定済の）変更" + - #: git-gui.sh:2239 ++#: git-gui.sh:2274 +msgid "Unstaged Changes" +msgstr "コミット予定に入っていない変更" + - #: git-gui.sh:2286 ++#: git-gui.sh:2323 +msgid "Stage Changed" +msgstr "変更をコミット予定に入れる" + - #: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182 ++#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 +msgid "Push" +msgstr "プッシュ" + - #: git-gui.sh:2332 ++#: git-gui.sh:2369 +msgid "Initial Commit Message:" +msgstr "最初のコミットメッセージ:" + - #: git-gui.sh:2333 ++#: git-gui.sh:2370 +msgid "Amended Commit Message:" +msgstr "訂正したコミットメッセージ:" + - #: git-gui.sh:2334 ++#: git-gui.sh:2371 +msgid "Amended Initial Commit Message:" +msgstr "訂正した最初のコミットメッセージ:" + - #: git-gui.sh:2335 ++#: git-gui.sh:2372 +msgid "Amended Merge Commit Message:" +msgstr "訂正したマージコミットメッセージ:" + - #: git-gui.sh:2336 ++#: git-gui.sh:2373 +msgid "Merge Commit Message:" +msgstr "マージコミットメッセージ:" + - #: git-gui.sh:2337 ++#: git-gui.sh:2374 +msgid "Commit Message:" +msgstr "コミットメッセージ:" + - #: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71 ++#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 +msgid "Copy All" +msgstr "全てコピー" + - #: git-gui.sh:2406 lib/blame.tcl:104 ++#: git-gui.sh:2443 lib/blame.tcl:104 +msgid "File:" +msgstr "ファイル:" + - #: git-gui.sh:2508 ++#: git-gui.sh:2545 +msgid "Refresh" +msgstr "再読み込み" + - #: git-gui.sh:2529 ++#: git-gui.sh:2566 +msgid "Apply/Reverse Hunk" +msgstr "パッチを適用/取り消す" + - #: git-gui.sh:2535 ++#: git-gui.sh:2572 +msgid "Decrease Font Size" +msgstr "フォントを小さく" + - #: git-gui.sh:2539 ++#: git-gui.sh:2576 +msgid "Increase Font Size" +msgstr "フォントを大きく" + - #: git-gui.sh:2544 ++#: git-gui.sh:2581 +msgid "Show Less Context" +msgstr "文脈を少なく" + - #: git-gui.sh:2551 ++#: git-gui.sh:2588 +msgid "Show More Context" +msgstr "文脈を多く" + - #: git-gui.sh:2565 ++#: git-gui.sh:2602 +msgid "Unstage Hunk From Commit" +msgstr "パッチをコミット予定から外す" + - #: git-gui.sh:2567 ++#: git-gui.sh:2604 +msgid "Stage Hunk For Commit" +msgstr "パッチをコミット予定に加える" + - #: git-gui.sh:2586 ++#: git-gui.sh:2623 +msgid "Initializing..." +msgstr "初期化しています…" + - #: git-gui.sh:2677 ++#: git-gui.sh:2718 +#, tcl-format +msgid "" +"Possible environment issues exist.\n" +"\n" +"The following environment variables are probably\n" +"going to be ignored by any Git subprocess run\n" +"by %s:\n" +"\n" +msgstr "" +"環境に問題がある可能性があります\n" +"\n" +"以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n" +"\n" + - #: git-gui.sh:2707 ++#: git-gui.sh:2748 +msgid "" +"\n" +"This is due to a known issue with the\n" +"Tcl binary distributed by Cygwin." +msgstr "" +"\n" +"これは Cygwin で配布されている Tcl バイナリに\n" +"関しての既知の問題によります" + - #: git-gui.sh:2712 ++#: git-gui.sh:2753 +#, tcl-format +msgid "" +"\n" +"\n" +"A good replacement for %s\n" +"is placing values for the user.name and\n" +"user.email settings into your personal\n" +"~/.gitconfig file.\n" +msgstr "" +"\n" +"\n" +"個人的な ~/.gitconfig ファイル内で user.name と user.email の値を設定\n" +"するのが、%s の良い代用となります\n" + +#: lib/about.tcl:25 +msgid "git-gui - a graphical user interface for Git." +msgstr "Git のグラフィカルUI git-gui" + +#: lib/blame.tcl:77 +msgid "File Viewer" +msgstr "ファイルピューワ" + +#: lib/blame.tcl:81 +msgid "Commit:" +msgstr "コミット:" + +#: lib/blame.tcl:249 +msgid "Copy Commit" +msgstr "コミットをコピー" + +#: lib/blame.tcl:369 +#, tcl-format +msgid "Reading %s..." +msgstr "%s を読んでいます…" + +#: lib/blame.tcl:473 +msgid "Loading copy/move tracking annotations..." +msgstr "コピー・移動追跡データを読んでいます…" + +#: lib/blame.tcl:493 +msgid "lines annotated" +msgstr "行を注釈しました" + +#: lib/blame.tcl:674 +msgid "Loading original location annotations..." +msgstr "元位置行の注釈データを読んでいます…" + +#: lib/blame.tcl:677 +msgid "Annotation complete." +msgstr "注釈完了しました" + +#: lib/blame.tcl:731 +msgid "Loading annotation..." +msgstr "注釈を読み込んでいます…" + +#: lib/blame.tcl:787 +msgid "Author:" +msgstr "作者:" + +#: lib/blame.tcl:791 +msgid "Committer:" +msgstr "コミット者:" + +#: lib/blame.tcl:796 +msgid "Original File:" +msgstr "元ファイル" + +#: lib/blame.tcl:910 +msgid "Originally By:" +msgstr "原作者:" + +#: lib/blame.tcl:916 +msgid "In File:" +msgstr "ファイル:" + +#: lib/blame.tcl:921 +msgid "Copied Or Moved Here By:" +msgstr "複写・移動者:" + +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "ブランチをチェックアウト" + +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "チェックアウト" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 +msgid "Cancel" +msgstr "中止" + +#: lib/branch_checkout.tcl:32 lib/browser.tcl:286 +msgid "Revision" +msgstr "リビジョン" + +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202 +msgid "Options" +msgstr "オプション" + +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "トラッキング・ブランチをフェッチ" + +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "ローカル・ブランチから削除" + +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "ブランチを作成" + +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "ブランチを新規作成" + - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:199 ++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 +msgid "Create" +msgstr "作成" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "ブランチ名" + +#: lib/branch_create.tcl:43 +msgid "Name:" +msgstr "名前:" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "トラッキング・ブランチ名を合わせる" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "初期リビジョン" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "既存のブランチを更新:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "いいえ" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "早送りのみ" + +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 +msgid "Reset" +msgstr "リセット" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "作成してすぐチェックアウト" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "トラッキング・ブランチを選択して下さい。" + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "トラッキング・ブランチ %s は遠隔リポジトリのブランチではありません。" + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "ブランチ名を指定して下さい。" + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "'%s' はブランチ名に使えません。" + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "ブランチ削除" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "ローカル・ブランチを削除" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "ローカル・ブランチ" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "マージ済みの時のみ削除" + +#: lib/branch_delete.tcl:54 +msgid "Always (Do not perform merge test.)" +msgstr "無条件(マージテストしない)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "以下のブランチは %s に完全にマージされていません:" + +#: lib/branch_delete.tcl:115 +msgid "" +"Recovering deleted branches is difficult. \n" +"\n" +" Delete the selected branches?" +msgstr "" +"ブランチを削除すると元に戻すのは困難です。 \n" +"\n" +" 選択したブランチを削除しますか？" + +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"以下のブランチを削除できません:\n" +"%s" + +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "ブランチの名前変更" + +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "名前変更" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "ブランチ:" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "新しい名前:" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "名前を変更するブランチを選んで下さい。" + +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "'%s'というブランチは既に存在します。" + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "'%s'の名前変更に失敗しました。" + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "起動中…" + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "ファイル・ブラウザ" + +#: lib/browser.tcl:125 lib/browser.tcl:142 +#, tcl-format +msgid "Loading %s..." +msgstr "%s をロード中…" + +#: lib/browser.tcl:186 +msgid "[Up To Parent]" +msgstr "[上位フォルダへ]" + +#: lib/browser.tcl:266 lib/browser.tcl:272 +msgid "Browse Branch Files" +msgstr "現在のブランチのファイルを見る" + - #: lib/browser.tcl:277 lib/choose_repository.tcl:215 - #: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315 - #: lib/choose_repository.tcl:811 ++#: lib/browser.tcl:277 lib/choose_repository.tcl:391 ++#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 ++#: lib/choose_repository.tcl:989 +msgid "Browse" +msgstr "ブラウズ" + +#: lib/checkout_op.tcl:79 +#, tcl-format +msgid "Fetching %s from %s" +msgstr "%s から %s をフェッチしています" + +#: lib/checkout_op.tcl:127 +#, tcl-format +msgid "fatal: Cannot resolve %s" +msgstr "致命的エラー: %s を解決できません" + +#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31 +msgid "Close" +msgstr "閉じる" + +#: lib/checkout_op.tcl:169 +#, tcl-format +msgid "Branch '%s' does not exist." +msgstr "ブランチ'%s'は存在しません。" + +#: lib/checkout_op.tcl:206 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." +msgstr "" +"ブランチ '%s' は既に存在します。\n" +"\n" +"%s に早送りできません。\n" +"マージが必要です。" + +#: lib/checkout_op.tcl:220 +#, tcl-format +msgid "Merge strategy '%s' not supported." +msgstr "'%s' マージ戦略はサポートされていません。" + +#: lib/checkout_op.tcl:239 +#, tcl-format +msgid "Failed to update '%s'." +msgstr "'%s' の更新に失敗しました。" + +#: lib/checkout_op.tcl:251 +msgid "Staging area (index) is already locked." +msgstr "インデックスは既にロックされています。" + +#: lib/checkout_op.tcl:266 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"最後にスキャンした状態はリポジトリの状態と合致しません。\n" +"\n" +"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。現在" +"のブランチを変更する前に、再スキャンが必要です。\n" +"\n" +"自動的に再スキャンを開始します。\n" + +#: lib/checkout_op.tcl:322 +#, tcl-format +msgid "Updating working directory to '%s'..." +msgstr "作業ディレクトリを '%s' に更新しています…" + +#: lib/checkout_op.tcl:353 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." +msgstr "'%s' のチェックアウトを中止しました（ファイル毎のマージが必要です）。" + +#: lib/checkout_op.tcl:354 +msgid "File level merge required." +msgstr "ファイル毎のマージが必要です。" + +#: lib/checkout_op.tcl:358 +#, tcl-format +msgid "Staying on branch '%s'." +msgstr "ブランチ '%s' に滞まります。" + +#: lib/checkout_op.tcl:429 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." +msgstr "" +"ローカル・ブランチから離れます。\n" +"\n" +"ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン" +"チを開始してください。" + +#: lib/checkout_op.tcl:446 +#, tcl-format +msgid "Checked out '%s'." +msgstr "'%s' をチェックアウトしました" + +#: lib/checkout_op.tcl:478 +#, tcl-format +msgid "Resetting '%s' to '%s' will lose the following commits:" +msgstr "'%s' を '%s' にリセットすると、以下のコミットが失なわれます:" + +#: lib/checkout_op.tcl:500 +msgid "Recovering lost commits may not be easy." +msgstr "失なわれたコミットを回復するのは簡単ではありません。" + +#: lib/checkout_op.tcl:505 +#, tcl-format +msgid "Reset '%s'?" +msgstr "'%s' をリセットしますか？" + +#: lib/checkout_op.tcl:510 lib/merge.tcl:164 +msgid "Visualize" +msgstr "可視化" + +#: lib/checkout_op.tcl:578 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." +msgstr "" +"現在のブランチを設定できません。\n" +"\n" +"作業ディレクトリは部分的にしか切り替わっていません。ファイルの更新には成功し" +"ましたが、 Git の内部データを更新できませんでした。\n" +"起こるはずのないエラーです。あきらめて %s を終了します。" + +#: lib/choose_font.tcl:39 +msgid "Select" +msgstr "選択" + +#: lib/choose_font.tcl:53 +msgid "Font Family" +msgstr "フォント・ファミリー" + +#: lib/choose_font.tcl:73 +msgid "Font Size" +msgstr "フォントの大きさ" + +#: lib/choose_font.tcl:90 +msgid "Font Example" +msgstr "フォント・サンプル" + +#: lib/choose_font.tcl:101 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." +msgstr "" +"これはサンプル文です。\n" +"このフォントが気に入ればお使いになれます。" + - #: lib/choose_repository.tcl:25 ++#: lib/choose_repository.tcl:27 +msgid "Git Gui" +msgstr "Git GUI" + - #: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204 ++#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380 +msgid "Create New Repository" +msgstr "新しいリポジトリを作る" + - #: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291 ++#: lib/choose_repository.tcl:86 ++msgid "New..." ++msgstr "新規…" ++ ++#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 +msgid "Clone Existing Repository" +msgstr "既存リポジトリを複製する" + - #: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800 ++#: lib/choose_repository.tcl:99 ++msgid "Clone..." ++msgstr "複製…" ++ ++#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 +msgid "Open Existing Repository" +msgstr "既存リポジトリを開く" + - #: lib/choose_repository.tcl:91 - msgid "Next >" - msgstr "次 >" ++#: lib/choose_repository.tcl:112 ++msgid "Open..." ++msgstr "開く…" ++ ++#: lib/choose_repository.tcl:125 ++msgid "Recent Repositories" ++msgstr "最近使ったリポジトリ" ++ ++#: lib/choose_repository.tcl:131 ++msgid "Open Recent Repository:" ++msgstr "最近使ったリポジトリを開く" + - #: lib/choose_repository.tcl:152 ++#: lib/choose_repository.tcl:294 +#, tcl-format +msgid "Location %s already exists." +msgstr "'%s' は既に存在します。" + - #: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165 - #: lib/choose_repository.tcl:172 ++#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307 ++#: lib/choose_repository.tcl:314 +#, tcl-format +msgid "Failed to create repository %s:" +msgstr "リポジトリ %s を作製できません:" + - #: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309 ++#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486 +msgid "Directory:" +msgstr "ディレクトリ:" + - #: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363 - #: lib/choose_repository.tcl:834 ++#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544 ++#: lib/choose_repository.tcl:1013 +msgid "Git Repository" +msgstr "GIT リポジトリ" + - #: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260 ++#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437 +#, tcl-format +msgid "Directory %s already exists." +msgstr "ディレクトリ '%s' は既に存在します。" + - #: lib/choose_repository.tcl:265 ++#: lib/choose_repository.tcl:442 +#, tcl-format +msgid "File %s already exists." +msgstr "ファイル '%s' は既に存在します。" + - #: lib/choose_repository.tcl:286 ++#: lib/choose_repository.tcl:463 +msgid "Clone" +msgstr "複製" + - #: lib/choose_repository.tcl:299 ++#: lib/choose_repository.tcl:476 +msgid "URL:" +msgstr "URL:" + - #: lib/choose_repository.tcl:319 ++#: lib/choose_repository.tcl:496 +msgid "Clone Type:" +msgstr "複製方式:" + - #: lib/choose_repository.tcl:325 ++#: lib/choose_repository.tcl:502 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +msgstr "標準(高速・中冗長度・ハードリンク)" + - #: lib/choose_repository.tcl:331 ++#: lib/choose_repository.tcl:508 +msgid "Full Copy (Slower, Redundant Backup)" +msgstr "全複写(低速・冗長バックアップ)" + - #: lib/choose_repository.tcl:337 ++#: lib/choose_repository.tcl:514 +msgid "Shared (Fastest, Not Recommended, No Backup)" +msgstr "共有(最高速・非推奨・バックアップ無し)" + - #: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418 - #: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630 - #: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848 ++#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 ++#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808 ++#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027 +#, tcl-format +msgid "Not a Git repository: %s" +msgstr "Git リポジトリではありません: %s" + - #: lib/choose_repository.tcl:405 ++#: lib/choose_repository.tcl:586 +msgid "Standard only available for local repository." +msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。" + - #: lib/choose_repository.tcl:409 ++#: lib/choose_repository.tcl:590 +msgid "Shared only available for local repository." +msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。" + - #: lib/choose_repository.tcl:439 ++#: lib/choose_repository.tcl:617 +msgid "Failed to configure origin" +msgstr "origin を設定できませんでした" + - #: lib/choose_repository.tcl:451 ++#: lib/choose_repository.tcl:629 +msgid "Counting objects" +msgstr "オブジェクトを数えています" + - #: lib/choose_repository.tcl:452 ++#: lib/choose_repository.tcl:630 +msgid "buckets" +msgstr "バケツ" + - #: lib/choose_repository.tcl:476 ++#: lib/choose_repository.tcl:654 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" +msgstr "objects/info/alternates を複写できません: %s" + - #: lib/choose_repository.tcl:512 ++#: lib/choose_repository.tcl:690 +#, tcl-format +msgid "Nothing to clone from %s." +msgstr "%s から複製する内容はありません" + - #: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728 - #: lib/choose_repository.tcl:740 ++#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 ++#: lib/choose_repository.tcl:918 +msgid "The 'master' branch has not been initialized." +msgstr "'master' ブランチが初期化されていません" + - #: lib/choose_repository.tcl:527 ++#: lib/choose_repository.tcl:705 +msgid "Hardlinks are unavailable. Falling back to copying." +msgstr "ハードリンクが作れないので、コピーします" + - #: lib/choose_repository.tcl:539 ++#: lib/choose_repository.tcl:717 +#, tcl-format +msgid "Cloning from %s" +msgstr "%s から複製しています" + - #: lib/choose_repository.tcl:570 ++#: lib/choose_repository.tcl:748 +msgid "Copying objects" +msgstr "オブジェクトを複写しています" + - #: lib/choose_repository.tcl:571 ++#: lib/choose_repository.tcl:749 +msgid "KiB" +msgstr "KiB" + - #: lib/choose_repository.tcl:595 ++#: lib/choose_repository.tcl:773 +#, tcl-format +msgid "Unable to copy object: %s" +msgstr "オブジェクトを複写できません: %s" + - #: lib/choose_repository.tcl:605 ++#: lib/choose_repository.tcl:783 +msgid "Linking objects" +msgstr "オブジェクトを連結しています" + - #: lib/choose_repository.tcl:606 ++#: lib/choose_repository.tcl:784 +msgid "objects" +msgstr "オブジェクト" + - #: lib/choose_repository.tcl:614 ++#: lib/choose_repository.tcl:792 +#, tcl-format +msgid "Unable to hardlink object: %s" +msgstr "オブジェクトをハードリンクできません: %s" + - #: lib/choose_repository.tcl:669 ++#: lib/choose_repository.tcl:847 +msgid "Cannot fetch branches and objects. See console output for details." +msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい" + - #: lib/choose_repository.tcl:680 ++#: lib/choose_repository.tcl:858 +msgid "Cannot fetch tags. See console output for details." +msgstr "タグを取得できません。コンソール出力を見て下さい" + - #: lib/choose_repository.tcl:704 ++#: lib/choose_repository.tcl:882 +msgid "Cannot determine HEAD. See console output for details." +msgstr "HEAD を確定できません。コンソール出力を見て下さい" + - #: lib/choose_repository.tcl:713 ++#: lib/choose_repository.tcl:891 +#, tcl-format +msgid "Unable to cleanup %s" +msgstr "%s を掃除できません" + - #: lib/choose_repository.tcl:719 ++#: lib/choose_repository.tcl:897 +msgid "Clone failed." +msgstr "複写に失敗しました。" + - #: lib/choose_repository.tcl:726 ++#: lib/choose_repository.tcl:904 +msgid "No default branch obtained." +msgstr "デフォールト・ブランチが取得されませんでした" + - #: lib/choose_repository.tcl:737 ++#: lib/choose_repository.tcl:915 +#, tcl-format +msgid "Cannot resolve %s as a commit." +msgstr "%s をコミットとして解釈できません" + - #: lib/choose_repository.tcl:749 ++#: lib/choose_repository.tcl:927 +msgid "Creating working directory" +msgstr "作業ディレクトリを作成しています" + - #: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80 - #: lib/index.tcl:149 ++#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 ++#: lib/index.tcl:193 +msgid "files" +msgstr "ファイル" + - #: lib/choose_repository.tcl:779 ++#: lib/choose_repository.tcl:957 +msgid "Initial file checkout failed." +msgstr "初期チェックアウトに失敗しました" + - #: lib/choose_repository.tcl:795 ++#: lib/choose_repository.tcl:973 +msgid "Open" +msgstr "開く" + - #: lib/choose_repository.tcl:805 ++#: lib/choose_repository.tcl:983 +msgid "Repository:" +msgstr "リポジトリ:" + - #: lib/choose_repository.tcl:854 ++#: lib/choose_repository.tcl:1033 +#, tcl-format +msgid "Failed to open repository %s:" +msgstr "リポジトリ %s を開けません:" + +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" +msgstr "分離されたチェックアウト" + +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" +msgstr "リビジョン式:" + +#: lib/choose_rev.tcl:74 +msgid "Local Branch" +msgstr "ローカル・ブランチ" + +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" +msgstr "トラッキング・ブランチ" + +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537 +msgid "Tag" +msgstr "タグ" + +#: lib/choose_rev.tcl:317 +#, tcl-format +msgid "Invalid revision: %s" +msgstr "無効なリビジョン: %s" + +#: lib/choose_rev.tcl:338 +msgid "No revision selected." +msgstr "リビジョンが未選択です。" + +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." +msgstr "リビジョン式が空です。" + +#: lib/choose_rev.tcl:530 +msgid "Updated" +msgstr "更新しました" + +#: lib/choose_rev.tcl:558 +msgid "URL" +msgstr "URL" + +#: lib/commit.tcl:9 +msgid "" +"There is nothing to amend.\n" +"\n" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" +msgstr "" +"訂正するコミットがそもそもありません。\n" +"\n" +"これから作るのは最初のコミットです。その前にはまだ訂正するようなコミットはあ" +"りません。\n" + +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" +msgstr "" +"マージ中にコミットの訂正はできません。\n" +"\n" +"現在はまだマージの途中です。先にこのマージを中止しないと、前のコミットの訂正" +"はできません\n" + +#: lib/commit.tcl:49 +msgid "Error loading commit data for amend:" +msgstr "訂正するコミットのデータを読めません:" + +#: lib/commit.tcl:76 +msgid "Unable to obtain your identity:" +msgstr "ユーザの正体を確認できません:" + +#: lib/commit.tcl:81 +msgid "Invalid GIT_COMMITTER_IDENT:" +msgstr "GIT_COMMITTER_IDENT が無効です:" + +#: lib/commit.tcl:133 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"最後にスキャンした状態はリポジトリの状態と合致しません。\n" +"\n" +"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。新し" +"くコミットする前に、再スキャンが必要です。\n" +"\n" +"自動的に再スキャンを開始します。\n" + +#: lib/commit.tcl:154 +#, tcl-format +msgid "" +"Unmerged files cannot be committed.\n" +"\n" +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" +msgstr "" +"マージしていないファイルはコミットできません。\n" +"\n" +"ファイル %s にはマージ衝突が残っています。まず解決してコミット予定に加える必" +"要があります。\n" + +#: lib/commit.tcl:162 +#, tcl-format +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" +msgstr "" +"不明なファイル状態 %s です。\n" +"\n" +"ファイル %s は本プログラムではコミットできません。\n" + +#: lib/commit.tcl:170 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" +msgstr "" +"コミットする変更がありません。\n" +"\n" +"最低一つの変更をコミット予定に加えてからコミットして下さい。\n" + +#: lib/commit.tcl:183 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" - "- First line: Describe in one sentance what you did.\n" ++"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" +msgstr "" +"コミット・メッセージを入力して下さい。\n" +"\n" +"正しいコミット・メッセージは:\n" +"\n" +"- 第１行: 何をしたか、を１行で要約。\n" +"- 第２行: 空白\n" +"- 残りの行: なぜ、この変更が良い変更か、の説明。\n" + +#: lib/commit.tcl:257 +msgid "write-tree failed:" +msgstr "write-tree が失敗しました:" + +#: lib/commit.tcl:275 +#, tcl-format +msgid "Commit %s appears to be corrupt" +msgstr "コミット %s は壊れています" + +#: lib/commit.tcl:279 +msgid "" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" +msgstr "" +"コミットする変更がありません。\n" +"\n" +"マージでなく、また、一つも変更点がありません。\n" +"\n" +"自動的に再スキャンを開始します。\n" + +#: lib/commit.tcl:286 +msgid "No changes to commit." +msgstr "コミットする変更がありません。" + +#: lib/commit.tcl:303 +#, tcl-format +msgid "warning: Tcl does not support encoding '%s'." +msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません" + +#: lib/commit.tcl:317 +msgid "commit-tree failed:" +msgstr "commit-tree が失敗しました:" + +#: lib/commit.tcl:339 +msgid "update-ref failed:" +msgstr "update-ref が失敗しました:" + +#: lib/commit.tcl:430 +#, tcl-format +msgid "Created commit %s: %s" +msgstr "コミット %s を作成しました: %s" + +#: lib/console.tcl:57 +msgid "Working... please wait..." +msgstr "実行中…お待ち下さい…" + +#: lib/console.tcl:183 +msgid "Success" +msgstr "成功" + +#: lib/console.tcl:196 +msgid "Error: Command Failed" +msgstr "エラー: コマンドが失敗しました" + +#: lib/database.tcl:43 +msgid "Number of loose objects" +msgstr "ばらばらなオブジェクトの数" + +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" +msgstr "ばらばらなオブジェクトの使用するディスク量" + +#: lib/database.tcl:45 +msgid "Number of packed objects" +msgstr "パックされたオブジェクトの数" + +#: lib/database.tcl:46 +msgid "Number of packs" +msgstr "パックの数" + +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" +msgstr "パックされたオブジェクトの使用するディスク量" + +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" +msgstr "パックに存在するので捨てて良いオブジェクトの数" + +#: lib/database.tcl:49 +msgid "Garbage files" +msgstr "ゴミファイル" + +#: lib/database.tcl:72 +msgid "Compressing the object database" +msgstr "データベース圧縮" + +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" +msgstr "fsck-objects でオブジェクト・データベースを検証しています" + +#: lib/database.tcl:108 +#, tcl-format +msgid "" +"This repository currently has approximately %i loose objects.\n" +"\n" +"To maintain optimal performance it is strongly recommended that you compress " +"the database when more than %i loose objects exist.\n" +"\n" +"Compress the database now?" +msgstr "" +"このリポジトリにはおおよそ %i 個の個別オブジェクトがあります\n" +"\n" - "最適な性能を保つために、%i 個以上の個別オブジェクトを作る毎にデータベースを圧縮することを推奨します\n" ++"最適な性能を保つために、%i 個以上の個別オブジェクトを作る毎にデータベースを圧" ++"縮することを推奨します\n" +"\n" +"データベースを圧縮しますか？" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "Git から出た無効な日付: %s" + +#: lib/diff.tcl:42 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"変更がありません。\n" +"\n" +"%s には変更がありません。\n" +"\n" +"このファイルの変更時刻は他のアプリケーションによって更新されていますがファイ" +"ル内容には変更がありません。\n" +"\n" +"同様な状態のファイルを探すために、自動的に再スキャンを開始します。" + +#: lib/diff.tcl:81 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "%s の変更点をロード中…" + +#: lib/diff.tcl:114 lib/diff.tcl:184 +#, tcl-format +msgid "Unable to display %s" +msgstr "%s を表示できません" + +#: lib/diff.tcl:115 +msgid "Error loading file:" +msgstr "ファイルを読む際のエラーです:" + +#: lib/diff.tcl:122 +msgid "Git Repository (subproject)" +msgstr "Git リポジトリ(サブプロジェクト)" + +#: lib/diff.tcl:134 +msgid "* Binary file (not showing content)." +msgstr "* バイナリファイル(内容は表示しません)" + +#: lib/diff.tcl:185 +msgid "Error loading diff:" +msgstr "diff を読む際のエラーです:" + +#: lib/diff.tcl:302 +msgid "Failed to unstage selected hunk." +msgstr "選択されたパッチをコミット予定から外せません。" + +#: lib/diff.tcl:309 +msgid "Failed to stage selected hunk." +msgstr "選択されたパッチをコミット予定に加えられません。" + +#: lib/error.tcl:12 lib/error.tcl:102 +msgid "error" +msgstr "エラー" + +#: lib/error.tcl:28 +msgid "warning" +msgstr "警告" + +#: lib/error.tcl:81 +msgid "You must correct the above errors before committing." +msgstr "コミットする前に、以上のエラーを修正して下さい" + - #: lib/index.tcl:241 ++#: lib/index.tcl:6 ++msgid "Unable to unlock the index." ++msgstr "インデックスをロックできません" ++ ++#: lib/index.tcl:15 ++msgid "Index Error" ++msgstr "索引エラー" ++ ++#: lib/index.tcl:21 ++msgid "" ++"Updating the Git index failed. A rescan will be automatically started to " ++"resynchronize git-gui." ++msgstr "GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンします。" ++ ++#: lib/index.tcl:27 ++msgid "Continue" ++msgstr "続行" ++ ++#: lib/index.tcl:31 ++msgid "Unlock Index" ++msgstr "インデックスのロック解除" ++ ++#: lib/index.tcl:282 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "コミットから '%s' を降ろす" + - #: lib/index.tcl:285 ++#: lib/index.tcl:326 +#, tcl-format +msgid "Adding %s" +msgstr "コミットに %s を加えています" + - #: lib/index.tcl:340 ++#: lib/index.tcl:381 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "ファイル %s にした変更を元に戻しますか？" + - #: lib/index.tcl:342 ++#: lib/index.tcl:383 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "これら %i 個のファイルにした変更を元に戻しますか？" + - #: lib/index.tcl:348 ++#: lib/index.tcl:389 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。" + - #: lib/index.tcl:351 ++#: lib/index.tcl:392 +msgid "Do Nothing" +msgstr "何もしない" + +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" +msgstr "" +"訂正中にはマージできません。\n" +"\n" +"訂正処理を完了するまでは新たにマージを開始できません。\n" + +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" +msgstr "" +"最後にスキャンした状態はリポジトリの状態と合致しません。\n" +"\n" +"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。マー" +"ジを開始する前に、再スキャンが必要です。\n" +"\n" +"自動的に再スキャンを開始します。\n" + +#: lib/merge.tcl:44 +#, tcl-format +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" +msgstr "" +"衝突のあったマージの途中です。\n" +"\n" +"ファイル %s にはマージ中の衝突が残っています。\n" +"\n" +"このファイルの衝突を解決し、コミット予定に加えて、コミットすることでマージを" +"完了します。そうやって始めて、新たなマージを開始できるようになります。\n" + +#: lib/merge.tcl:54 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" +msgstr "" +"変更の途中です。\n" +"\n" +"ファイル %s は変更中です。\n" +"\n" +"現在のコミットを完了してからマージを開始して下さい。そうする方がマージに失敗" +"したときの回復が楽です。\n" + +#: lib/merge.tcl:106 +#, tcl-format +msgid "%s of %s" +msgstr "%s の %s ブランチ" + +#: lib/merge.tcl:119 +#, tcl-format +msgid "Merging %s and %s" +msgstr "%s と %s をマージします" + +#: lib/merge.tcl:131 +msgid "Merge completed successfully." +msgstr "マージが完了しました" + +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." +msgstr "マージが失敗しました。衝突の解決が必要です。" + +#: lib/merge.tcl:158 +#, tcl-format +msgid "Merge Into %s" +msgstr "%s にマージ" + +#: lib/merge.tcl:177 +msgid "Revision To Merge" +msgstr "マージするリビジョン" + +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" +msgstr "" +"訂正中には中止できません。\n" +"\n" +"まず今のコミット訂正を完了させて下さい。\n" + +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" +msgstr "" +"マージを中断しますか？\n" +"\n" +"現在のマージを中断すると、コミットしていない全ての変更が失われます。\n" +"\n" +"マージを中断してよろしいですか？" + +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" +msgstr "" +"変更点をリセットしますか？\n" +"\n" +"変更点をリセットすると、コミットしていない全ての変更が失われます。\n" +"\n" +"リセットしてよろしいですか？" + +#: lib/merge.tcl:239 +msgid "Aborting" +msgstr "中断しています" + +#: lib/merge.tcl:266 +msgid "Abort failed." +msgstr "中断に失敗しました。" + +#: lib/merge.tcl:268 +msgid "Abort completed. Ready." +msgstr "中断完了。" + +#: lib/option.tcl:82 +msgid "Restore Defaults" +msgstr "既定値に戻す" + +#: lib/option.tcl:86 +msgid "Save" +msgstr "保存" + +#: lib/option.tcl:96 +#, tcl-format +msgid "%s Repository" +msgstr "%s リポジトリ" + +#: lib/option.tcl:97 +msgid "Global (All Repositories)" +msgstr "大域（全てのリポジトリ）" + +#: lib/option.tcl:103 +msgid "User Name" +msgstr "ユーザ名" + +#: lib/option.tcl:104 +msgid "Email Address" +msgstr "電子メールアドレス" + +#: lib/option.tcl:106 +msgid "Summarize Merge Commits" +msgstr "マージコミットの要約" + +#: lib/option.tcl:107 +msgid "Merge Verbosity" +msgstr "マージの冗長度" + +#: lib/option.tcl:108 +msgid "Show Diffstat After Merge" +msgstr "マージ後に diffstat を表示" + +#: lib/option.tcl:110 +msgid "Trust File Modification Timestamps" +msgstr "ファイル変更時刻を信頼する" + +#: lib/option.tcl:111 +msgid "Prune Tracking Branches During Fetch" +msgstr "フェッチ中にトラッキングブランチを刈る" + +#: lib/option.tcl:112 +msgid "Match Tracking Branches" +msgstr "トラッキングブランチを合わせる" + +#: lib/option.tcl:113 +msgid "Number of Diff Context Lines" +msgstr "diff の文脈行数" + +#: lib/option.tcl:114 +msgid "New Branch Name Template" +msgstr "新しいブランチ名のテンプレート" + +#: lib/option.tcl:176 +msgid "Change Font" +msgstr "フォントを変更" + +#: lib/option.tcl:180 +#, tcl-format +msgid "Choose %s" +msgstr "%s を選択" + +#: lib/option.tcl:186 +msgid "pt." +msgstr "ポイント" + +#: lib/option.tcl:200 +msgid "Preferences" +msgstr "設定" + +#: lib/option.tcl:235 +msgid "Failed to completely save options:" +msgstr "完全にオプションを保存できません:" + - #: lib/remote.tcl:165 - msgid "Prune from" - msgstr "から刈込む…" - - #: lib/remote.tcl:170 - msgid "Fetch from" - msgstr "取得元" - - #: lib/remote.tcl:213 - msgid "Push to" - msgstr "プッシュ先" - +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Remote Branch" +msgstr "リモート・ブランチを削除" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "元のリポジトリ" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 +msgid "Remote:" +msgstr "リモート:" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 +msgid "Arbitrary URL:" +msgstr "任意の URL:" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "ブランチ" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "条件付で削除" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "マージ先:" + +#: lib/remote_branch_delete.tcl:119 +msgid "Always (Do not perform merge checks)" +msgstr "無条件（マージ検査をしない）" + +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "'マージ先' にはブランチが必要です。" + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"以下のブランチは %s に完全にマージされていません:\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"必要なコミットが不足しているために、マージ検査が失敗しました。まず %s から" +"フェッチして下さい。" + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "削除するブランチを選択して下さい。" + +#: lib/remote_branch_delete.tcl:216 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "" +"削除したブランチを回復するのは困難です。\n" +"\n" +"選択したブランチを削除して良いですか？" + +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "%s からブランチを削除しています。" + +#: lib/remote_branch_delete.tcl:286 +msgid "No repository selected." +msgstr "リポジトリが選択されていません。" + +#: lib/remote_branch_delete.tcl:291 +#, tcl-format +msgid "Scanning %s..." +msgstr "%s をスキャンしています…" + - #: lib/shortcut.tcl:26 lib/shortcut.tcl:74 - msgid "Cannot write script:" - msgstr "スクリプトが書けません:" ++#: lib/remote.tcl:165 ++msgid "Prune from" ++msgstr "から刈込む…" ++ ++#: lib/remote.tcl:170 ++msgid "Fetch from" ++msgstr "取得元" + - #: lib/shortcut.tcl:149 ++#: lib/remote.tcl:213 ++msgid "Push to" ++msgstr "プッシュ先" ++ ++#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 ++msgid "Cannot write shortcut:" ++msgstr "ショートカットが書けません:" ++ ++#: lib/shortcut.tcl:136 +msgid "Cannot write icon:" +msgstr "アイコンが書けません:" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%1$s ... %4$*i %6$s 中の %2$*i (%7$3i%%)" + +#: lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "%s を取得" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "%s から新しい変更をフェッチしています" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "遠隔刈込 %s" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "%s から削除されたトラッキング・ブランチを刈っています" + +#: lib/transport.tcl:25 lib/transport.tcl:71 +#, tcl-format +msgid "push %s" +msgstr "%s をプッシュ" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "%s へ変更をプッシュしています" + +#: lib/transport.tcl:72 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "%3$s へ %1$s %2$s をプッシュしています" + +#: lib/transport.tcl:89 +msgid "Push Branches" +msgstr "ブランチをプッシュ" + +#: lib/transport.tcl:103 +msgid "Source Branches" +msgstr "元のブランチ" + +#: lib/transport.tcl:120 +msgid "Destination Repository" +msgstr "送り先リポジトリ" + +#: lib/transport.tcl:158 +msgid "Transfer Options" +msgstr "通信オプション" + +#: lib/transport.tcl:160 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "既存ブランチを上書き(変更を破棄する可能性があります)" + +#: lib/transport.tcl:164 +msgid "Use thin pack (for slow network connections)" +msgstr "Thin Pack を使う（遅いネットワーク接続）" + +#: lib/transport.tcl:168 +msgid "Include tags" +msgstr "タグを含める" -