diff options
Diffstat (limited to 'third_party/git/git-gui')
83 files changed, 0 insertions, 59307 deletions
diff --git a/third_party/git/git-gui/.gitattributes b/third_party/git/git-gui/.gitattributes deleted file mode 100644 index 59cd41dbff72..000000000000 --- a/third_party/git/git-gui/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -* whitespace=indent-with-non-tab,trailing-space,space-before-tab,tabwidth=4 -* encoding=US-ASCII -git-gui.sh encoding=UTF-8 -/po/*.po encoding=UTF-8 -/GIT-VERSION-GEN eol=lf diff --git a/third_party/git/git-gui/.gitignore b/third_party/git/git-gui/.gitignore deleted file mode 100644 index 6483b21cbfc7..000000000000 --- a/third_party/git/git-gui/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.DS_Store -config.mak -Git Gui.app* -git-gui.tcl -GIT-VERSION-FILE -GIT-GUI-VARS -git-gui -lib/tclIndex diff --git a/third_party/git/git-gui/GIT-VERSION-GEN b/third_party/git/git-gui/GIT-VERSION-GEN deleted file mode 100755 index 92373d251a84..000000000000 --- a/third_party/git/git-gui/GIT-VERSION-GEN +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -GVF=GIT-VERSION-FILE -DEF_VER=0.21.GITGUI - -LF=' -' - -tree_search () -{ - head=$1 - tree=$2 - for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null) - do - test $tree = $(git rev-parse $p^{tree} 2>/dev/null) && - vn=$(git describe --abbrev=4 $p 2>/dev/null) && - case "$vn" in - gitgui-[0-9]*) echo $vn; break;; - esac - done -} - -# Always use the tarball version file if found, just -# in case we are somehow contained in a larger git -# repository that doesn't actually track our state. -# (At least one package manager is doing this.) -# -# We may be a subproject, so try looking for the merge -# commit that supplied this directory content if we are -# not at the toplevel. We probably will always be the -# second parent in the commit, but we shouldn't rely on -# that fact. -# -# If we are at the toplevel or the merge assumption fails -# try looking for a gitgui-* tag. - -if test -f version && - VN=$(cat version) -then - : happy -elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" - test -n "$prefix" && - head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) && - tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) && - VN=$(tree_search $head $tree) - case "$VN" in - gitgui-[0-9]*) : happy ;; - *) (exit 1) ;; - esac -then - VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g'); -elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && - case "$VN" in - gitgui-[0-9]*) : happy ;; - *) (exit 1) ;; - esac -then - VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g'); -else - VN="$DEF_VER" -fi - -dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty= -case "$dirty" in -'') - ;; -*) - VN="$VN-dirty" ;; -esac - -if test -r $GVF -then - VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF) -else - VC=unset -fi -test "$VN" = "$VC" || { - echo >&2 "GITGUI_VERSION = $VN" - echo "GITGUI_VERSION = $VN" >$GVF -} diff --git a/third_party/git/git-gui/Makefile b/third_party/git/git-gui/Makefile deleted file mode 100644 index f10caedaa7a3..000000000000 --- a/third_party/git/git-gui/Makefile +++ /dev/null @@ -1,347 +0,0 @@ -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 valid for this to work. -# - -GIT-VERSION-FILE: FORCE - @$(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') -uname_R := $(shell sh -c 'uname -r 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 -ifeq (git-core,$(notdir $(gitexecdir))) - sharedir := $(dir $(patsubst %/,%,$(dir $(gitexecdir))))share -else - sharedir := $(dir $(gitexecdir))share -endif -endif - -ifndef INSTALL - INSTALL = install -endif - -RM_RF ?= rm -rf -RMDIR ?= rmdir - -INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here -INSTALL_D1 = -INSTALL_R0 = $(INSTALL) -m 644 # space is required here -INSTALL_R1 = -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 -m 755 "$$dir" - INSTALL_R0 = src= - INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src - INSTALL_X0 = 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 - -TCLTK_PATH ?= wish -ifeq (./,$(dir $(TCLTK_PATH))) - TCL_PATH ?= $(subst wish,tclsh,$(TCLTK_PATH)) -else - TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH))) -endif - -ifeq ($(uname_S),Darwin) - TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app - ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n) - TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app - ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n) - TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app - endif - endif - TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app) -endif - -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_sed_in))) -exedir = $(dir $(gitexecdir))share/git-gui/lib - -GITGUI_SCRIPT := $$0 -GITGUI_RELATIVE := -GITGUI_MACOSXAPP := - -ifeq ($(uname_O),Cygwin) - GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"` - - # Is this a Cygwin Tcl/Tk binary? If so it knows how to do - # POSIX path translation just like cygpath does and we must - # keep libdir in POSIX format so Cygwin packages of git-gui - # work no matter where the user installs them. - # - ifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /)) - gg_libdir_sed_in := $(gg_libdir) - else - gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)") - endif -else - ifeq ($(exedir),$(gg_libdir)) - GITGUI_RELATIVE := 1 - endif - gg_libdir_sed_in := $(gg_libdir) -endif -ifeq ($(uname_S),Darwin) - ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y) - GITGUI_MACOSXAPP := YesPlease - endif -endif -ifneq (,$(findstring MINGW,$(uname_S))) -ifeq ($(shell expr "$(uname_R)" : '1\.'),2) - NO_MSGFMT=1 -endif - GITGUI_WINDOWS_WRAPPER := YesPlease - GITGUI_RELATIVE := 1 -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 ' libdir="$${GIT_GUI_LIB_DIR:-$(libdir_SQ)}"' >>$@+ && \ - echo ' 'exec \"'$$libdir/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\" \ - '"$$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/$(TKEXECUTABLE) - $(QUIET_GEN)rm -rf '$@' '$@'+ && \ - mkdir -p '$@'+/Contents/MacOS && \ - mkdir -p '$@'+/Contents/Resources/Scripts && \ - cp '$(subst ','\'',$(subst \,,$(TKFRAMEWORK)/Contents/MacOS/$(TKEXECUTABLE)))' \ - '$@'+/Contents/MacOS && \ - cp macosx/git-gui.icns '$@'+/Contents/Resources && \ - sed -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ - -e 's/@@GITGUI_TKEXECUTABLE@@/$(TKEXECUTABLE)/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 's|@@SHELL_PATH@@|$(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 - ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0) - MSGFMT := $(TCL_PATH) po/po2msg.sh - endif -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) - -lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS - $(QUIET_INDEX)if echo \ - $(foreach p,$(PRELOAD_FILES),source $p\;) \ - auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \ - | $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \ - else \ - echo >&2 " * $(TCL_PATH) failed; using unoptimized loading"; \ - rm -f $@ ; \ - echo '# Autogenerated by git-gui Makefile' >$@ && \ - echo >>$@ && \ - $(foreach p,$(PRELOAD_FILES) $(sort $(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 - @VARS='$(TRACK_VARS)'; \ - if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \ - echo >&2 " * new locations or Tcl/Tk interpreter"; \ - echo >$@ "$$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)$(INSTALL_X0)git-gui--askpass $(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)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui--askpass $(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 diff --git a/third_party/git/git-gui/README.md b/third_party/git/git-gui/README.md deleted file mode 100644 index 5ce2122fbc61..000000000000 --- a/third_party/git/git-gui/README.md +++ /dev/null @@ -1,174 +0,0 @@ -# Git GUI - A graphical user interface for Git - -Git GUI allows you to use the [Git source control management -tools](https://git-scm.com/) via a GUI. This includes staging, committing, -adding, pushing, etc. It can also be used as a blame viewer, a tree browser, -and a citool (make exactly one commit before exiting and returning to shell). -More details about Git GUI can be found in its manual page by either running -`man git-gui`, or by visiting the [online manual -page](https://git-scm.com/docs/git-gui). - -Git GUI was initially written by Shawn O. Pearce, and is distributed with the -standard Git installation. - -# Building and installing - -You need to have the following dependencies installed before you begin: - -- Git -- Tcl -- Tk -- wish -- Gitk (needed for browsing history) -- msgfmt - -Most of Git GUI is written in Tcl, so there is no compilation involved. Still, -some things do need to be done (mostly some substitutions), so you do need to -"build" it. - -You can build Git GUI using: - -``` -make -``` - -And then install it using: - -``` -make install -``` - -You probably need to have root/admin permissions to install. - -# Contributing - -The project is currently maintained by Pratyush Yadav over at -https://github.com/prati0100/git-gui. Even though the project is hosted at -GitHub, the development does not happen over GitHub Issues and Pull Requests. -Instead, an email based workflow is used. The Git mailing list -[git@vger.kernel.org](mailto:git@vger.kernel.org) is where the patches are -discussed and reviewed. - -More information about the Git mailing list and instructions to subscribe can -be found [here](https://git.wiki.kernel.org/index.php/GitCommunity). - -## Sending your changes - -Since the development happens over email, you need to send in your commits in -text format. Commits can be converted to emails via the two tools provided by -Git: `git-send-email` and `git-format-patch`. - -You can use `git-format-patch` to generate patches in mbox format from your -commits that can then be sent via email. Let's say you are working on a branch -called 'foo' that was created on top of 'master'. You can run: - -``` -git format-patch -o output_dir master..foo -``` - -to convert all the extra commits in 'foo' into a set of patches saved in the -folder `output_dir`. - -If you are sending multiple patches, it is recommended to include a cover -letter. A cover letter is an email explaining in brief what the series is -supposed to do. A cover letter template can be generated by passing -`--cover-letter` to `git-format-patch`. - -After you send your patches, you might get a review suggesting some changes. -Make those changes, and re-send your patch(es) in reply to the first patch of -your initial version. Also please mention the version of the patch. This can be -done by passing `-v X` to `git-format-patch`, where 'X' is the version number -of the patch(es). - -### Using git-send-email - -You can use `git-send-email` to send patches generated via `git-format-patch`. -While you can directly send patches via `git-send-email`, it is recommended -that you first use `git-format-patch` to generate the emails, audit them, and -then send them via `git-send-email`. - -A pretty good guide to configuring and using `git-send-email` can be found -[here](https://www.freedesktop.org/wiki/Software/PulseAudio/HowToUseGitSendEmail/) - -### Using your email client - -If your email client supports sending mbox format emails, you can use -`git-format-patch` to get an mbox file for each commit, and then send them. If -there is more than one patch in the series, then all patches after the first -patch (or the cover letter) need to be sent as replies to the first. -`git-send-email` does this by default. - -### Using GitGitGadget - -Since some people prefer a GitHub pull request based workflow, they can use -[GitGitGadget](https://gitgitgadget.github.io/) to send in patches. The tool -was originally written for sending patches to the Git project, but it now also -supports sending patches for git-gui. - -Instructions for using GitGitGadget to send git-gui patches, courtesy of -Johannes Schindelin: - -If you don't already have a fork of the [git/git](https://github.com/git/git) -repo, you need to make one. Then clone your fork: - -``` -git clone https://github.com/<your-username>/git -``` - -Then add GitGitGadget as a remote: - -``` -git remote add gitgitgadget https://github.com/gitgitgadget/git -``` - -Then fetch the git-gui branch: - -``` -git fetch gitgitgadget git-gui/master -``` - -Then create a new branch based on git-gui/master: - -``` -git checkout -b <your-branch-name> git-gui/master -``` - -Make whatever commits you need to, push them to your fork, and then head over -to https://github.com/gitgitgadget/git/pulls and open a Pull Request targeting -git-gui/master. - -GitGitGadget will welcome you with a (hopefully) helpful message. - -## Signing off - -You need to sign off your commits before sending them to the list. You can do -that by passing the `-s` option to `git-commit`. You can also use the "Sign -Off" option in Git GUI. - -A sign-off is a simple 'Signed-off-by: A U Thor \<author@example.com\>' line at -the end of the commit message, after your explanation of the commit. - -A sign-off means that you are legally allowed to send the code, and it serves -as a certificate of origin. More information can be found at -[developercertificate.org](https://developercertificate.org/). - -## Responding to review comments - -It is quite likely your patches will get review comments. Those comments are -sent on the Git mailing list as replies to your patch, and you will usually be -Cc'ed in those replies. - -You are expected to respond by either explaining your code further to convince -the reviewer what you are doing is correct, or acknowledge the comments and -re-send the patches with those comments addressed. - -Some tips for those not familiar with communication on a mailing list: - -- Use only plain text emails. No HTML at all. -- Wrap lines at around 75 characters. -- Do not send attachments. If you do need to send some files, consider using a - hosting service, and paste the link in your email. -- Do not [top post](http://www.idallen.com/topposting.html). -- Always "reply all". Keep all correspondents and the list in Cc. If you reply - directly to a reviewer, and not Cc the list, other people would not be able - to chime in. diff --git a/third_party/git/git-gui/git-gui--askpass b/third_party/git/git-gui/git-gui--askpass deleted file mode 100755 index 1c99ee8ca20d..000000000000 --- a/third_party/git/git-gui/git-gui--askpass +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# Tcl ignores the next line -*- tcl -*- \ -exec wish "$0" -- "$@" - -# This is a trivial implementation of an SSH_ASKPASS handler. -# Git-gui uses this script if none are already configured. - -package require Tk - -set answer {} -set yesno 0 -set rc 255 - -if {$argc < 1} { - set prompt "Enter your OpenSSH passphrase:" -} else { - set prompt [join $argv " "] - if {[regexp -nocase {\(yes\/no\)\?\s*$} $prompt]} { - set yesno 1 - } -} - -message .m -text $prompt -justify center -aspect 4000 -pack .m -side top -fill x -padx 20 -pady 20 -expand 1 - -entry .e -textvariable answer -width 50 -pack .e -side top -fill x -padx 10 -pady 10 - -if {!$yesno} { - .e configure -show "*" -} - -frame .b -button .b.ok -text OK -command finish -button .b.cancel -text Cancel -command cancel - -pack .b.ok -side left -expand 1 -pack .b.cancel -side right -expand 1 -pack .b -side bottom -fill x -padx 10 -pady 10 - -bind . <Visibility> {focus -force .e} -bind . <Key-Return> [list .b.ok invoke] -bind . <Key-Escape> [list .b.cancel invoke] -bind . <Destroy> {set rc $rc} - -proc cancel {} { - set ::rc 255 -} - -proc finish {} { - if {$::yesno} { - if {$::answer ne "yes" && $::answer ne "no"} { - tk_messageBox -icon error -title "Error" -type ok \ - -message "Only 'yes' or 'no' input allowed." - return - } - } - - # On Windows, force the encoding to UTF-8: it is what `git.exe` expects - if {$::tcl_platform(platform) eq {windows}} { - set ::answer [encoding convertto utf-8 $::answer] - } - - puts $::answer - set ::rc 0 -} - -wm title . "OpenSSH" -tk::PlaceWindow . -vwait rc -exit $rc diff --git a/third_party/git/git-gui/git-gui.sh b/third_party/git/git-gui/git-gui.sh deleted file mode 100755 index 867b8cea4618..000000000000 --- a/third_party/git/git-gui/git-gui.sh +++ /dev/null @@ -1,4198 +0,0 @@ -#!/bin/sh -# Tcl ignores the next line -*- tcl -*- \ - if test "z$*" = zversion \ - || test "z$*" = z--version; \ - then \ - echo 'git-gui version @@GITGUI_VERSION@@'; \ - exit; \ - fi; \ - argv0=$0; \ - exec wish "$argv0" -- "$@" - -set appvers {@@GITGUI_VERSION@@} -set copyright [string map [list (c) \u00a9] { -Copyright (c) 2006-2010 Shawn Pearce, et. al. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, see <http://www.gnu.org/licenses/>.}] - -###################################################################### -## -## Tcl/Tk sanity check - -if {[catch {package require Tcl 8.5} err] - || [catch {package require Tk 8.5} err] -} { - catch {wm withdraw .} - tk_messageBox \ - -icon error \ - -type ok \ - -title "git-gui: fatal error" \ - -message $err - exit 1 -} - -catch {rename send {}} ; # What an evil concept... - -###################################################################### -## -## locate our library - -if { [info exists ::env(GIT_GUI_LIB_DIR) ] } { - set oguilib $::env(GIT_GUI_LIB_DIR) -} else { - set oguilib {@@GITGUI_LIBDIR@@} -} -set oguirel {@@GITGUI_RELATIVE@@} -if {$oguirel eq {1}} { - set oguilib [file dirname [file normalize $argv0]] - if {[file tail $oguilib] eq {git-core}} { - set oguilib [file dirname $oguilib] - } - set oguilib [file dirname $oguilib] - set oguilib [file join $oguilib share git-gui lib] - set oguimsg [file join $oguilib msgs] -} elseif {[string match @@* $oguirel]} { - set oguilib [file join [file dirname [file normalize $argv0]] lib] - set oguimsg [file join [file dirname [file normalize $argv0]] po] -} else { - set oguimsg [file join $oguilib msgs] -} -unset oguirel - -###################################################################### -## -## enable verbose loading? - -if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} { - unset _verbose - rename auto_load real__auto_load - proc auto_load {name args} { - puts stderr "auto_load $name" - return [uplevel 1 real__auto_load $name $args] - } - rename source real__source - proc source {args} { - puts stderr "source $args" - uplevel 1 [linsert $args 0 real__source] - } - if {[tk windowingsystem] eq "win32"} { console show } -} - -###################################################################### -## -## Internationalization (i18n) through msgcat and gettext. See -## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html - -package require msgcat - -# Check for Windows 7 MUI language pack (missed by msgcat < 1.4.4) -if {[tk windowingsystem] eq "win32" - && [package vcompare [package provide msgcat] 1.4.4] < 0 -} then { - proc _mc_update_locale {} { - set key {HKEY_CURRENT_USER\Control Panel\Desktop} - if {![catch { - package require registry - set uilocale [registry get $key "PreferredUILanguages"] - msgcat::ConvertLocale [string map {- _} [lindex $uilocale 0]] - } uilocale]} { - if {[string length $uilocale] > 0} { - msgcat::mclocale $uilocale - } - } - } - _mc_update_locale -} - -proc _mc_trim {fmt} { - set cmk [string first @@ $fmt] - if {$cmk > 0} { - return [string range $fmt 0 [expr {$cmk - 1}]] - } - return $fmt -} - -proc mc {en_fmt args} { - set fmt [_mc_trim [::msgcat::mc $en_fmt]] - if {[catch {set msg [eval [list format $fmt] $args]} err]} { - set msg [eval [list format [_mc_trim $en_fmt]] $args] - } - return $msg -} - -proc strcat {args} { - return [join $args {}] -} - -::msgcat::mcload $oguimsg -unset oguimsg - -###################################################################### -## -## On Mac, bring the current Wish process window to front - -if {[tk windowingsystem] eq "aqua"} { - catch { - exec osascript -e [format { - tell application "System Events" - set frontmost of processes whose unix id is %d to true - end tell - } [pid]] - } -} - -###################################################################### -## -## read only globals - -set _appname {Git Gui} -set _gitdir {} -set _gitworktree {} -set _isbare {} -set _gitexec {} -set _githtmldir {} -set _reponame {} -set _iscygwin {} -set _search_path {} -set _shellpath {@@SHELL_PATH@@} - -set _trace [lsearch -exact $argv --trace] -if {$_trace >= 0} { - set argv [lreplace $argv $_trace $_trace] - set _trace 1 - if {[tk windowingsystem] eq "win32"} { console show } -} else { - set _trace 0 -} - -# variable for the last merged branch (useful for a default when deleting -# branches). -set _last_merged_branch {} - -proc shellpath {} { - global _shellpath env - if {[string match @@* $_shellpath]} { - if {[info exists env(SHELL)]} { - return $env(SHELL) - } else { - return /bin/sh - } - } - return $_shellpath -} - -proc appname {} { - global _appname - return $_appname -} - -proc gitdir {args} { - global _gitdir - if {$args eq {}} { - return $_gitdir - } - return [eval [list file join $_gitdir] $args] -} - -proc gitexec {args} { - global _gitexec - if {$_gitexec eq {}} { - if {[catch {set _gitexec [git --exec-path]} err]} { - error "Git not installed?\n\n$err" - } - if {[is_Cygwin]} { - set _gitexec [exec cygpath \ - --windows \ - --absolute \ - $_gitexec] - } else { - set _gitexec [file normalize $_gitexec] - } - } - if {$args eq {}} { - return $_gitexec - } - return [eval [list file join $_gitexec] $args] -} - -proc githtmldir {args} { - global _githtmldir - if {$_githtmldir eq {}} { - if {[catch {set _githtmldir [git --html-path]}]} { - # Git not installed or option not yet supported - return {} - } - if {[is_Cygwin]} { - set _githtmldir [exec cygpath \ - --windows \ - --absolute \ - $_githtmldir] - } else { - set _githtmldir [file normalize $_githtmldir] - } - } - if {$args eq {}} { - return $_githtmldir - } - return [eval [list file join $_githtmldir] $args] -} - -proc reponame {} { - return $::_reponame -} - -proc is_MacOSX {} { - if {[tk windowingsystem] eq {aqua}} { - return 1 - } - return 0 -} - -proc is_Windows {} { - if {$::tcl_platform(platform) eq {windows}} { - return 1 - } - return 0 -} - -proc is_Cygwin {} { - global _iscygwin - if {$_iscygwin eq {}} { - if {$::tcl_platform(platform) eq {windows}} { - if {[catch {set p [exec cygpath --windir]} err]} { - set _iscygwin 0 - } else { - set _iscygwin 1 - # Handle MSys2 which is only cygwin when MSYSTEM is MSYS. - if {[info exists ::env(MSYSTEM)] && $::env(MSYSTEM) ne "MSYS"} { - set _iscygwin 0 - } - } - } else { - set _iscygwin 0 - } - } - return $_iscygwin -} - -proc is_enabled {option} { - global enabled_options - if {[catch {set on $enabled_options($option)}]} {return 0} - return $on -} - -proc enable_option {option} { - global enabled_options - set enabled_options($option) 1 -} - -proc disable_option {option} { - global enabled_options - set enabled_options($option) 0 -} - -###################################################################### -## -## config - -proc is_many_config {name} { - switch -glob -- $name { - gui.recentrepo - - remote.*.fetch - - remote.*.push - {return 1} - * - {return 0} - } -} - -proc is_config_true {name} { - global repo_config - if {[catch {set v $repo_config($name)}]} { - return 0 - } - set v [string tolower $v] - if {$v eq {} || $v eq {true} || $v eq {1} || $v eq {yes} || $v eq {on}} { - return 1 - } else { - return 0 - } -} - -proc is_config_false {name} { - global repo_config - if {[catch {set v $repo_config($name)}]} { - return 0 - } - set v [string tolower $v] - if {$v eq {false} || $v eq {0} || $v eq {no} || $v eq {off}} { - return 1 - } else { - return 0 - } -} - -proc get_config {name} { - global repo_config - if {[catch {set v $repo_config($name)}]} { - return {} - } else { - return $v - } -} - -proc is_bare {} { - global _isbare - global _gitdir - global _gitworktree - - if {$_isbare eq {}} { - if {[catch { - set _bare [git rev-parse --is-bare-repository] - switch -- $_bare { - true { set _isbare 1 } - false { set _isbare 0} - default { throw } - } - }]} { - if {[is_config_true core.bare] - || ($_gitworktree eq {} - && [lindex [file split $_gitdir] end] ne {.git})} { - set _isbare 1 - } else { - set _isbare 0 - } - } - } - return $_isbare -} - -###################################################################### -## -## handy utils - -proc _trace_exec {cmd} { - if {!$::_trace} return - set d {} - foreach v $cmd { - if {$d ne {}} { - append d { } - } - if {[regexp {[ \t\r\n'"$?*]} $v]} { - set v [sq $v] - } - append d $v - } - puts stderr $d -} - -#'" fix poor old emacs font-lock mode - -proc _git_cmd {name} { - global _git_cmd_path - - if {[catch {set v $_git_cmd_path($name)}]} { - switch -- $name { - version - - --version - - --exec-path { return [list $::_git $name] } - } - - set p [gitexec git-$name$::_search_exe] - if {[file exists $p]} { - set v [list $p] - } elseif {[is_Windows] && [file exists [gitexec git-$name]]} { - # Try to determine what sort of magic will make - # git-$name go and do its thing, because native - # Tcl on Windows doesn't know it. - # - set p [gitexec git-$name] - set f [open $p r] - set s [gets $f] - close $f - - switch -glob -- [lindex $s 0] { - #!*sh { set i sh } - #!*perl { set i perl } - #!*python { set i python } - default { error "git-$name is not supported: $s" } - } - - upvar #0 _$i interp - if {![info exists interp]} { - set interp [_which $i] - } - if {$interp eq {}} { - error "git-$name requires $i (not in PATH)" - } - set v [concat [list $interp] [lrange $s 1 end] [list $p]] - } else { - # Assume it is builtin to git somehow and we - # aren't actually able to see a file for it. - # - set v [list $::_git $name] - } - set _git_cmd_path($name) $v - } - return $v -} - -proc _which {what args} { - global env _search_exe _search_path - - if {$_search_path eq {}} { - if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} { - set _search_path [split [exec cygpath \ - --windows \ - --path \ - --absolute \ - $env(PATH)] {;}] - set _search_exe .exe - } elseif {[is_Windows]} { - set gitguidir [file dirname [info script]] - regsub -all ";" $gitguidir "\\;" gitguidir - set env(PATH) "$gitguidir;$env(PATH)" - set _search_path [split $env(PATH) {;}] - set _search_exe .exe - } else { - set _search_path [split $env(PATH) :] - set _search_exe {} - } - } - - if {[is_Windows] && [lsearch -exact $args -script] >= 0} { - set suffix {} - } else { - set suffix $_search_exe - } - - foreach p $_search_path { - set p [file join $p $what$suffix] - if {[file exists $p]} { - return [file normalize $p] - } - } - return {} -} - -# Test a file for a hashbang to identify executable scripts on Windows. -proc is_shellscript {filename} { - if {![file exists $filename]} {return 0} - set f [open $filename r] - fconfigure $f -encoding binary - set magic [read $f 2] - close $f - return [expr {$magic eq "#!"}] -} - -# Run a command connected via pipes on stdout. -# This is for use with textconv filters and uses sh -c "..." to allow it to -# contain a command with arguments. On windows we must check for shell -# scripts specifically otherwise just call the filter command. -proc open_cmd_pipe {cmd path} { - global env - if {![file executable [shellpath]]} { - set exe [auto_execok [lindex $cmd 0]] - if {[is_shellscript [lindex $exe 0]]} { - set run [linsert [auto_execok sh] end -c "$cmd \"\$0\"" $path] - } else { - set run [concat $exe [lrange $cmd 1 end] $path] - } - } else { - set run [list [shellpath] -c "$cmd \"\$0\"" $path] - } - return [open |$run r] -} - -proc _lappend_nice {cmd_var} { - global _nice - upvar $cmd_var cmd - - if {![info exists _nice]} { - set _nice [_which nice] - if {[catch {exec $_nice git version}]} { - set _nice {} - } elseif {[is_Windows] && [file dirname $_nice] ne [file dirname $::_git]} { - set _nice {} - } - } - if {$_nice ne {}} { - lappend cmd $_nice - } -} - -proc git {args} { - set fd [eval [list git_read] $args] - fconfigure $fd -translation binary -encoding utf-8 - set result [string trimright [read $fd] "\n"] - close $fd - if {$::_trace} { - puts stderr "< $result" - } - return $result -} - -proc _open_stdout_stderr {cmd} { - _trace_exec $cmd - if {[catch { - set fd [open [concat [list | ] $cmd] r] - } err]} { - if { [lindex $cmd end] eq {2>@1} - && $err eq {can not find channel named "1"} - } { - # Older versions of Tcl 8.4 don't have this 2>@1 IO - # redirect operator. Fallback to |& cat for those. - # The command was not actually started, so its safe - # to try to start it a second time. - # - set fd [open [concat \ - [list | ] \ - [lrange $cmd 0 end-1] \ - [list |& cat] \ - ] r] - } else { - error $err - } - } - fconfigure $fd -eofchar {} - return $fd -} - -proc git_read {args} { - set opt [list] - - while {1} { - switch -- [lindex $args 0] { - --nice { - _lappend_nice opt - } - - --stderr { - lappend args 2>@1 - } - - default { - break - } - - } - - set args [lrange $args 1 end] - } - - set cmdp [_git_cmd [lindex $args 0]] - set args [lrange $args 1 end] - - return [_open_stdout_stderr [concat $opt $cmdp $args]] -} - -proc git_write {args} { - set opt [list] - - while {1} { - switch -- [lindex $args 0] { - --nice { - _lappend_nice opt - } - - default { - break - } - - } - - set args [lrange $args 1 end] - } - - set cmdp [_git_cmd [lindex $args 0]] - set args [lrange $args 1 end] - - _trace_exec [concat $opt $cmdp $args] - return [open [concat [list | ] $opt $cmdp $args] w] -} - -proc githook_read {hook_name args} { - set pchook [gitdir hooks $hook_name] - lappend args 2>@1 - - # On Windows [file executable] might lie so we need to ask - # the shell if the hook is executable. Yes that's annoying. - # - if {[is_Windows]} { - upvar #0 _sh interp - if {![info exists interp]} { - set interp [_which sh] - } - if {$interp eq {}} { - error "hook execution requires sh (not in PATH)" - } - - set scr {if test -x "$1";then exec "$@";fi} - set sh_c [list $interp -c $scr $interp $pchook] - return [_open_stdout_stderr [concat $sh_c $args]] - } - - if {[file executable $pchook]} { - return [_open_stdout_stderr [concat [list $pchook] $args]] - } - - return {} -} - -proc kill_file_process {fd} { - set process [pid $fd] - - catch { - if {[is_Windows]} { - exec taskkill /pid $process - } else { - exec kill $process - } - } -} - -proc gitattr {path attr default} { - if {[catch {set r [git check-attr $attr -- $path]}]} { - set r unspecified - } else { - set r [join [lrange [split $r :] 2 end] :] - regsub {^ } $r {} r - } - if {$r eq {unspecified}} { - return $default - } - return $r -} - -proc sq {value} { - regsub -all ' $value "'\\''" value - return "'$value'" -} - -proc load_current_branch {} { - global current_branch is_detached - - set fd [open [gitdir HEAD] r] - fconfigure $fd -translation binary -encoding utf-8 - if {[gets $fd ref] < 1} { - set ref {} - } - close $fd - - set pfx {ref: refs/heads/} - set len [string length $pfx] - if {[string equal -length $len $pfx $ref]} { - # We're on a branch. It might not exist. But - # HEAD looks good enough to be a branch. - # - set current_branch [string range $ref $len end] - set is_detached 0 - } else { - # Assume this is a detached head. - # - set current_branch HEAD - set is_detached 1 - } -} - -auto_load tk_optionMenu -rename tk_optionMenu real__tkOptionMenu -proc tk_optionMenu {w varName args} { - set m [eval real__tkOptionMenu $w $varName $args] - $m configure -font font_ui - $w configure -font font_ui - return $m -} - -proc rmsel_tag {text} { - $text tag conf sel \ - -background [$text cget -background] \ - -foreground [$text cget -foreground] \ - -borderwidth 0 - $text tag conf in_sel\ - -background $color::select_bg \ - -foreground $color::select_fg - bind $text <Motion> break - return $text -} - -wm withdraw . -set root_exists 0 -bind . <Visibility> { - bind . <Visibility> {} - set root_exists 1 -} - -if {[is_Windows]} { - wm iconbitmap . -default $oguilib/git-gui.ico - set ::tk::AlwaysShowSelection 1 - bind . <Control-F2> {console show} - - # Spoof an X11 display for SSH - if {![info exists env(DISPLAY)]} { - set env(DISPLAY) :9999 - } -} else { - catch { - image create photo gitlogo -width 16 -height 16 - - gitlogo put #33CC33 -to 7 0 9 2 - gitlogo put #33CC33 -to 4 2 12 4 - gitlogo put #33CC33 -to 7 4 9 6 - gitlogo put #CC3333 -to 4 6 12 8 - gitlogo put gray26 -to 4 9 6 10 - gitlogo put gray26 -to 3 10 6 12 - gitlogo put gray26 -to 8 9 13 11 - gitlogo put gray26 -to 8 11 10 12 - gitlogo put gray26 -to 11 11 13 14 - gitlogo put gray26 -to 3 12 5 14 - gitlogo put gray26 -to 5 13 - gitlogo put gray26 -to 10 13 - gitlogo put gray26 -to 4 14 12 15 - gitlogo put gray26 -to 5 15 11 16 - gitlogo redither - - image create photo gitlogo32 -width 32 -height 32 - gitlogo32 copy gitlogo -zoom 2 2 - - wm iconphoto . -default gitlogo gitlogo32 - } -} - -###################################################################### -## -## config defaults - -set cursor_ptr arrow -font create font_ui -if {[lsearch -exact [font names] TkDefaultFont] != -1} { - eval [linsert [font actual TkDefaultFont] 0 font configure font_ui] - eval [linsert [font actual TkFixedFont] 0 font create font_diff] -} else { - font create font_diff -family Courier -size 10 - catch { - label .dummy - eval font configure font_ui [font actual [.dummy cget -font]] - destroy .dummy - } -} - -font create font_uiitalic -font create font_uibold -font create font_diffbold -font create font_diffitalic - -foreach class {Button Checkbutton Entry Label - Labelframe Listbox Message - Radiobutton Spinbox Text} { - option add *$class.font font_ui -} -if {![is_MacOSX]} { - option add *Menu.font font_ui - option add *Entry.borderWidth 1 startupFile - option add *Entry.relief sunken startupFile - option add *RadioButton.anchor w startupFile -} -unset class - -if {[is_Windows] || [is_MacOSX]} { - option add *Menu.tearOff 0 -} - -if {[is_MacOSX]} { - set M1B M1 - set M1T Cmd -} else { - set M1B Control - set M1T Ctrl -} - -proc bind_button3 {w cmd} { - bind $w <Any-Button-3> $cmd - if {[is_MacOSX]} { - # Mac OS X sends Button-2 on right click through three-button mouse, - # or through trackpad right-clicking (two-finger touch + click). - bind $w <Any-Button-2> $cmd - bind $w <Control-Button-1> $cmd - } -} - -proc apply_config {} { - global repo_config font_descs - - foreach option $font_descs { - set name [lindex $option 0] - set font [lindex $option 1] - if {[catch { - set need_weight 1 - foreach {cn cv} $repo_config(gui.$name) { - if {$cn eq {-weight}} { - set need_weight 0 - } - font configure $font $cn $cv - } - if {$need_weight} { - font configure $font -weight normal - } - } err]} { - error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"] - } - foreach {cn cv} [font configure $font] { - font configure ${font}bold $cn $cv - font configure ${font}italic $cn $cv - } - font configure ${font}bold -weight bold - font configure ${font}italic -slant italic - } - - global use_ttk NS - set use_ttk 0 - set NS {} - if {$repo_config(gui.usettk)} { - set use_ttk [package vsatisfies [package provide Tk] 8.5] - if {$use_ttk} { - set NS ttk - bind [winfo class .] <<ThemeChanged>> [list InitTheme] - pave_toplevel . - color::sync_with_theme - } - } -} - -set default_config(branch.autosetupmerge) true -set default_config(merge.tool) {} -set default_config(mergetool.keepbackup) true -set default_config(merge.diffstat) true -set default_config(merge.summary) false -set default_config(merge.verbosity) 2 -set default_config(user.name) {} -set default_config(user.email) {} - -set default_config(gui.encoding) [encoding system] -set default_config(gui.matchtrackingbranch) false -set default_config(gui.textconv) true -set default_config(gui.pruneduringfetch) false -set default_config(gui.trustmtime) false -set default_config(gui.fastcopyblame) false -set default_config(gui.maxrecentrepo) 10 -set default_config(gui.copyblamethreshold) 40 -set default_config(gui.blamehistoryctx) 7 -set default_config(gui.diffcontext) 5 -set default_config(gui.diffopts) {} -set default_config(gui.commitmsgwidth) 75 -set default_config(gui.newbranchtemplate) {} -set default_config(gui.spellingdictionary) {} -set default_config(gui.fontui) [font configure font_ui] -set default_config(gui.fontdiff) [font configure font_diff] -# TODO: this option should be added to the git-config documentation -set default_config(gui.maxfilesdisplayed) 5000 -set default_config(gui.usettk) 1 -set default_config(gui.warndetachedcommit) 1 -set default_config(gui.tabsize) 8 -set font_descs { - {fontui font_ui {mc "Main Font"}} - {fontdiff font_diff {mc "Diff/Console Font"}} -} -set default_config(gui.stageuntracked) ask -set default_config(gui.displayuntracked) true - -###################################################################### -## -## find git - -set _git [_which git] -if {$_git eq {}} { - catch {wm withdraw .} - tk_messageBox \ - -icon error \ - -type ok \ - -title [mc "git-gui: fatal error"] \ - -message [mc "Cannot find git in PATH."] - exit 1 -} - -###################################################################### -## -## version check - -if {[catch {set _git_version [git --version]} err]} { - catch {wm withdraw .} - tk_messageBox \ - -icon error \ - -type ok \ - -title [mc "git-gui: fatal error"] \ - -message "Cannot determine Git version: - -$err - -[appname] requires Git 1.5.0 or later." - exit 1 -} -if {![regsub {^git version } $_git_version {} _git_version]} { - catch {wm withdraw .} - tk_messageBox \ - -icon error \ - -type ok \ - -title [mc "git-gui: fatal error"] \ - -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"] - exit 1 -} - -proc get_trimmed_version {s} { - set r {} - foreach x [split $s -._] { - if {[string is integer -strict $x]} { - lappend r $x - } else { - break - } - } - return [join $r .] -} -set _real_git_version $_git_version -set _git_version [get_trimmed_version $_git_version] - -if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { - catch {wm withdraw .} - if {[tk_messageBox \ - -icon warning \ - -type yesno \ - -default no \ - -title "[appname]: warning" \ - -message [mc "Git version cannot be determined. - -%s claims it is version '%s'. - -%s requires at least Git 1.5.0 or later. - -Assume '%s' is version 1.5.0? -" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} { - set _git_version 1.5.0 - } else { - exit 1 - } -} -unset _real_git_version - -proc git-version {args} { - global _git_version - - switch [llength $args] { - 0 { - return $_git_version - } - - 2 { - set op [lindex $args 0] - set vr [lindex $args 1] - set cm [package vcompare $_git_version $vr] - return [expr $cm $op 0] - } - - 4 { - set type [lindex $args 0] - set name [lindex $args 1] - set parm [lindex $args 2] - set body [lindex $args 3] - - if {($type ne {proc} && $type ne {method})} { - error "Invalid arguments to git-version" - } - if {[llength $body] < 2 || [lindex $body end-1] ne {default}} { - error "Last arm of $type $name must be default" - } - - foreach {op vr cb} [lrange $body 0 end-2] { - if {[git-version $op $vr]} { - return [uplevel [list $type $name $parm $cb]] - } - } - - return [uplevel [list $type $name $parm [lindex $body end]]] - } - - default { - error "git-version >= x" - } - - } -} - -if {[git-version < 1.5]} { - catch {wm withdraw .} - tk_messageBox \ - -icon error \ - -type ok \ - -title [mc "git-gui: fatal error"] \ - -message "[appname] requires Git 1.5.0 or later. - -You are using [git-version]: - -[git --version]" - exit 1 -} - -###################################################################### -## -## configure our library - -set idx [file join $oguilib tclIndex] -if {[catch {set fd [open $idx r]} err]} { - catch {wm withdraw .} - tk_messageBox \ - -icon error \ - -type ok \ - -title [mc "git-gui: fatal error"] \ - -message $err - exit 1 -} -if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} { - set idx [list] - while {[gets $fd n] >= 0} { - if {$n ne {} && ![string match #* $n]} { - lappend idx $n - } - } -} else { - set idx {} -} -close $fd - -if {$idx ne {}} { - set loaded [list] - foreach p $idx { - if {[lsearch -exact $loaded $p] >= 0} continue - source [file join $oguilib $p] - lappend loaded $p - } - unset loaded p -} else { - set auto_path [concat [list $oguilib] $auto_path] -} -unset -nocomplain idx fd - -###################################################################### -## -## config file parsing - -git-version proc _parse_config {arr_name args} { - >= 1.5.3 { - upvar $arr_name arr - array unset arr - set buf {} - catch { - set fd_rc [eval \ - [list git_read config] \ - $args \ - [list --null --list]] - fconfigure $fd_rc -translation binary -encoding utf-8 - set buf [read $fd_rc] - close $fd_rc - } - foreach line [split $buf "\0"] { - if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} { - if {[is_many_config $name]} { - lappend arr($name) $value - } else { - set arr($name) $value - } - } elseif {[regexp {^([^\n]+)$} $line line name]} { - # no value given, but interpreting them as - # boolean will be handled as true - set arr($name) {} - } - } - } - default { - upvar $arr_name arr - array unset arr - catch { - set fd_rc [eval [list git_read config --list] $args] - while {[gets $fd_rc line] >= 0} { - if {[regexp {^([^=]+)=(.*)$} $line line name value]} { - if {[is_many_config $name]} { - lappend arr($name) $value - } else { - set arr($name) $value - } - } elseif {[regexp {^([^=]+)$} $line line name]} { - # no value given, but interpreting them as - # boolean will be handled as true - set arr($name) {} - } - } - close $fd_rc - } - } -} - -proc load_config {include_global} { - global repo_config global_config system_config default_config - - if {$include_global} { - _parse_config system_config --system - _parse_config global_config --global - } - _parse_config repo_config - - foreach name [array names default_config] { - if {[catch {set v $system_config($name)}]} { - set system_config($name) $default_config($name) - } - } - foreach name [array names system_config] { - if {[catch {set v $global_config($name)}]} { - set global_config($name) $system_config($name) - } - if {[catch {set v $repo_config($name)}]} { - set repo_config($name) $system_config($name) - } - } -} - -###################################################################### -## -## feature option selection - -if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} { - unset _junk -} else { - set subcommand gui -} -if {$subcommand eq {gui.sh}} { - set subcommand gui -} -if {$subcommand eq {gui} && [llength $argv] > 0} { - set subcommand [lindex $argv 0] - set argv [lrange $argv 1 end] -} - -enable_option multicommit -enable_option branch -enable_option transport -disable_option bare - -switch -- $subcommand { -browser - -blame { - enable_option bare - - disable_option multicommit - disable_option branch - disable_option transport -} -citool { - enable_option singlecommit - enable_option retcode - - disable_option multicommit - disable_option branch - disable_option transport - - while {[llength $argv] > 0} { - set a [lindex $argv 0] - switch -- $a { - --amend { - enable_option initialamend - } - --nocommit { - enable_option nocommit - enable_option nocommitmsg - } - --commitmsg { - disable_option nocommitmsg - } - default { - break - } - } - - set argv [lrange $argv 1 end] - } -} -} - -###################################################################### -## -## execution environment - -set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}] - -# Suggest our implementation of askpass, if none is set -if {![info exists env(SSH_ASKPASS)]} { - set env(SSH_ASKPASS) [gitexec git-gui--askpass] -} - -###################################################################### -## -## repository setup - -set picked 0 -if {[catch { - set _gitdir $env(GIT_DIR) - set _prefix {} - }] - && [catch { - # beware that from the .git dir this sets _gitdir to . - # and _prefix to the empty string - set _gitdir [git rev-parse --git-dir] - set _prefix [git rev-parse --show-prefix] - } err]} { - load_config 1 - apply_config - choose_repository::pick - set picked 1 -} - -# we expand the _gitdir when it's just a single dot (i.e. when we're being -# run from the .git dir itself) lest the routines to find the worktree -# get confused -if {$_gitdir eq "."} { - set _gitdir [pwd] -} - -if {![file isdirectory $_gitdir] && [is_Cygwin]} { - catch {set _gitdir [exec cygpath --windows $_gitdir]} -} -if {![file isdirectory $_gitdir]} { - catch {wm withdraw .} - error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"] - exit 1 -} -# _gitdir exists, so try loading the config -load_config 0 -apply_config - -# v1.7.0 introduced --show-toplevel to return the canonical work-tree -if {[package vcompare $_git_version 1.7.0] >= 0} { - if { [is_Cygwin] } { - catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]} - } else { - set _gitworktree [git rev-parse --show-toplevel] - } -} else { - # try to set work tree from environment, core.worktree or use - # cdup to obtain a relative path to the top of the worktree. If - # run from the top, the ./ prefix ensures normalize expands pwd. - if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} { - set _gitworktree [get_config core.worktree] - if {$_gitworktree eq ""} { - set _gitworktree [file normalize ./[git rev-parse --show-cdup]] - } - } -} - -if {$_prefix ne {}} { - if {$_gitworktree eq {}} { - regsub -all {[^/]+/} $_prefix ../ cdup - } else { - set cdup $_gitworktree - } - if {[catch {cd $cdup} err]} { - catch {wm withdraw .} - error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"] - exit 1 - } - set _gitworktree [pwd] - unset cdup -} elseif {![is_enabled bare]} { - if {[is_bare]} { - catch {wm withdraw .} - error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"] - exit 1 - } - if {$_gitworktree eq {}} { - set _gitworktree [file dirname $_gitdir] - } - if {[catch {cd $_gitworktree} err]} { - catch {wm withdraw .} - error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"] - exit 1 - } - set _gitworktree [pwd] -} -set _reponame [file split [file normalize $_gitdir]] -if {[lindex $_reponame end] eq {.git}} { - set _reponame [lindex $_reponame end-1] -} else { - set _reponame [lindex $_reponame end] -} - -set env(GIT_DIR) $_gitdir -set env(GIT_WORK_TREE) $_gitworktree - -###################################################################### -## -## global init - -set current_diff_path {} -set current_diff_side {} -set diff_actions [list] - -set HEAD {} -set PARENT {} -set MERGE_HEAD [list] -set commit_type {} -set commit_type_is_amend 0 -set empty_tree {} -set current_branch {} -set is_detached 0 -set current_diff_path {} -set is_3way_diff 0 -set is_submodule_diff 0 -set is_conflict_diff 0 -set diff_empty_count 0 -set last_revert {} -set last_revert_enc {} - -set nullid "0000000000000000000000000000000000000000" -set nullid2 "0000000000000000000000000000000000000001" - -###################################################################### -## -## task management - -set rescan_active 0 -set diff_active 0 -set last_clicked {} - -set disable_on_lock [list] -set index_lock_type none - -proc lock_index {type} { - global index_lock_type disable_on_lock - - if {$index_lock_type eq {none}} { - set index_lock_type $type - foreach w $disable_on_lock { - uplevel #0 $w disabled - } - return 1 - } elseif {$index_lock_type eq "begin-$type"} { - set index_lock_type $type - return 1 - } - return 0 -} - -proc unlock_index {} { - global index_lock_type disable_on_lock - - set index_lock_type none - foreach w $disable_on_lock { - uplevel #0 $w normal - } -} - -###################################################################### -## -## status - -proc repository_state {ctvar hdvar mhvar} { - global current_branch - upvar $ctvar ct $hdvar hd $mhvar mh - - set mh [list] - - load_current_branch - if {[catch {set hd [git rev-parse --verify HEAD]}]} { - set hd {} - set ct initial - return - } - - set merge_head [gitdir MERGE_HEAD] - if {[file exists $merge_head]} { - set ct merge - set fd_mh [open $merge_head r] - while {[gets $fd_mh line] >= 0} { - lappend mh $line - } - close $fd_mh - return - } - - set ct normal -} - -proc PARENT {} { - global PARENT empty_tree - - set p [lindex $PARENT 0] - if {$p ne {}} { - return $p - } - if {$empty_tree eq {}} { - set empty_tree [git mktree << {}] - } - return $empty_tree -} - -proc force_amend {} { - global commit_type_is_amend - global HEAD PARENT MERGE_HEAD commit_type - - repository_state newType newHEAD newMERGE_HEAD - set HEAD $newHEAD - set PARENT $newHEAD - set MERGE_HEAD $newMERGE_HEAD - set commit_type $newType - - set commit_type_is_amend 1 - do_select_commit_type -} - -proc rescan {after {honor_trustmtime 1}} { - global HEAD PARENT MERGE_HEAD commit_type - global ui_index ui_workdir ui_comm - global rescan_active file_states - global repo_config - - if {$rescan_active > 0 || ![lock_index read]} return - - repository_state newType newHEAD newMERGE_HEAD - if {[string match amend* $commit_type] - && $newType eq {normal} - && $newHEAD eq $HEAD} { - } else { - set HEAD $newHEAD - set PARENT $newHEAD - set MERGE_HEAD $newMERGE_HEAD - set commit_type $newType - } - - array unset file_states - - if {!$::GITGUI_BCK_exists && - (![$ui_comm edit modified] - || [string trim [$ui_comm get 0.0 end]] eq {})} { - if {[string match amend* $commit_type]} { - } elseif {[load_message GITGUI_MSG utf-8]} { - } elseif {[run_prepare_commit_msg_hook]} { - } elseif {[load_message MERGE_MSG]} { - } elseif {[load_message SQUASH_MSG]} { - } - $ui_comm edit reset - $ui_comm edit modified false - } - - if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} { - rescan_stage2 {} $after - } else { - set rescan_active 1 - ui_status [mc "Refreshing file status..."] - set fd_rf [git_read update-index \ - -q \ - --unmerged \ - --ignore-missing \ - --refresh \ - ] - fconfigure $fd_rf -blocking 0 -translation binary - fileevent $fd_rf readable \ - [list rescan_stage2 $fd_rf $after] - } -} - -if {[is_Cygwin]} { - set is_git_info_exclude {} - proc have_info_exclude {} { - global is_git_info_exclude - - if {$is_git_info_exclude eq {}} { - if {[catch {exec test -f [gitdir info exclude]}]} { - set is_git_info_exclude 0 - } else { - set is_git_info_exclude 1 - } - } - return $is_git_info_exclude - } -} else { - proc have_info_exclude {} { - return [file readable [gitdir info exclude]] - } -} - -proc rescan_stage2 {fd after} { - global rescan_active buf_rdi buf_rdf buf_rlo - - if {$fd ne {}} { - read $fd - if {![eof $fd]} return - close $fd - } - - if {[package vcompare $::_git_version 1.6.3] >= 0} { - set ls_others [list --exclude-standard] - } else { - set ls_others [list --exclude-per-directory=.gitignore] - if {[have_info_exclude]} { - lappend ls_others "--exclude-from=[gitdir info exclude]" - } - set user_exclude [get_config core.excludesfile] - if {$user_exclude ne {} && [file readable $user_exclude]} { - lappend ls_others "--exclude-from=[file normalize $user_exclude]" - } - } - - set buf_rdi {} - set buf_rdf {} - set buf_rlo {} - - set rescan_active 2 - ui_status [mc "Scanning for modified files ..."] - if {[git-version >= "1.7.2"]} { - set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]] - } else { - set fd_di [git_read diff-index --cached -z [PARENT]] - } - set fd_df [git_read diff-files -z] - - fconfigure $fd_di -blocking 0 -translation binary -encoding binary - fconfigure $fd_df -blocking 0 -translation binary -encoding binary - - fileevent $fd_di readable [list read_diff_index $fd_di $after] - fileevent $fd_df readable [list read_diff_files $fd_df $after] - - if {[is_config_true gui.displayuntracked]} { - set fd_lo [eval git_read ls-files --others -z $ls_others] - fconfigure $fd_lo -blocking 0 -translation binary -encoding binary - fileevent $fd_lo readable [list read_ls_others $fd_lo $after] - incr rescan_active - } -} - -proc load_message {file {encoding {}}} { - global ui_comm - - set f [gitdir $file] - if {[file isfile $f]} { - if {[catch {set fd [open $f r]}]} { - return 0 - } - fconfigure $fd -eofchar {} - if {$encoding ne {}} { - fconfigure $fd -encoding $encoding - } - set content [string trim [read $fd]] - close $fd - regsub -all -line {[ \r\t]+$} $content {} content - $ui_comm delete 0.0 end - $ui_comm insert end $content - return 1 - } - return 0 -} - -proc run_prepare_commit_msg_hook {} { - global pch_error - - # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui - # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an - # empty file but existent file. - - set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a] - - if {[file isfile [gitdir MERGE_MSG]]} { - set pcm_source "merge" - set fd_mm [open [gitdir MERGE_MSG] r] - fconfigure $fd_mm -encoding utf-8 - puts -nonewline $fd_pcm [read $fd_mm] - close $fd_mm - } elseif {[file isfile [gitdir SQUASH_MSG]]} { - set pcm_source "squash" - set fd_sm [open [gitdir SQUASH_MSG] r] - fconfigure $fd_sm -encoding utf-8 - puts -nonewline $fd_pcm [read $fd_sm] - close $fd_sm - } else { - set pcm_source "" - } - - close $fd_pcm - - set fd_ph [githook_read prepare-commit-msg \ - [gitdir PREPARE_COMMIT_MSG] $pcm_source] - if {$fd_ph eq {}} { - catch {file delete [gitdir PREPARE_COMMIT_MSG]} - return 0; - } - - ui_status [mc "Calling prepare-commit-msg hook..."] - set pch_error {} - - fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} - fileevent $fd_ph readable \ - [list prepare_commit_msg_hook_wait $fd_ph] - - return 1; -} - -proc prepare_commit_msg_hook_wait {fd_ph} { - 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 [mc "Commit declined by prepare-commit-msg hook."] - hook_failed_popup prepare-commit-msg $pch_error - catch {file delete [gitdir PREPARE_COMMIT_MSG]} - exit 1 - } else { - load_message PREPARE_COMMIT_MSG - } - set pch_error {} - catch {file delete [gitdir PREPARE_COMMIT_MSG]} - return - } - fconfigure $fd_ph -blocking 0 - catch {file delete [gitdir PREPARE_COMMIT_MSG]} -} - -proc read_diff_index {fd after} { - global buf_rdi - - append buf_rdi [read $fd] - set c 0 - set n [string length $buf_rdi] - while {$c < $n} { - set z1 [string first "\0" $buf_rdi $c] - if {$z1 == -1} break - incr z1 - set z2 [string first "\0" $buf_rdi $z1] - if {$z2 == -1} break - - incr c - set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }] - set p [string range $buf_rdi $z1 [expr {$z2 - 1}]] - merge_state \ - [encoding convertfrom utf-8 $p] \ - [lindex $i 4]? \ - [list [lindex $i 0] [lindex $i 2]] \ - [list] - set c $z2 - incr c - } - if {$c < $n} { - set buf_rdi [string range $buf_rdi $c end] - } else { - set buf_rdi {} - } - - rescan_done $fd buf_rdi $after -} - -proc read_diff_files {fd after} { - global buf_rdf - - append buf_rdf [read $fd] - set c 0 - set n [string length $buf_rdf] - while {$c < $n} { - set z1 [string first "\0" $buf_rdf $c] - if {$z1 == -1} break - incr z1 - set z2 [string first "\0" $buf_rdf $z1] - if {$z2 == -1} break - - incr c - set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }] - set p [string range $buf_rdf $z1 [expr {$z2 - 1}]] - merge_state \ - [encoding convertfrom utf-8 $p] \ - ?[lindex $i 4] \ - [list] \ - [list [lindex $i 0] [lindex $i 2]] - set c $z2 - incr c - } - if {$c < $n} { - set buf_rdf [string range $buf_rdf $c end] - } else { - set buf_rdf {} - } - - rescan_done $fd buf_rdf $after -} - -proc read_ls_others {fd after} { - global buf_rlo - - append buf_rlo [read $fd] - set pck [split $buf_rlo "\0"] - set buf_rlo [lindex $pck end] - foreach p [lrange $pck 0 end-1] { - set p [encoding convertfrom utf-8 $p] - if {[string index $p end] eq {/}} { - set p [string range $p 0 end-1] - } - merge_state $p ?O - } - rescan_done $fd buf_rlo $after -} - -proc rescan_done {fd buf after} { - global rescan_active current_diff_path - global file_states repo_config - upvar $buf to_clear - - if {![eof $fd]} return - set to_clear {} - close $fd - if {[incr rescan_active -1] > 0} return - - prune_selection - unlock_index - display_all_files - if {$current_diff_path ne {}} { reshow_diff $after } - if {$current_diff_path eq {}} { select_first_diff $after } -} - -proc prune_selection {} { - global file_states selected_paths - - foreach path [array names selected_paths] { - if {[catch {set still_here $file_states($path)}]} { - unset selected_paths($path) - } - } -} - -###################################################################### -## -## ui helpers - -proc mapicon {w state path} { - global all_icons - - if {[catch {set r $all_icons($state$w)}]} { - puts "error: no icon for $w state={$state} $path" - return file_plain - } - return $r -} - -proc mapdesc {state path} { - global all_descs - - if {[catch {set r $all_descs($state)}]} { - puts "error: no desc for state={$state} $path" - return $state - } - return $r -} - -proc ui_status {msg} { - global main_status - if {[info exists main_status]} { - $main_status show $msg - } -} - -proc ui_ready {} { - global main_status - if {[info exists main_status]} { - $main_status show [mc "Ready."] - } -} - -proc escape_path {path} { - regsub -all {\\} $path "\\\\" path - regsub -all "\n" $path "\\n" path - return $path -} - -proc short_path {path} { - return [escape_path [lindex [file split $path] end]] -} - -set next_icon_id 0 -set null_sha1 [string repeat 0 40] - -proc merge_state {path new_state {head_info {}} {index_info {}}} { - global file_states next_icon_id null_sha1 - - set s0 [string index $new_state 0] - set s1 [string index $new_state 1] - - if {[catch {set info $file_states($path)}]} { - set state __ - set icon n[incr next_icon_id] - } else { - set state [lindex $info 0] - set icon [lindex $info 1] - if {$head_info eq {}} {set head_info [lindex $info 2]} - if {$index_info eq {}} {set index_info [lindex $info 3]} - } - - if {$s0 eq {?}} {set s0 [string index $state 0]} \ - elseif {$s0 eq {_}} {set s0 _} - - if {$s1 eq {?}} {set s1 [string index $state 1]} \ - elseif {$s1 eq {_}} {set s1 _} - - if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} { - set head_info [list 0 $null_sha1] - } elseif {$s0 ne {_} && [string index $state 0] eq {_} - && $head_info eq {}} { - set head_info $index_info - } elseif {$s0 eq {_} && [string index $state 0] ne {_}} { - set index_info $head_info - set head_info {} - } - - set file_states($path) [list $s0$s1 $icon \ - $head_info $index_info \ - ] - return $state -} - -proc display_file_helper {w path icon_name old_m new_m} { - global file_lists - - if {$new_m eq {_}} { - set lno [lsearch -sorted -exact $file_lists($w) $path] - if {$lno >= 0} { - set file_lists($w) [lreplace $file_lists($w) $lno $lno] - incr lno - $w conf -state normal - $w delete $lno.0 [expr {$lno + 1}].0 - $w conf -state disabled - } - } elseif {$old_m eq {_} && $new_m ne {_}} { - lappend file_lists($w) $path - set file_lists($w) [lsort -unique $file_lists($w)] - set lno [lsearch -sorted -exact $file_lists($w) $path] - incr lno - $w conf -state normal - $w image create $lno.0 \ - -align center -padx 5 -pady 1 \ - -name $icon_name \ - -image [mapicon $w $new_m $path] - $w insert $lno.1 "[escape_path $path]\n" - $w conf -state disabled - } elseif {$old_m ne $new_m} { - $w conf -state normal - $w image conf $icon_name -image [mapicon $w $new_m $path] - $w conf -state disabled - } -} - -proc display_file {path state} { - global file_states selected_paths - global ui_index ui_workdir - - set old_m [merge_state $path $state] - set s $file_states($path) - set new_m [lindex $s 0] - set icon_name [lindex $s 1] - - set o [string index $old_m 0] - set n [string index $new_m 0] - if {$o eq {U}} { - set o _ - } - if {$n eq {U}} { - set n _ - } - display_file_helper $ui_index $path $icon_name $o $n - - if {[string index $old_m 0] eq {U}} { - set o U - } else { - set o [string index $old_m 1] - } - if {[string index $new_m 0] eq {U}} { - set n U - } else { - set n [string index $new_m 1] - } - display_file_helper $ui_workdir $path $icon_name $o $n - - if {$new_m eq {__}} { - unset file_states($path) - catch {unset selected_paths($path)} - } -} - -proc display_all_files_helper {w path icon_name m} { - global file_lists - - lappend file_lists($w) $path - set lno [expr {[lindex [split [$w index end] .] 0] - 1}] - $w image create end \ - -align center -padx 5 -pady 1 \ - -name $icon_name \ - -image [mapicon $w $m $path] - $w insert end "[escape_path $path]\n" -} - -set files_warning 0 -proc display_all_files {} { - global ui_index ui_workdir - global file_states file_lists - global last_clicked - global files_warning - - $ui_index conf -state normal - $ui_workdir conf -state normal - - $ui_index delete 0.0 end - $ui_workdir delete 0.0 end - set last_clicked {} - - set file_lists($ui_index) [list] - set file_lists($ui_workdir) [list] - - set to_display [lsort [array names file_states]] - set display_limit [get_config gui.maxfilesdisplayed] - set displayed 0 - foreach path $to_display { - set s $file_states($path) - set m [lindex $s 0] - set icon_name [lindex $s 1] - - if {$displayed > $display_limit && [string index $m 1] eq {O} } { - if {!$files_warning} { - # do not repeatedly warn: - set files_warning 1 - info_popup [mc "Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." \ - $display_limit [llength $to_display]] - } - continue - } - - set s [string index $m 0] - if {$s ne {U} && $s ne {_}} { - display_all_files_helper $ui_index $path \ - $icon_name $s - } - - if {[string index $m 0] eq {U}} { - set s U - } else { - set s [string index $m 1] - } - if {$s ne {_}} { - display_all_files_helper $ui_workdir $path \ - $icon_name $s - incr displayed - } - } - - $ui_index conf -state disabled - $ui_workdir conf -state disabled -} - -###################################################################### -## -## icons - -set filemask { -#define mask_width 14 -#define mask_height 15 -static unsigned char mask_bits[] = { - 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, - 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, - 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f}; -} - -image create bitmap file_plain -background white -foreground black -data { -#define plain_width 14 -#define plain_height 15 -static unsigned char plain_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, - 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, - 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; -} -maskdata $filemask - -image create bitmap file_mod -background white -foreground blue -data { -#define mod_width 14 -#define mod_height 15 -static unsigned char mod_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, - 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, - 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; -} -maskdata $filemask - -image create bitmap file_fulltick -background white -foreground "#007000" -data { -#define file_fulltick_width 14 -#define file_fulltick_height 15 -static unsigned char file_fulltick_bits[] = { - 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16, - 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10, - 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; -} -maskdata $filemask - -image create bitmap file_question -background white -foreground black -data { -#define file_question_width 14 -#define file_question_height 15 -static unsigned char file_question_bits[] = { - 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13, - 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10, - 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; -} -maskdata $filemask - -image create bitmap file_removed -background white -foreground red -data { -#define file_removed_width 14 -#define file_removed_height 15 -static unsigned char file_removed_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, - 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13, - 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f}; -} -maskdata $filemask - -image create bitmap file_merge -background white -foreground blue -data { -#define file_merge_width 14 -#define file_merge_height 15 -static unsigned char file_merge_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10, - 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, - 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; -} -maskdata $filemask - -image create bitmap file_statechange -background white -foreground green -data { -#define file_statechange_width 14 -#define file_statechange_height 15 -static unsigned char file_statechange_bits[] = { - 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10, - 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, - 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; -} -maskdata $filemask - -set ui_index .vpane.files.index.list -set ui_workdir .vpane.files.workdir.list - -set all_icons(_$ui_index) file_plain -set all_icons(A$ui_index) file_plain -set all_icons(M$ui_index) file_fulltick -set all_icons(D$ui_index) file_removed -set all_icons(U$ui_index) file_merge -set all_icons(T$ui_index) file_statechange - -set all_icons(_$ui_workdir) file_plain -set all_icons(M$ui_workdir) file_mod -set all_icons(D$ui_workdir) file_question -set all_icons(U$ui_workdir) file_merge -set all_icons(O$ui_workdir) file_plain -set all_icons(T$ui_workdir) file_statechange - -set max_status_desc 0 -foreach i { - {__ {mc "Unmodified"}} - - {_M {mc "Modified, not staged"}} - {M_ {mc "Staged for commit"}} - {MM {mc "Portions staged for commit"}} - {MD {mc "Staged for commit, missing"}} - - {_T {mc "File type changed, not staged"}} - {MT {mc "File type changed, old type staged for commit"}} - {AT {mc "File type changed, old type staged for commit"}} - {T_ {mc "File type changed, staged"}} - {TM {mc "File type change staged, modification not staged"}} - {TD {mc "File type change staged, file missing"}} - - {_O {mc "Untracked, not staged"}} - {A_ {mc "Staged for commit"}} - {AM {mc "Portions staged for commit"}} - {AD {mc "Staged for commit, missing"}} - - {_D {mc "Missing"}} - {D_ {mc "Staged for removal"}} - {DO {mc "Staged for removal, still present"}} - - {_U {mc "Requires merge resolution"}} - {U_ {mc "Requires merge resolution"}} - {UU {mc "Requires merge resolution"}} - {UM {mc "Requires merge resolution"}} - {UD {mc "Requires merge resolution"}} - {UT {mc "Requires merge resolution"}} - } { - set text [eval [lindex $i 1]] - if {$max_status_desc < [string length $text]} { - set max_status_desc [string length $text] - } - set all_descs([lindex $i 0]) $text -} -unset i - -###################################################################### -## -## util - -proc scrollbar2many {list mode args} { - foreach w $list {eval $w $mode $args} -} - -proc many2scrollbar {list mode sb top bottom} { - $sb set $top $bottom - foreach w $list {$w $mode moveto $top} -} - -proc incr_font_size {font {amt 1}} { - set sz [font configure $font -size] - incr sz $amt - font configure $font -size $sz - font configure ${font}bold -size $sz - font configure ${font}italic -size $sz -} - -###################################################################### -## -## ui commands - -proc do_gitk {revs {is_submodule false}} { - global current_diff_path file_states current_diff_side ui_index - global _gitdir _gitworktree - - # -- Always start gitk through whatever we were loaded with. This - # lets us bypass using shell process on Windows systems. - # - set exe [_which gitk -script] - set cmd [list [info nameofexecutable] $exe] - if {$exe eq {}} { - error_popup [mc "Couldn't find gitk in PATH"] - } else { - global env - - set pwd [pwd] - - if {!$is_submodule} { - if {![is_bare]} { - cd $_gitworktree - } - } else { - cd $current_diff_path - if {$revs eq {--}} { - set s $file_states($current_diff_path) - set old_sha1 {} - set new_sha1 {} - switch -glob -- [lindex $s 0] { - M_ { set old_sha1 [lindex [lindex $s 2] 1] } - _M { set old_sha1 [lindex [lindex $s 3] 1] } - MM { - if {$current_diff_side eq $ui_index} { - set old_sha1 [lindex [lindex $s 2] 1] - set new_sha1 [lindex [lindex $s 3] 1] - } else { - set old_sha1 [lindex [lindex $s 3] 1] - } - } - } - set revs $old_sha1...$new_sha1 - } - # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones - # we've been using for the main repository, so unset them. - # TODO we could make life easier (start up faster?) for gitk - # by setting these to the appropriate values to allow gitk - # to skip the heuristics to find their proper value - unset env(GIT_DIR) - unset env(GIT_WORK_TREE) - } - eval exec $cmd $revs "--" "--" & - - set env(GIT_DIR) $_gitdir - set env(GIT_WORK_TREE) $_gitworktree - cd $pwd - - if {[info exists main_status]} { - set status_operation [$::main_status \ - start \ - [mc "Starting %s... please wait..." "gitk"]] - - after 3500 [list $status_operation stop] - } - } -} - -proc do_git_gui {} { - global current_diff_path - - # -- Always start git gui through whatever we were loaded with. This - # lets us bypass using shell process on Windows systems. - # - set exe [list [_which git]] - if {$exe eq {}} { - error_popup [mc "Couldn't find git gui in PATH"] - } else { - global env - global _gitdir _gitworktree - - # see note in do_gitk about unsetting these vars when - # running tools in a submodule - unset env(GIT_DIR) - unset env(GIT_WORK_TREE) - - set pwd [pwd] - cd $current_diff_path - - eval exec $exe gui & - - set env(GIT_DIR) $_gitdir - set env(GIT_WORK_TREE) $_gitworktree - cd $pwd - - set status_operation [$::main_status \ - start \ - [mc "Starting %s... please wait..." "git-gui"]] - - after 3500 [list $status_operation stop] - } -} - -# Get the system-specific explorer app/command. -proc get_explorer {} { - if {[is_Cygwin] || [is_Windows]} { - set explorer "explorer.exe" - } elseif {[is_MacOSX]} { - set explorer "open" - } else { - # freedesktop.org-conforming system is our best shot - set explorer "xdg-open" - } - return $explorer -} - -proc do_explore {} { - global _gitworktree - set explorer [get_explorer] - eval exec $explorer [list [file nativename $_gitworktree]] & -} - -# Open file relative to the working tree by the default associated app. -proc do_file_open {file} { - global _gitworktree - set explorer [get_explorer] - set full_file_path [file join $_gitworktree $file] - exec $explorer [file nativename $full_file_path] & -} - -set is_quitting 0 -set ret_code 1 - -proc terminate_me {win} { - global ret_code - if {$win ne {.}} return - exit $ret_code -} - -proc do_quit {{rc {1}}} { - global ui_comm is_quitting repo_config commit_type - global GITGUI_BCK_exists GITGUI_BCK_i - global ui_comm_spell - global ret_code use_ttk - - if {$is_quitting} return - set is_quitting 1 - - if {[winfo exists $ui_comm]} { - # -- Stash our current commit buffer. - # - set save [gitdir GITGUI_MSG] - if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { - file rename -force [gitdir GITGUI_BCK] $save - set GITGUI_BCK_exists 0 - } else { - set msg [string trim [$ui_comm get 0.0 end]] - regsub -all -line {[ \r\t]+$} $msg {} msg - if {(![string match amend* $commit_type] - || [$ui_comm edit modified]) - && $msg ne {}} { - catch { - set fd [open $save w] - fconfigure $fd -encoding utf-8 - puts -nonewline $fd $msg - close $fd - } - } else { - catch {file delete $save} - } - } - - # -- Cancel our spellchecker if its running. - # - if {[info exists ui_comm_spell]} { - $ui_comm_spell stop - } - - # -- Remove our editor backup, its not needed. - # - after cancel $GITGUI_BCK_i - if {$GITGUI_BCK_exists} { - catch {file delete [gitdir GITGUI_BCK]} - } - - # -- Stash our current window geometry into this repository. - # - set cfg_wmstate [wm state .] - if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} { - set rc_wmstate {} - } - if {$cfg_wmstate ne $rc_wmstate} { - catch {git config gui.wmstate $cfg_wmstate} - } - if {$cfg_wmstate eq {zoomed}} { - # on Windows wm geometry will lie about window - # position (but not size) when window is zoomed - # restore the window before querying wm geometry - wm state . normal - } - set cfg_geometry [list] - lappend cfg_geometry [wm geometry .] - if {$use_ttk} { - lappend cfg_geometry [.vpane sashpos 0] - lappend cfg_geometry [.vpane.files sashpos 0] - } else { - lappend cfg_geometry [lindex [.vpane sash coord 0] 0] - lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1] - } - if {[catch {set rc_geometry $repo_config(gui.geometry)}]} { - set rc_geometry {} - } - if {$cfg_geometry ne $rc_geometry} { - catch {git config gui.geometry $cfg_geometry} - } - } - - set ret_code $rc - - # Briefly enable send again, working around Tk bug - # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997 - tk appname [appname] - - destroy . -} - -proc do_rescan {} { - rescan ui_ready -} - -proc ui_do_rescan {} { - rescan {force_first_diff ui_ready} -} - -proc do_commit {} { - commit_tree -} - -proc next_diff {{after {}}} { - global next_diff_p next_diff_w next_diff_i - show_diff $next_diff_p $next_diff_w {} {} $after -} - -proc find_anchor_pos {lst name} { - set lid [lsearch -sorted -exact $lst $name] - - if {$lid == -1} { - set lid 0 - foreach lname $lst { - if {$lname >= $name} break - incr lid - } - } - - return $lid -} - -proc find_file_from {flist idx delta path mmask} { - global file_states - - set len [llength $flist] - while {$idx >= 0 && $idx < $len} { - set name [lindex $flist $idx] - - if {$name ne $path && [info exists file_states($name)]} { - set state [lindex $file_states($name) 0] - - if {$mmask eq {} || [regexp $mmask $state]} { - return $idx - } - } - - incr idx $delta - } - - return {} -} - -proc find_next_diff {w path {lno {}} {mmask {}}} { - global next_diff_p next_diff_w next_diff_i - global file_lists ui_index ui_workdir - - set flist $file_lists($w) - if {$lno eq {}} { - set lno [find_anchor_pos $flist $path] - } else { - incr lno -1 - } - - if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} { - if {$w eq $ui_index} { - set mmask "^$mmask" - } else { - set mmask "$mmask\$" - } - } - - set idx [find_file_from $flist $lno 1 $path $mmask] - if {$idx eq {}} { - incr lno -1 - set idx [find_file_from $flist $lno -1 $path $mmask] - } - - if {$idx ne {}} { - set next_diff_w $w - set next_diff_p [lindex $flist $idx] - set next_diff_i [expr {$idx+1}] - return 1 - } else { - return 0 - } -} - -proc next_diff_after_action {w path {lno {}} {mmask {}}} { - global current_diff_path - - if {$path ne $current_diff_path} { - return {} - } elseif {[find_next_diff $w $path $lno $mmask]} { - return {next_diff;} - } else { - return {reshow_diff;} - } -} - -proc select_first_diff {after} { - global ui_workdir - - if {[find_next_diff $ui_workdir {} 1 {^_?U}] || - [find_next_diff $ui_workdir {} 1 {[^O]$}]} { - next_diff $after - } else { - uplevel #0 $after - } -} - -proc force_first_diff {after} { - global ui_workdir current_diff_path file_states - - if {[info exists file_states($current_diff_path)]} { - set state [lindex $file_states($current_diff_path) 0] - } else { - set state {OO} - } - - set reselect 0 - if {[string first {U} $state] >= 0} { - # Already a conflict, do nothing - } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} { - set reselect 1 - } elseif {[string index $state 1] ne {O}} { - # Already a diff & no conflicts, do nothing - } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} { - set reselect 1 - } - - if {$reselect} { - next_diff $after - } else { - uplevel #0 $after - } -} - -proc toggle_or_diff {mode w args} { - global file_states file_lists current_diff_path ui_index ui_workdir - global last_clicked selected_paths file_lists_last_clicked - - if {$mode eq "click"} { - foreach {x y} $args break - set pos [split [$w index @$x,$y] .] - foreach {lno col} $pos break - } else { - if {$mode eq "toggle"} { - if {$w eq $ui_workdir} { - do_add_selection - set last_clicked {} - return - } - if {$w eq $ui_index} { - do_unstage_selection - set last_clicked {} - return - } - } - - if {$last_clicked ne {}} { - set lno [lindex $last_clicked 1] - } else { - if {![info exists file_lists] - || ![info exists file_lists($w)] - || [llength $file_lists($w)] == 0} { - set last_clicked {} - return - } - set lno [expr {int([lindex [$w tag ranges in_diff] 0])}] - } - if {$mode eq "toggle"} { - set col 0; set y 2 - } else { - incr lno [expr {$mode eq "up" ? -1 : 1}] - set col 1 - } - } - - if {![info exists file_lists] - || ![info exists file_lists($w)] - || [llength $file_lists($w)] < $lno - 1} { - set path {} - } else { - set path [lindex $file_lists($w) [expr {$lno - 1}]] - } - if {$path eq {}} { - set last_clicked {} - return - } - - set last_clicked [list $w $lno] - focus $w - array unset selected_paths - $ui_index tag remove in_sel 0.0 end - $ui_workdir tag remove in_sel 0.0 end - - set file_lists_last_clicked($w) $path - - # Determine the state of the file - if {[info exists file_states($path)]} { - set state [lindex $file_states($path) 0] - } else { - set state {__} - } - - # Restage the file, or simply show the diff - if {$col == 0 && $y > 1} { - # Conflicts need special handling - if {[string first {U} $state] >= 0} { - # $w must always be $ui_workdir, but... - if {$w ne $ui_workdir} { set lno {} } - merge_stage_workdir $path $lno - return - } - - if {[string index $state 1] eq {O}} { - set mmask {} - } else { - set mmask {[^O]} - } - - set after [next_diff_after_action $w $path $lno $mmask] - - if {$w eq $ui_index} { - update_indexinfo \ - "Unstaging [short_path $path] from commit" \ - [list $path] \ - [concat $after {ui_ready;}] - } elseif {$w eq $ui_workdir} { - update_index \ - "Adding [short_path $path]" \ - [list $path] \ - [concat $after {ui_ready;}] - } - } else { - set selected_paths($path) 1 - show_diff $path $w $lno - } -} - -proc add_one_to_selection {w x y} { - global file_lists last_clicked selected_paths - - set lno [lindex [split [$w index @$x,$y] .] 0] - set path [lindex $file_lists($w) [expr {$lno - 1}]] - if {$path eq {}} { - set last_clicked {} - return - } - - if {$last_clicked ne {} - && [lindex $last_clicked 0] ne $w} { - array unset selected_paths - [lindex $last_clicked 0] tag remove in_sel 0.0 end - } - - set last_clicked [list $w $lno] - if {[catch {set in_sel $selected_paths($path)}]} { - set in_sel 0 - } - if {$in_sel} { - unset selected_paths($path) - $w tag remove in_sel $lno.0 [expr {$lno + 1}].0 - } else { - set selected_paths($path) 1 - $w tag add in_sel $lno.0 [expr {$lno + 1}].0 - } -} - -proc add_range_to_selection {w x y} { - global file_lists last_clicked selected_paths - - if {[lindex $last_clicked 0] ne $w} { - toggle_or_diff click $w $x $y - return - } - - set lno [lindex [split [$w index @$x,$y] .] 0] - set lc [lindex $last_clicked 1] - if {$lc < $lno} { - set begin $lc - set end $lno - } else { - set begin $lno - set end $lc - } - - foreach path [lrange $file_lists($w) \ - [expr {$begin - 1}] \ - [expr {$end - 1}]] { - set selected_paths($path) 1 - } - $w tag add in_sel $begin.0 [expr {$end + 1}].0 -} - -proc show_more_context {} { - global repo_config - if {$repo_config(gui.diffcontext) < 99} { - incr repo_config(gui.diffcontext) - reshow_diff - } -} - -proc show_less_context {} { - global repo_config - if {$repo_config(gui.diffcontext) > 1} { - incr repo_config(gui.diffcontext) -1 - reshow_diff - } -} - -proc focus_widget {widget} { - global file_lists last_clicked selected_paths - global file_lists_last_clicked - - if {[llength $file_lists($widget)] > 0} { - set path $file_lists_last_clicked($widget) - set index [lsearch -sorted -exact $file_lists($widget) $path] - if {$index < 0} { - set index 0 - set path [lindex $file_lists($widget) $index] - } - - focus $widget - set last_clicked [list $widget [expr $index + 1]] - array unset selected_paths - set selected_paths($path) 1 - show_diff $path $widget - } -} - -proc toggle_commit_type {} { - global commit_type_is_amend - set commit_type_is_amend [expr !$commit_type_is_amend] - do_select_commit_type -} - -###################################################################### -## -## ui construction - -set ui_comm {} - -# -- Menu Bar -# -menu .mbar -tearoff 0 -if {[is_MacOSX]} { - # -- Apple Menu (Mac OS X only) - # - .mbar add cascade -label Apple -menu .mbar.apple - menu .mbar.apple -} -.mbar add cascade -label [mc Repository] -menu .mbar.repository -.mbar add cascade -label [mc Edit] -menu .mbar.edit -if {[is_enabled branch]} { - .mbar add cascade -label [mc Branch] -menu .mbar.branch -} -if {[is_enabled multicommit] || [is_enabled singlecommit]} { - .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit -} -if {[is_enabled transport]} { - .mbar add cascade -label [mc Merge] -menu .mbar.merge - .mbar add cascade -label [mc Remote] -menu .mbar.remote -} -if {[is_enabled multicommit] || [is_enabled singlecommit]} { - .mbar add cascade -label [mc Tools] -menu .mbar.tools -} - -# -- Repository Menu -# -menu .mbar.repository - -if {![is_bare]} { - .mbar.repository add command \ - -label [mc "Explore Working Copy"] \ - -command {do_explore} -} - -if {[is_Windows]} { - # Use /git-bash.exe if available - set normalized [file normalize $::argv0] - regsub "/mingw../libexec/git-core/git-gui$" \ - $normalized "/git-bash.exe" cmdLine - if {$cmdLine != $normalized && [file exists $cmdLine]} { - set cmdLine [list "Git Bash" $cmdLine &] - } else { - set cmdLine [list "Git Bash" bash --login -l &] - } - .mbar.repository add command \ - -label [mc "Git Bash"] \ - -command {eval exec [auto_execok start] $cmdLine} -} - -if {[is_Windows] || ![is_bare]} { - .mbar.repository add separator -} - -.mbar.repository add command \ - -label [mc "Browse Current Branch's Files"] \ - -command {browser::new $current_branch} -set ui_browse_current [.mbar.repository index last] -.mbar.repository add command \ - -label [mc "Browse Branch Files..."] \ - -command browser_open::dialog -.mbar.repository add separator - -.mbar.repository add command \ - -label [mc "Visualize Current Branch's History"] \ - -command {do_gitk $current_branch} -set ui_visualize_current [.mbar.repository index last] -.mbar.repository add command \ - -label [mc "Visualize All Branch History"] \ - -command {do_gitk --all} -.mbar.repository add separator - -proc current_branch_write {args} { - global current_branch - .mbar.repository entryconf $::ui_browse_current \ - -label [mc "Browse %s's Files" $current_branch] - .mbar.repository entryconf $::ui_visualize_current \ - -label [mc "Visualize %s's History" $current_branch] -} -trace add variable current_branch write current_branch_write - -if {[is_enabled multicommit]} { - .mbar.repository add command -label [mc "Database Statistics"] \ - -command do_stats - - .mbar.repository add command -label [mc "Compress Database"] \ - -command do_gc - - .mbar.repository add command -label [mc "Verify Database"] \ - -command do_fsck_objects - - .mbar.repository add separator - - if {[is_Cygwin]} { - .mbar.repository add command \ - -label [mc "Create Desktop Icon"] \ - -command do_cygwin_shortcut - } elseif {[is_Windows]} { - .mbar.repository add command \ - -label [mc "Create Desktop Icon"] \ - -command do_windows_shortcut - } elseif {[is_MacOSX]} { - .mbar.repository add command \ - -label [mc "Create Desktop Icon"] \ - -command do_macosx_app - } -} - -if {[is_MacOSX]} { - proc ::tk::mac::Quit {args} { do_quit } -} else { - .mbar.repository add command -label [mc Quit] \ - -command do_quit \ - -accelerator $M1T-Q -} - -# -- Edit Menu -# -menu .mbar.edit -.mbar.edit add command -label [mc Undo] \ - -command {catch {[focus] edit undo}} \ - -accelerator $M1T-Z -.mbar.edit add command -label [mc Redo] \ - -command {catch {[focus] edit redo}} \ - -accelerator $M1T-Y -.mbar.edit add separator -.mbar.edit add command -label [mc Cut] \ - -command {catch {tk_textCut [focus]}} \ - -accelerator $M1T-X -.mbar.edit add command -label [mc Copy] \ - -command {catch {tk_textCopy [focus]}} \ - -accelerator $M1T-C -.mbar.edit add command -label [mc Paste] \ - -command {catch {tk_textPaste [focus]; [focus] see insert}} \ - -accelerator $M1T-V -.mbar.edit add command -label [mc Delete] \ - -command {catch {[focus] delete sel.first sel.last}} \ - -accelerator Del -.mbar.edit add separator -.mbar.edit add command -label [mc "Select All"] \ - -command {catch {[focus] tag add sel 0.0 end}} \ - -accelerator $M1T-A - -# -- Branch Menu -# -if {[is_enabled branch]} { - menu .mbar.branch - - .mbar.branch add command -label [mc "Create..."] \ - -command branch_create::dialog \ - -accelerator $M1T-N - lappend disable_on_lock [list .mbar.branch entryconf \ - [.mbar.branch index last] -state] - - .mbar.branch add command -label [mc "Checkout..."] \ - -command branch_checkout::dialog \ - -accelerator $M1T-O - lappend disable_on_lock [list .mbar.branch entryconf \ - [.mbar.branch index last] -state] - - .mbar.branch add command -label [mc "Rename..."] \ - -command branch_rename::dialog - lappend disable_on_lock [list .mbar.branch entryconf \ - [.mbar.branch index last] -state] - - .mbar.branch add command -label [mc "Delete..."] \ - -command branch_delete::dialog - lappend disable_on_lock [list .mbar.branch entryconf \ - [.mbar.branch index last] -state] - - .mbar.branch add command -label [mc "Reset..."] \ - -command merge::reset_hard - lappend disable_on_lock [list .mbar.branch entryconf \ - [.mbar.branch index last] -state] -} - -# -- Commit Menu -# -proc commit_btn_caption {} { - if {[is_enabled nocommit]} { - return [mc "Done"] - } else { - return [mc Commit@@verb] - } -} - -if {[is_enabled multicommit] || [is_enabled singlecommit]} { - menu .mbar.commit - - if {![is_enabled nocommit]} { - .mbar.commit add checkbutton \ - -label [mc "Amend Last Commit"] \ - -accelerator $M1T-E \ - -variable commit_type_is_amend \ - -command do_select_commit_type - lappend disable_on_lock \ - [list .mbar.commit entryconf [.mbar.commit index last] -state] - - .mbar.commit add separator - } - - .mbar.commit add command -label [mc Rescan] \ - -command ui_do_rescan \ - -accelerator F5 - lappend disable_on_lock \ - [list .mbar.commit entryconf [.mbar.commit index last] -state] - - .mbar.commit add command -label [mc "Stage To Commit"] \ - -command do_add_selection \ - -accelerator $M1T-T - lappend disable_on_lock \ - [list .mbar.commit entryconf [.mbar.commit index last] -state] - - .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \ - -command do_add_all \ - -accelerator $M1T-I - lappend disable_on_lock \ - [list .mbar.commit entryconf [.mbar.commit index last] -state] - - .mbar.commit add command -label [mc "Unstage From Commit"] \ - -command do_unstage_selection \ - -accelerator $M1T-U - lappend disable_on_lock \ - [list .mbar.commit entryconf [.mbar.commit index last] -state] - - .mbar.commit add command -label [mc "Revert Changes"] \ - -command do_revert_selection \ - -accelerator $M1T-J - lappend disable_on_lock \ - [list .mbar.commit entryconf [.mbar.commit index last] -state] - - .mbar.commit add separator - - .mbar.commit add command -label [mc "Show Less Context"] \ - -command show_less_context \ - -accelerator $M1T-\- - - .mbar.commit add command -label [mc "Show More Context"] \ - -command show_more_context \ - -accelerator $M1T-= - - .mbar.commit add separator - - if {![is_enabled nocommitmsg]} { - .mbar.commit add command -label [mc "Sign Off"] \ - -command do_signoff \ - -accelerator $M1T-S - } - - .mbar.commit add command -label [commit_btn_caption] \ - -command do_commit \ - -accelerator $M1T-Return - lappend disable_on_lock \ - [list .mbar.commit entryconf [.mbar.commit index last] -state] -} - -# -- Merge Menu -# -if {[is_enabled branch]} { - menu .mbar.merge - .mbar.merge add command -label [mc "Local Merge..."] \ - -command merge::dialog \ - -accelerator $M1T-M - lappend disable_on_lock \ - [list .mbar.merge entryconf [.mbar.merge index last] -state] - .mbar.merge add command -label [mc "Abort Merge..."] \ - -command merge::reset_hard - lappend disable_on_lock \ - [list .mbar.merge entryconf [.mbar.merge index last] -state] -} - -# -- Transport Menu -# -if {[is_enabled transport]} { - menu .mbar.remote - - .mbar.remote add command \ - -label [mc "Add..."] \ - -command remote_add::dialog \ - -accelerator $M1T-A - .mbar.remote add command \ - -label [mc "Push..."] \ - -command do_push_anywhere \ - -accelerator $M1T-P - .mbar.remote add command \ - -label [mc "Delete Branch..."] \ - -command remote_branch_delete::dialog -} - -if {[is_MacOSX]} { - proc ::tk::mac::ShowPreferences {} {do_options} -} else { - # -- Edit Menu - # - .mbar.edit add separator - .mbar.edit add command -label [mc "Options..."] \ - -command do_options -} - -# -- Tools Menu -# -if {[is_enabled multicommit] || [is_enabled singlecommit]} { - set tools_menubar .mbar.tools - menu $tools_menubar - $tools_menubar add separator - $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog - $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog - set tools_tailcnt 3 - if {[array names repo_config guitool.*.cmd] ne {}} { - tools_populate_all - } -} - -# -- Help Menu -# -.mbar add cascade -label [mc Help] -menu .mbar.help -menu .mbar.help - -if {[is_MacOSX]} { - .mbar.apple add command -label [mc "About %s" [appname]] \ - -command do_about - .mbar.apple add separator -} else { - .mbar.help add command -label [mc "About %s" [appname]] \ - -command do_about -} -. configure -menu .mbar - -set doc_path [githtmldir] -if {$doc_path ne {}} { - set doc_path [file join $doc_path index.html] - - if {[is_Cygwin]} { - set doc_path [exec cygpath --mixed $doc_path] - } -} - -if {[file isfile $doc_path]} { - set doc_url "file:$doc_path" -} else { - set doc_url {http://www.kernel.org/pub/software/scm/git/docs/} -} - -proc start_browser {url} { - git "web--browse" $url -} - -.mbar.help add command -label [mc "Online Documentation"] \ - -command [list start_browser $doc_url] - -.mbar.help add command -label [mc "Show SSH Key"] \ - -command do_ssh_key - -unset doc_path doc_url - -# -- Standard bindings -# -wm protocol . WM_DELETE_WINDOW do_quit -bind all <$M1B-Key-q> do_quit -bind all <$M1B-Key-Q> do_quit - -set m1b_w_script { - set toplvl_win [winfo toplevel %W] - - # If we are destroying the main window, we should call do_quit to take - # care of cleanup before exiting the program. - if {$toplvl_win eq "."} { - do_quit - } else { - destroy $toplvl_win - } -} - -bind all <$M1B-Key-w> $m1b_w_script -bind all <$M1B-Key-W> $m1b_w_script - -unset m1b_w_script - -set subcommand_args {} -proc usage {} { - set s "[mc usage:] $::argv0 $::subcommand $::subcommand_args" - if {[tk windowingsystem] eq "win32"} { - wm withdraw . - tk_messageBox -icon info -message $s \ - -title [mc "Usage"] - } else { - puts stderr $s - } - exit 1 -} - -proc normalize_relpath {path} { - set elements {} - foreach item [file split $path] { - if {$item eq {.}} continue - if {$item eq {..} && [llength $elements] > 0 - && [lindex $elements end] ne {..}} { - set elements [lrange $elements 0 end-1] - continue - } - lappend elements $item - } - return [eval file join $elements] -} - -# -- Not a normal commit type invocation? Do that instead! -# -switch -- $subcommand { -browser - -blame { - if {$subcommand eq "blame"} { - set subcommand_args {[--line=<num>] rev? path} - } else { - set subcommand_args {rev? path} - } - if {$argv eq {}} usage - set head {} - set path {} - set jump_spec {} - set is_path 0 - foreach a $argv { - set p [file join $_prefix $a] - - if {$is_path || [file exists $p]} { - if {$path ne {}} usage - set path [normalize_relpath $p] - break - } elseif {$a eq {--}} { - if {$path ne {}} { - if {$head ne {}} usage - set head $path - set path {} - } - set is_path 1 - } elseif {[regexp {^--line=(\d+)$} $a a lnum]} { - if {$jump_spec ne {} || $head ne {}} usage - set jump_spec [list $lnum] - } elseif {$head eq {}} { - if {$head ne {}} usage - set head $a - set is_path 1 - } else { - usage - } - } - unset is_path - - if {$head ne {} && $path eq {}} { - if {[string index $head 0] eq {/}} { - set path [normalize_relpath $head] - set head {} - } else { - set path [normalize_relpath $_prefix$head] - set head {} - } - } - - if {$head eq {}} { - load_current_branch - } else { - if {[regexp {^[0-9a-f]{1,39}$} $head]} { - if {[catch { - set head [git rev-parse --verify $head] - } err]} { - if {[tk windowingsystem] eq "win32"} { - tk_messageBox -icon error -title [mc Error] -message $err - } else { - puts stderr $err - } - exit 1 - } - } - set current_branch $head - } - - wm deiconify . - switch -- $subcommand { - browser { - if {$jump_spec ne {}} usage - if {$head eq {}} { - if {$path ne {} && [file isdirectory $path]} { - set head $current_branch - } else { - set head $path - set path {} - } - } - browser::new $head $path - } - blame { - if {$head eq {} && ![file exists $path]} { - catch {wm withdraw .} - tk_messageBox \ - -icon error \ - -type ok \ - -title [mc "git-gui: fatal error"] \ - -message [mc "fatal: cannot stat path %s: No such file or directory" $path] - exit 1 - } - blame::new $head $path $jump_spec - } - } - return -} -citool - -gui { - if {[llength $argv] != 0} { - usage - } - # fall through to setup UI for commits -} -default { - set err "[mc usage:] $argv0 \[{blame|browser|citool}\]" - if {[tk windowingsystem] eq "win32"} { - wm withdraw . - tk_messageBox -icon error -message $err \ - -title [mc "Usage"] - } else { - puts stderr $err - } - exit 1 -} -} - -# -- Branch Control -# -${NS}::frame .branch -if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken} -${NS}::label .branch.l1 \ - -text [mc "Current Branch:"] \ - -anchor w \ - -justify left -${NS}::label .branch.cb \ - -textvariable current_branch \ - -anchor w \ - -justify left -pack .branch.l1 -side left -pack .branch.cb -side left -fill x -pack .branch -side top -fill x - -# -- Main Window Layout -# -${NS}::panedwindow .vpane -orient horizontal -${NS}::panedwindow .vpane.files -orient vertical -if {$use_ttk} { - .vpane add .vpane.files -} else { - .vpane add .vpane.files -sticky nsew -height 100 -width 200 -} -pack .vpane -anchor n -side top -fill both -expand 1 - -# -- Working Directory File List - -textframe .vpane.files.workdir -height 100 -width 200 -tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \ - -background lightsalmon -foreground black -ttext $ui_workdir \ - -borderwidth 0 \ - -width 20 -height 10 \ - -wrap none \ - -takefocus 1 -highlightthickness 1\ - -cursor $cursor_ptr \ - -xscrollcommand {.vpane.files.workdir.sx set} \ - -yscrollcommand {.vpane.files.workdir.sy set} \ - -state disabled -${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview] -${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview] -pack .vpane.files.workdir.title -side top -fill x -pack .vpane.files.workdir.sx -side bottom -fill x -pack .vpane.files.workdir.sy -side right -fill y -pack $ui_workdir -side left -fill both -expand 1 - -# -- Index File List -# -textframe .vpane.files.index -height 100 -width 200 -tlabel .vpane.files.index.title \ - -text [mc "Staged Changes (Will Commit)"] \ - -background lightgreen -foreground black -ttext $ui_index \ - -borderwidth 0 \ - -width 20 -height 10 \ - -wrap none \ - -takefocus 1 -highlightthickness 1\ - -cursor $cursor_ptr \ - -xscrollcommand {.vpane.files.index.sx set} \ - -yscrollcommand {.vpane.files.index.sy set} \ - -state disabled -${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview] -${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview] -pack .vpane.files.index.title -side top -fill x -pack .vpane.files.index.sx -side bottom -fill x -pack .vpane.files.index.sy -side right -fill y -pack $ui_index -side left -fill both -expand 1 - -# -- Insert the workdir and index into the panes -# -.vpane.files add .vpane.files.workdir -.vpane.files add .vpane.files.index -if {!$use_ttk} { - .vpane.files paneconfigure .vpane.files.workdir -sticky news - .vpane.files paneconfigure .vpane.files.index -sticky news -} - -foreach i [list $ui_index $ui_workdir] { - rmsel_tag $i - $i tag conf in_diff \ - -background $color::select_bg \ - -foreground $color::select_fg -} -unset i - -# -- Diff and Commit Area -# -if {$have_tk85} { - ${NS}::panedwindow .vpane.lower -orient vertical - ${NS}::frame .vpane.lower.commarea - ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500 - .vpane.lower add .vpane.lower.diff - .vpane.lower add .vpane.lower.commarea - .vpane add .vpane.lower - if {$use_ttk} { - .vpane.lower pane .vpane.lower.diff -weight 1 - .vpane.lower pane .vpane.lower.commarea -weight 0 - } else { - .vpane.lower paneconfigure .vpane.lower.diff -stretch always - .vpane.lower paneconfigure .vpane.lower.commarea -stretch never - } -} else { - frame .vpane.lower -height 300 -width 400 - frame .vpane.lower.commarea - frame .vpane.lower.diff -relief sunken -borderwidth 1 - pack .vpane.lower.diff -fill both -expand 1 - pack .vpane.lower.commarea -side bottom -fill x - .vpane add .vpane.lower - .vpane paneconfigure .vpane.lower -sticky nsew -} - -# -- Commit Area Buttons -# -${NS}::frame .vpane.lower.commarea.buttons -${NS}::label .vpane.lower.commarea.buttons.l -text {} \ - -anchor w \ - -justify left -pack .vpane.lower.commarea.buttons.l -side top -fill x -pack .vpane.lower.commarea.buttons -side left -fill y - -${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \ - -command ui_do_rescan -pack .vpane.lower.commarea.buttons.rescan -side top -fill x -lappend disable_on_lock \ - {.vpane.lower.commarea.buttons.rescan conf -state} - -${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \ - -command do_add_all -pack .vpane.lower.commarea.buttons.incall -side top -fill x -lappend disable_on_lock \ - {.vpane.lower.commarea.buttons.incall conf -state} - -if {![is_enabled nocommitmsg]} { - ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \ - -command do_signoff - pack .vpane.lower.commarea.buttons.signoff -side top -fill x -} - -${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \ - -command do_commit -pack .vpane.lower.commarea.buttons.commit -side top -fill x -lappend disable_on_lock \ - {.vpane.lower.commarea.buttons.commit conf -state} - -if {![is_enabled nocommit]} { - ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \ - -command do_push_anywhere - pack .vpane.lower.commarea.buttons.push -side top -fill x -} - -# -- Commit Message Buffer -# -${NS}::frame .vpane.lower.commarea.buffer -${NS}::frame .vpane.lower.commarea.buffer.header -set ui_comm .vpane.lower.commarea.buffer.frame.t -set ui_coml .vpane.lower.commarea.buffer.header.l - -if {![is_enabled nocommit]} { - ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \ - -text [mc "Amend Last Commit"] \ - -variable commit_type_is_amend \ - -command do_select_commit_type - lappend disable_on_lock \ - [list .vpane.lower.commarea.buffer.header.amend conf -state] -} - -${NS}::label $ui_coml \ - -anchor w \ - -justify left -proc trace_commit_type {varname args} { - global ui_coml commit_type - switch -glob -- $commit_type { - initial {set txt [mc "Initial Commit Message:"]} - amend {set txt [mc "Amended Commit Message:"]} - amend-initial {set txt [mc "Amended Initial Commit Message:"]} - amend-merge {set txt [mc "Amended Merge Commit Message:"]} - merge {set txt [mc "Merge Commit Message:"]} - * {set txt [mc "Commit Message:"]} - } - $ui_coml conf -text $txt -} -trace add variable commit_type write trace_commit_type -pack $ui_coml -side left -fill x - -if {![is_enabled nocommit]} { - pack .vpane.lower.commarea.buffer.header.amend -side right -} - -textframe .vpane.lower.commarea.buffer.frame -ttext $ui_comm \ - -borderwidth 1 \ - -undo true \ - -maxundo 20 \ - -autoseparators true \ - -takefocus 1 \ - -highlightthickness 1 \ - -relief sunken \ - -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \ - -font font_diff \ - -xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx set} \ - -yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set} -${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \ - -orient horizontal \ - -command [list $ui_comm xview] -${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \ - -orient vertical \ - -command [list $ui_comm yview] - -pack .vpane.lower.commarea.buffer.frame.sbx -side bottom -fill x -pack .vpane.lower.commarea.buffer.frame.sby -side right -fill y -pack $ui_comm -side left -fill y -pack .vpane.lower.commarea.buffer.header -side top -fill x -pack .vpane.lower.commarea.buffer.frame -side left -fill y -pack .vpane.lower.commarea.buffer -side left -fill y - -# -- Commit Message Buffer Context Menu -# -set ctxm .vpane.lower.commarea.buffer.ctxm -menu $ctxm -tearoff 0 -$ctxm add command \ - -label [mc Cut] \ - -command {tk_textCut $ui_comm} -$ctxm add command \ - -label [mc Copy] \ - -command {tk_textCopy $ui_comm} -$ctxm add command \ - -label [mc Paste] \ - -command {tk_textPaste $ui_comm} -$ctxm add command \ - -label [mc Delete] \ - -command {catch {$ui_comm delete sel.first sel.last}} -$ctxm add separator -$ctxm add command \ - -label [mc "Select All"] \ - -command {focus $ui_comm;$ui_comm tag add sel 0.0 end} -$ctxm add command \ - -label [mc "Copy All"] \ - -command { - $ui_comm tag add sel 0.0 end - tk_textCopy $ui_comm - $ui_comm tag remove sel 0.0 end - } -$ctxm add separator -$ctxm add command \ - -label [mc "Sign Off"] \ - -command do_signoff -set ui_comm_ctxm $ctxm - -# -- Diff Header -# -proc trace_current_diff_path {varname args} { - global current_diff_path diff_actions file_states - if {$current_diff_path eq {}} { - set s {} - set f {} - set p {} - set o disabled - } else { - set p $current_diff_path - set s [mapdesc [lindex $file_states($p) 0] $p] - set f [mc "File:"] - set p [escape_path $p] - set o normal - } - - .vpane.lower.diff.header.status configure -text $s - .vpane.lower.diff.header.file configure -text $f - .vpane.lower.diff.header.path configure -text $p - foreach w $diff_actions { - uplevel #0 $w $o - } -} -trace add variable current_diff_path write trace_current_diff_path - -gold_frame .vpane.lower.diff.header -tlabel .vpane.lower.diff.header.status \ - -background gold \ - -foreground black \ - -width $max_status_desc \ - -anchor w \ - -justify left -tlabel .vpane.lower.diff.header.file \ - -background gold \ - -foreground black \ - -anchor w \ - -justify left -tlabel .vpane.lower.diff.header.path \ - -background gold \ - -foreground blue \ - -anchor w \ - -justify left \ - -font [eval font create [font configure font_ui] -underline 1] \ - -cursor hand2 -pack .vpane.lower.diff.header.status -side left -pack .vpane.lower.diff.header.file -side left -pack .vpane.lower.diff.header.path -fill x -set ctxm .vpane.lower.diff.header.ctxm -menu $ctxm -tearoff 0 -$ctxm add command \ - -label [mc Copy] \ - -command { - clipboard clear - clipboard append \ - -format STRING \ - -type STRING \ - -- $current_diff_path - } -$ctxm add command \ - -label [mc Open] \ - -command {do_file_open $current_diff_path} -lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] -bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y" -bind .vpane.lower.diff.header.path <Button-1> {do_file_open $current_diff_path} - -# -- Diff Body -# -textframe .vpane.lower.diff.body -set ui_diff .vpane.lower.diff.body.t -ttext $ui_diff \ - -borderwidth 0 \ - -width 80 -height 5 -wrap none \ - -font font_diff \ - -takefocus 1 -highlightthickness 1 \ - -xscrollcommand {.vpane.lower.diff.body.sbx set} \ - -yscrollcommand {.vpane.lower.diff.body.sby set} \ - -state disabled -catch {$ui_diff configure -tabstyle wordprocessor} -${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \ - -command [list $ui_diff xview] -${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \ - -command [list $ui_diff yview] -pack .vpane.lower.diff.body.sbx -side bottom -fill x -pack .vpane.lower.diff.body.sby -side right -fill y -pack $ui_diff -side left -fill both -expand 1 -pack .vpane.lower.diff.header -side top -fill x -pack .vpane.lower.diff.body -side bottom -fill both -expand 1 - -foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 grey60} { - $ui_diff tag configure clr4$n -background $c - $ui_diff tag configure clri4$n -foreground $c - $ui_diff tag configure clr3$n -foreground $c - $ui_diff tag configure clri3$n -background $c -} -$ui_diff tag configure clr1 -font font_diffbold -$ui_diff tag configure clr4 -underline 1 - -$ui_diff tag conf d_info -foreground blue -font font_diffbold - -$ui_diff tag conf d_cr -elide true -$ui_diff tag conf d_@ -font font_diffbold -$ui_diff tag conf d_+ -foreground {#00a000} -$ui_diff tag conf d_- -foreground red - -$ui_diff tag conf d_++ -foreground {#00a000} -$ui_diff tag conf d_-- -foreground red -$ui_diff tag conf d_+s \ - -foreground {#00a000} \ - -background {#e2effa} -$ui_diff tag conf d_-s \ - -foreground red \ - -background {#e2effa} -$ui_diff tag conf d_s+ \ - -foreground {#00a000} \ - -background ivory1 -$ui_diff tag conf d_s- \ - -foreground red \ - -background ivory1 - -$ui_diff tag conf d< \ - -foreground orange \ - -font font_diffbold -$ui_diff tag conf d| \ - -foreground orange \ - -font font_diffbold -$ui_diff tag conf d= \ - -foreground orange \ - -font font_diffbold -$ui_diff tag conf d> \ - -foreground orange \ - -font font_diffbold - -$ui_diff tag raise sel - -# -- Diff Body Context Menu -# - -proc create_common_diff_popup {ctxm} { - $ctxm add command \ - -label [mc Refresh] \ - -command reshow_diff - lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] - $ctxm add command \ - -label [mc Copy] \ - -command {tk_textCopy $ui_diff} - lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] - $ctxm add command \ - -label [mc "Select All"] \ - -command {focus $ui_diff;$ui_diff tag add sel 0.0 end} - lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] - $ctxm add command \ - -label [mc "Copy All"] \ - -command { - $ui_diff tag add sel 0.0 end - tk_textCopy $ui_diff - $ui_diff tag remove sel 0.0 end - } - lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] - $ctxm add separator - $ctxm add command \ - -label [mc "Decrease Font Size"] \ - -command {incr_font_size font_diff -1} - lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] - $ctxm add command \ - -label [mc "Increase Font Size"] \ - -command {incr_font_size font_diff 1} - lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] - $ctxm add separator - set emenu $ctxm.enc - menu $emenu - build_encoding_menu $emenu [list force_diff_encoding] - $ctxm add cascade \ - -label [mc "Encoding"] \ - -menu $emenu - lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] - $ctxm add separator - $ctxm add command -label [mc "Options..."] \ - -command do_options -} - -set ctxm .vpane.lower.diff.body.ctxm -menu $ctxm -tearoff 0 -$ctxm add command \ - -label [mc "Apply/Reverse Hunk"] \ - -command {apply_or_revert_hunk $cursorX $cursorY 0} -set ui_diff_applyhunk [$ctxm index last] -lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] -$ctxm add command \ - -label [mc "Apply/Reverse Line"] \ - -command {apply_or_revert_range_or_line $cursorX $cursorY 0; do_rescan} -set ui_diff_applyline [$ctxm index last] -lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state] -$ctxm add separator -$ctxm add command \ - -label [mc "Revert Hunk"] \ - -command {apply_or_revert_hunk $cursorX $cursorY 1} -set ui_diff_reverthunk [$ctxm index last] -lappend diff_actions [list $ctxm entryconf $ui_diff_reverthunk -state] -$ctxm add command \ - -label [mc "Revert Line"] \ - -command {apply_or_revert_range_or_line $cursorX $cursorY 1; do_rescan} -set ui_diff_revertline [$ctxm index last] -lappend diff_actions [list $ctxm entryconf $ui_diff_revertline -state] -$ctxm add command \ - -label [mc "Undo Last Revert"] \ - -command {undo_last_revert; do_rescan} -set ui_diff_undorevert [$ctxm index last] -lappend diff_actions [list $ctxm entryconf $ui_diff_undorevert -state] -$ctxm add separator -$ctxm add command \ - -label [mc "Show Less Context"] \ - -command show_less_context -lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] -$ctxm add command \ - -label [mc "Show More Context"] \ - -command show_more_context -lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] -$ctxm add separator -create_common_diff_popup $ctxm - -set ctxmmg .vpane.lower.diff.body.ctxmmg -menu $ctxmmg -tearoff 0 -$ctxmmg add command \ - -label [mc "Run Merge Tool"] \ - -command {merge_resolve_tool} -lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] -$ctxmmg add separator -$ctxmmg add command \ - -label [mc "Use Remote Version"] \ - -command {merge_resolve_one 3} -lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] -$ctxmmg add command \ - -label [mc "Use Local Version"] \ - -command {merge_resolve_one 2} -lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] -$ctxmmg add command \ - -label [mc "Revert To Base"] \ - -command {merge_resolve_one 1} -lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] -$ctxmmg add separator -$ctxmmg add command \ - -label [mc "Show Less Context"] \ - -command show_less_context -lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] -$ctxmmg add command \ - -label [mc "Show More Context"] \ - -command show_more_context -lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] -$ctxmmg add separator -create_common_diff_popup $ctxmmg - -set ctxmsm .vpane.lower.diff.body.ctxmsm -menu $ctxmsm -tearoff 0 -$ctxmsm add command \ - -label [mc "Visualize These Changes In The Submodule"] \ - -command {do_gitk -- true} -lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] -$ctxmsm add command \ - -label [mc "Visualize Current Branch History In The Submodule"] \ - -command {do_gitk {} true} -lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] -$ctxmsm add command \ - -label [mc "Visualize All Branch History In The Submodule"] \ - -command {do_gitk --all true} -lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] -$ctxmsm add separator -$ctxmsm add command \ - -label [mc "Start git gui In The Submodule"] \ - -command {do_git_gui} -lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state] -$ctxmsm add separator -create_common_diff_popup $ctxmsm - -proc has_textconv {path} { - if {[is_config_false gui.textconv]} { - return 0 - } - set filter [gitattr $path diff set] - set textconv [get_config [join [list diff $filter textconv] .]] - if {$filter ne {set} && $textconv ne {}} { - return 1 - } else { - return 0 - } -} - -proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} { - global current_diff_path file_states last_revert - set ::cursorX $x - set ::cursorY $y - if {[info exists file_states($current_diff_path)]} { - set state [lindex $file_states($current_diff_path) 0] - } else { - set state {__} - } - if {[string first {U} $state] >= 0} { - tk_popup $ctxmmg $X $Y - } elseif {$::is_submodule_diff} { - tk_popup $ctxmsm $X $Y - } else { - set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}] - set u [mc "Undo Last Revert"] - if {$::ui_index eq $::current_diff_side} { - set l [mc "Unstage Hunk From Commit"] - set h [mc "Revert Hunk"] - - if {$has_range} { - set t [mc "Unstage Lines From Commit"] - set r [mc "Revert Lines"] - } else { - set t [mc "Unstage Line From Commit"] - set r [mc "Revert Line"] - } - } else { - set l [mc "Stage Hunk For Commit"] - set h [mc "Revert Hunk"] - - if {$has_range} { - set t [mc "Stage Lines For Commit"] - set r [mc "Revert Lines"] - } else { - set t [mc "Stage Line For Commit"] - set r [mc "Revert Line"] - } - } - if {$::is_3way_diff - || $current_diff_path eq {} - || {__} eq $state - || {_O} eq $state - || [string match {?T} $state] - || [string match {T?} $state] - || [has_textconv $current_diff_path]} { - set s disabled - set revert_state disabled - } else { - set s normal - - # Only allow reverting changes in the working tree. If - # the user wants to revert changes in the index, they - # need to unstage those first. - if {$::ui_workdir eq $::current_diff_side} { - set revert_state normal - } else { - set revert_state disabled - } - } - - if {$last_revert eq {}} { - set undo_state disabled - } else { - set undo_state normal - } - - $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l - $ctxm entryconf $::ui_diff_applyline -state $s -label $t - $ctxm entryconf $::ui_diff_revertline -state $revert_state \ - -label $r - $ctxm entryconf $::ui_diff_reverthunk -state $revert_state \ - -label $h - $ctxm entryconf $::ui_diff_undorevert -state $undo_state \ - -label $u - - tk_popup $ctxm $X $Y - } -} -bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y] - -# -- Status Bar -# -set main_status [::status_bar::new .status] -pack .status -anchor w -side bottom -fill x -$main_status show [mc "Initializing..."] - -# -- Load geometry -# -proc on_ttk_pane_mapped {w pane pos} { - bind $w <Map> {} - after 0 [list after idle [list $w sashpos $pane $pos]] -} -proc on_tk_pane_mapped {w pane x y} { - bind $w <Map> {} - after 0 [list after idle [list $w sash place $pane $x $y]] -} -proc on_application_mapped {} { - global repo_config use_ttk - bind . <Map> {} - set gm $repo_config(gui.geometry) - if {$use_ttk} { - bind .vpane <Map> \ - [list on_ttk_pane_mapped %W 0 [lindex $gm 1]] - bind .vpane.files <Map> \ - [list on_ttk_pane_mapped %W 0 [lindex $gm 2]] - } else { - bind .vpane <Map> \ - [list on_tk_pane_mapped %W 0 \ - [lindex $gm 1] \ - [lindex [.vpane sash coord 0] 1]] - bind .vpane.files <Map> \ - [list on_tk_pane_mapped %W 0 \ - [lindex [.vpane.files sash coord 0] 0] \ - [lindex $gm 2]] - } - wm geometry . [lindex $gm 0] -} -if {[info exists repo_config(gui.geometry)]} { - bind . <Map> [list on_application_mapped] - wm geometry . [lindex $repo_config(gui.geometry) 0] -} - -# -- Load window state -# -if {[info exists repo_config(gui.wmstate)]} { - catch {wm state . $repo_config(gui.wmstate)} -} - -# -- Key Bindings -# -bind $ui_comm <$M1B-Key-Return> {do_commit;break} -bind $ui_comm <$M1B-Key-t> {do_add_selection;break} -bind $ui_comm <$M1B-Key-T> {do_add_selection;break} -bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break} -bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break} -bind $ui_comm <$M1B-Key-j> {do_revert_selection;break} -bind $ui_comm <$M1B-Key-J> {do_revert_selection;break} -bind $ui_comm <$M1B-Key-i> {do_add_all;break} -bind $ui_comm <$M1B-Key-I> {do_add_all;break} -bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break} -bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break} -bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break} -bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break} -bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break} -bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break} -bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break} -bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break} -bind $ui_comm <$M1B-Key-minus> {show_less_context;break} -bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} -bind $ui_comm <$M1B-Key-equal> {show_more_context;break} -bind $ui_comm <$M1B-Key-plus> {show_more_context;break} -bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} -bind $ui_comm <$M1B-Key-BackSpace> {event generate %W <Meta-Delete>;break} -bind $ui_comm <$M1B-Key-Delete> {event generate %W <Meta-d>;break} - -bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} -bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} -bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break} -bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break} -bind $ui_diff <$M1B-Key-v> {break} -bind $ui_diff <$M1B-Key-V> {break} -bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break} -bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break} -bind $ui_diff <$M1B-Key-j> {do_revert_selection;break} -bind $ui_diff <$M1B-Key-J> {do_revert_selection;break} -bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break} -bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break} -bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break} -bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break} -bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break} -bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break} -bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break} -bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break} -bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break} -bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break} -bind $ui_diff <Button-1> {focus %W} - -if {[is_enabled branch]} { - bind . <$M1B-Key-n> branch_create::dialog - bind . <$M1B-Key-N> branch_create::dialog - bind . <$M1B-Key-o> branch_checkout::dialog - bind . <$M1B-Key-O> branch_checkout::dialog - bind . <$M1B-Key-m> merge::dialog - bind . <$M1B-Key-M> merge::dialog -} -if {[is_enabled transport]} { - bind . <$M1B-Key-p> do_push_anywhere - bind . <$M1B-Key-P> do_push_anywhere -} - -bind . <Key-F5> ui_do_rescan -bind . <$M1B-Key-r> ui_do_rescan -bind . <$M1B-Key-R> ui_do_rescan -bind . <$M1B-Key-s> do_signoff -bind . <$M1B-Key-S> do_signoff -bind . <$M1B-Key-t> { toggle_or_diff toggle %W } -bind . <$M1B-Key-T> { toggle_or_diff toggle %W } -bind . <$M1B-Key-u> { toggle_or_diff toggle %W } -bind . <$M1B-Key-U> { toggle_or_diff toggle %W } -bind . <$M1B-Key-j> do_revert_selection -bind . <$M1B-Key-J> do_revert_selection -bind . <$M1B-Key-i> do_add_all -bind . <$M1B-Key-I> do_add_all -bind . <$M1B-Key-e> toggle_commit_type -bind . <$M1B-Key-E> toggle_commit_type -bind . <$M1B-Key-minus> {show_less_context;break} -bind . <$M1B-Key-KP_Subtract> {show_less_context;break} -bind . <$M1B-Key-equal> {show_more_context;break} -bind . <$M1B-Key-plus> {show_more_context;break} -bind . <$M1B-Key-KP_Add> {show_more_context;break} -bind . <$M1B-Key-Return> do_commit -bind . <$M1B-Key-KP_Enter> do_commit -foreach i [list $ui_index $ui_workdir] { - bind $i <Button-1> { toggle_or_diff click %W %x %y; break } - bind $i <$M1B-Button-1> { add_one_to_selection %W %x %y; break } - bind $i <Shift-Button-1> { add_range_to_selection %W %x %y; break } - bind $i <Key-Up> { toggle_or_diff up %W; break } - bind $i <Key-Down> { toggle_or_diff down %W; break } -} -unset i - -bind . <Alt-Key-1> {focus_widget $::ui_workdir} -bind . <Alt-Key-2> {focus_widget $::ui_index} -bind . <Alt-Key-3> {focus $::ui_diff} -bind . <Alt-Key-4> {focus $::ui_comm} - -set file_lists_last_clicked($ui_index) {} -set file_lists_last_clicked($ui_workdir) {} - -set file_lists($ui_index) [list] -set file_lists($ui_workdir) [list] - -wm title . "[appname] ([reponame]) [file normalize $_gitworktree]" -focus -force $ui_comm - -# -- Warn the user about environmental problems. Cygwin's Tcl -# does *not* pass its env array onto any processes it spawns. -# This means that git processes get none of our environment. -# -if {[is_Cygwin]} { - set ignored_env 0 - set suggest_user {} - set msg [mc "Possible environment issues exist. - -The following environment variables are probably -going to be ignored by any Git subprocess run -by %s: - -" [appname]] - foreach name [array names env] { - switch -regexp -- $name { - {^GIT_INDEX_FILE$} - - {^GIT_OBJECT_DIRECTORY$} - - {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} - - {^GIT_DIFF_OPTS$} - - {^GIT_EXTERNAL_DIFF$} - - {^GIT_PAGER$} - - {^GIT_TRACE$} - - {^GIT_CONFIG$} - - {^GIT_(AUTHOR|COMMITTER)_DATE$} { - append msg " - $name\n" - incr ignored_env - } - {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} { - append msg " - $name\n" - incr ignored_env - set suggest_user $name - } - } - } - if {$ignored_env > 0} { - append msg [mc " -This is due to a known issue with the -Tcl binary distributed by Cygwin."] - - if {$suggest_user ne {}} { - append msg [mc " - -A good replacement for %s -is placing values for the user.name and -user.email settings into your personal -~/.gitconfig file. -" $suggest_user] - } - warn_popup $msg - } - unset ignored_env msg suggest_user name -} - -# -- Only initialize complex UI if we are going to stay running. -# -if {[is_enabled transport]} { - load_all_remotes - - set n [.mbar.remote index end] - populate_remotes_menu - set n [expr {[.mbar.remote index end] - $n}] - if {$n > 0} { - if {[.mbar.remote type 0] eq "tearoff"} { incr n } - .mbar.remote insert $n separator - } - unset n -} - -if {[winfo exists $ui_comm]} { - set GITGUI_BCK_exists [load_message GITGUI_BCK utf-8] - - # -- If both our backup and message files exist use the - # newer of the two files to initialize the buffer. - # - if {$GITGUI_BCK_exists} { - set m [gitdir GITGUI_MSG] - if {[file isfile $m]} { - if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} { - catch {file delete [gitdir GITGUI_MSG]} - } else { - $ui_comm delete 0.0 end - $ui_comm edit reset - $ui_comm edit modified false - catch {file delete [gitdir GITGUI_BCK]} - set GITGUI_BCK_exists 0 - } - } - unset m - } - - proc backup_commit_buffer {} { - global ui_comm GITGUI_BCK_exists - - set m [$ui_comm edit modified] - if {$m || $GITGUI_BCK_exists} { - set msg [string trim [$ui_comm get 0.0 end]] - regsub -all -line {[ \r\t]+$} $msg {} msg - - if {$msg eq {}} { - if {$GITGUI_BCK_exists} { - catch {file delete [gitdir GITGUI_BCK]} - set GITGUI_BCK_exists 0 - } - } elseif {$m} { - catch { - set fd [open [gitdir GITGUI_BCK] w] - fconfigure $fd -encoding utf-8 - puts -nonewline $fd $msg - close $fd - set GITGUI_BCK_exists 1 - } - } - - $ui_comm edit modified false - } - - set ::GITGUI_BCK_i [after 2000 backup_commit_buffer] - } - - backup_commit_buffer - - # -- If the user has aspell available we can drive it - # in pipe mode to spellcheck the commit message. - # - set spell_cmd [list |] - set spell_dict [get_config gui.spellingdictionary] - lappend spell_cmd aspell - if {$spell_dict ne {}} { - lappend spell_cmd --master=$spell_dict - } - lappend spell_cmd --mode=none - lappend spell_cmd --encoding=utf-8 - lappend spell_cmd pipe - if {$spell_dict eq {none} - || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} { - bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y] - } else { - set ui_comm_spell [spellcheck::init \ - $spell_fd \ - $ui_comm \ - $ui_comm_ctxm \ - ] - } - unset -nocomplain spell_cmd spell_fd spell_err spell_dict -} - -lock_index begin-read -if {![winfo ismapped .]} { - wm deiconify . -} -after 1 { - if {[is_enabled initialamend]} { - force_amend - } else { - do_rescan - } - - if {[is_enabled nocommitmsg]} { - $ui_comm configure -state disabled -background gray - } -} -if {[is_enabled multicommit] && ![is_config_false gui.gcwarning]} { - after 1000 hint_gc -} -if {[is_enabled retcode]} { - bind . <Destroy> {+terminate_me %W} -} -if {$picked && [is_config_true gui.autoexplore]} { - do_explore -} - -# Clear "Initializing..." status -after 500 {$main_status show ""} - -# Local variables: -# mode: tcl -# indent-tabs-mode: t -# tab-width: 4 -# End: diff --git a/third_party/git/git-gui/lib/about.tcl b/third_party/git/git-gui/lib/about.tcl deleted file mode 100644 index cfa50fca8782..000000000000 --- a/third_party/git/git-gui/lib/about.tcl +++ /dev/null @@ -1,70 +0,0 @@ -# git-gui about git-gui dialog -# Copyright (C) 2006, 2007 Shawn Pearce - -proc do_about {} { - global appvers copyright oguilib - global tcl_patchLevel tk_patchLevel - global ui_comm_spell NS use_ttk - - set w .about_dialog - Dialog $w - wm geometry $w "+[winfo rootx .]+[winfo rooty .]" - - pack [git_logo $w.git_logo] -side left -fill y -padx 10 -pady 10 - ${NS}::label $w.header -text [mc "About %s" [appname]] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.close -text {Close} \ - -default active \ - -command [list destroy $w] - pack $w.buttons.close -side right - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - paddedlabel $w.desc \ - -text "[mc "git-gui - a graphical user interface for Git."]\n$copyright" - pack $w.desc -side top -fill x -padx 5 -pady 5 - - set v {} - append v "git-gui version $appvers\n" - append v "[git version]\n" - append v "\n" - if {$tcl_patchLevel eq $tk_patchLevel} { - append v "Tcl/Tk version $tcl_patchLevel" - } else { - append v "Tcl version $tcl_patchLevel" - append v ", Tk version $tk_patchLevel" - } - if {[info exists ui_comm_spell] - && [$ui_comm_spell version] ne {}} { - append v "\n" - append v [$ui_comm_spell version] - } - - set d {} - append d "git wrapper: $::_git\n" - append d "git exec dir: [gitexec]\n" - append d "git-gui lib: $oguilib" - - paddedlabel $w.vers -text $v - pack $w.vers -side top -fill x -padx 5 -pady 5 - - paddedlabel $w.dirs -text $d - pack $w.dirs -side top -fill x -padx 5 -pady 5 - - menu $w.ctxm -tearoff 0 - $w.ctxm add command \ - -label {Copy} \ - -command " - clipboard clear - clipboard append -format STRING -type STRING -- \[$w.vers cget -text\] - " - - bind $w <Visibility> "grab $w; focus $w.buttons.close" - bind $w <Key-Escape> "destroy $w" - bind $w <Key-Return> "destroy $w" - bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w" - wm title $w "About [appname]" - tkwait window $w -} diff --git a/third_party/git/git-gui/lib/blame.tcl b/third_party/git/git-gui/lib/blame.tcl deleted file mode 100644 index 8441e109be32..000000000000 --- a/third_party/git/git-gui/lib/blame.tcl +++ /dev/null @@ -1,1374 +0,0 @@ -# git-gui blame viewer -# Copyright (C) 2006, 2007 Shawn Pearce - -class blame { - -image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} - -# Persistent data (survives loads) -# -field history {}; # viewer history: {commit path} -field header ; # array commit,key -> header field - -# Tk UI control paths -# -field w ; # top window in this viewer -field w_back ; # our back button -field w_path ; # label showing the current file path -field w_columns ; # list of all column widgets in the viewer -field w_line ; # text column: all line numbers -field w_amov ; # text column: annotations + move tracking -field w_asim ; # text column: annotations (simple computation) -field w_file ; # text column: actual file data -field w_cviewer ; # pane showing commit message -field finder ; # find mini-dialog frame -field gotoline ; # line goto mini-dialog frame -field status ; # status mega-widget instance -field status_operation ; # operation displayed by status mega-widget -field old_height ; # last known height of $w.file_pane - - -# Tk UI colors -# -variable active_color #c0edc5 -variable group_colors { - #d6d6d6 - #e1e1e1 - #ececec -} - -# Current blame data; cleared/reset on each load -# -field commit ; # input commit to blame -field path ; # input filename to view in $commit - -field current_fd {} ; # background process running -field highlight_line -1 ; # current line selected -field highlight_column {} ; # current commit column selected -field highlight_commit {} ; # sha1 of commit selected - -field total_lines 0 ; # total length of file -field blame_lines 0 ; # number of lines computed -field amov_data ; # list of {commit origfile origline} -field asim_data ; # list of {commit origfile origline} - -field r_commit ; # commit currently being parsed -field r_orig_line ; # original line number -field r_final_line ; # final line number -field r_line_count ; # lines in this region - -field tooltip_wm {} ; # Current tooltip toplevel, if open -field tooltip_t {} ; # Text widget in $tooltip_wm -field tooltip_timer {} ; # Current timer event for our tooltip -field tooltip_commit {} ; # Commit(s) in tooltip - -constructor new {i_commit i_path i_jump} { - global cursor_ptr M1B M1T have_tk85 use_ttk NS - variable active_color - variable group_colors - - set commit $i_commit - set path $i_path - - make_toplevel top w - wm title $top [mc "%s (%s): File Viewer" [appname] [reponame]] - - set font_w [font measure font_diff "0"] - - gold_frame $w.header - tlabel $w.header.commit_l \ - -text [mc "Commit:"] \ - -background gold \ - -foreground black \ - -anchor w \ - -justify left - set w_back $w.header.commit_b - tlabel $w_back \ - -image ::blame::img_back_arrow \ - -borderwidth 0 \ - -relief flat \ - -state disabled \ - -background gold \ - -foreground black \ - -activebackground gold - bind $w_back <Button-1> " - if {\[$w_back cget -state\] eq {normal}} { - [cb _history_menu] - } - " - tlabel $w.header.commit \ - -textvariable @commit \ - -background gold \ - -foreground black \ - -anchor w \ - -justify left - tlabel $w.header.path_l \ - -text [mc "File:"] \ - -background gold \ - -foreground black \ - -anchor w \ - -justify left - set w_path $w.header.path - tlabel $w_path \ - -background gold \ - -foreground black \ - -anchor w \ - -justify left - pack $w.header.commit_l -side left - pack $w_back -side left - pack $w.header.commit -side left - pack $w_path -fill x -side right - pack $w.header.path_l -side right - - panedwindow $w.file_pane -orient vertical -borderwidth 0 -sashwidth 3 - frame $w.file_pane.out -relief flat -borderwidth 1 - frame $w.file_pane.cm -relief sunken -borderwidth 1 - $w.file_pane add $w.file_pane.out \ - -sticky nsew \ - -minsize 100 \ - -height 100 \ - -width 100 - $w.file_pane add $w.file_pane.cm \ - -sticky nsew \ - -minsize 25 \ - -height 25 \ - -width 100 - - set w_line $w.file_pane.out.linenumber_t - text $w_line \ - -takefocus 0 \ - -highlightthickness 0 \ - -padx 0 -pady 0 \ - -background white \ - -foreground black \ - -borderwidth 0 \ - -state disabled \ - -wrap none \ - -height 40 \ - -width 6 \ - -font font_diff - $w_line tag conf linenumber -justify right -rmargin 5 - - set w_amov $w.file_pane.out.amove_t - text $w_amov \ - -takefocus 0 \ - -highlightthickness 0 \ - -padx 0 -pady 0 \ - -background white \ - -foreground black \ - -borderwidth 0 \ - -state disabled \ - -wrap none \ - -height 40 \ - -width 5 \ - -font font_diff - $w_amov tag conf author_abbr -justify right -rmargin 5 - $w_amov tag conf curr_commit - $w_amov tag conf prior_commit -foreground blue -underline 1 - $w_amov tag bind prior_commit \ - <Button-1> \ - "[cb _load_commit $w_amov @amov_data @%x,%y];break" - - set w_asim $w.file_pane.out.asimple_t - text $w_asim \ - -takefocus 0 \ - -highlightthickness 0 \ - -padx 0 -pady 0 \ - -background white \ - -foreground black \ - -borderwidth 0 \ - -state disabled \ - -wrap none \ - -height 40 \ - -width 4 \ - -font font_diff - $w_asim tag conf author_abbr -justify right - $w_asim tag conf curr_commit - $w_asim tag conf prior_commit -foreground blue -underline 1 - $w_asim tag bind prior_commit \ - <Button-1> \ - "[cb _load_commit $w_asim @asim_data @%x,%y];break" - - set w_file $w.file_pane.out.file_t - text $w_file \ - -takefocus 0 \ - -highlightthickness 0 \ - -padx 0 -pady 0 \ - -background white \ - -foreground black \ - -borderwidth 0 \ - -state disabled \ - -wrap none \ - -height 40 \ - -width 80 \ - -xscrollcommand [list $w.file_pane.out.sbx set] \ - -font font_diff - if {$have_tk85} { - $w_file configure -inactiveselectbackground darkblue - } - $w_file tag conf found \ - -background yellow - - set w_columns [list $w_amov $w_asim $w_line $w_file] - - ${NS}::scrollbar $w.file_pane.out.sbx \ - -orient h \ - -command [list $w_file xview] - ${NS}::scrollbar $w.file_pane.out.sby \ - -orient v \ - -command [list scrollbar2many $w_columns yview] - eval grid $w_columns $w.file_pane.out.sby -sticky nsew - grid conf \ - $w.file_pane.out.sbx \ - -column 0 \ - -columnspan [expr {[llength $w_columns] + 1}] \ - -sticky we - grid columnconfigure \ - $w.file_pane.out \ - [expr {[llength $w_columns] - 1}] \ - -weight 1 - grid rowconfigure $w.file_pane.out 0 -weight 1 - - set finder [::searchbar::new \ - $w.file_pane.out.ff $w_file \ - -column 0 \ - -columnspan [expr {[llength $w_columns] + 1}] \ - ] - - set gotoline [::linebar::new \ - $w.file_pane.out.lf $w_file \ - -column 0 \ - -columnspan [expr {[llength $w_columns] + 1}] \ - ] - - set w_cviewer $w.file_pane.cm.t - text $w_cviewer \ - -background white \ - -foreground black \ - -borderwidth 0 \ - -state disabled \ - -wrap none \ - -height 10 \ - -width 80 \ - -xscrollcommand [list $w.file_pane.cm.sbx set] \ - -yscrollcommand [list $w.file_pane.cm.sby set] \ - -font font_diff - $w_cviewer tag conf still_loading \ - -font font_uiitalic \ - -justify center - $w_cviewer tag conf header_key \ - -tabs {3c} \ - -background $active_color \ - -font font_uibold - $w_cviewer tag conf header_val \ - -background $active_color \ - -font font_ui - $w_cviewer tag raise sel - ${NS}::scrollbar $w.file_pane.cm.sbx \ - -orient h \ - -command [list $w_cviewer xview] - ${NS}::scrollbar $w.file_pane.cm.sby \ - -orient v \ - -command [list $w_cviewer yview] - pack $w.file_pane.cm.sby -side right -fill y - pack $w.file_pane.cm.sbx -side bottom -fill x - pack $w_cviewer -expand 1 -fill both - - set status [::status_bar::new $w.status] - set status_operation {} - - menu $w.ctxm -tearoff 0 - $w.ctxm add command \ - -label [mc "Copy Commit"] \ - -command [cb _copycommit] - $w.ctxm add separator - $w.ctxm add command \ - -label [mc "Find Text..."] \ - -accelerator F7 \ - -command [cb _show_finder] - $w.ctxm add command \ - -label [mc "Goto Line..."] \ - -accelerator "Ctrl-G" \ - -command [cb _show_linebar] - menu $w.ctxm.enc - build_encoding_menu $w.ctxm.enc [cb _setencoding] - $w.ctxm add cascade \ - -label [mc "Encoding"] \ - -menu $w.ctxm.enc - $w.ctxm add command \ - -label [mc "Do Full Copy Detection"] \ - -command [cb _fullcopyblame] - $w.ctxm add separator - $w.ctxm add command \ - -label [mc "Show History Context"] \ - -command [cb _gitkcommit] - $w.ctxm add command \ - -label [mc "Blame Parent Commit"] \ - -command [cb _blameparent] - - foreach i $w_columns { - for {set g 0} {$g < [llength $group_colors]} {incr g} { - $i tag conf color$g -background [lindex $group_colors $g] - } - - if {$i eq $w_file} { - $w_file tag raise found - } - $i tag raise sel - - $i conf -cursor $cursor_ptr - $i conf -yscrollcommand \ - "[list ::searchbar::scrolled $finder] - [list many2scrollbar $w_columns yview $w.file_pane.out.sby]" - bind $i <Button-1> " - [cb _hide_tooltip] - [cb _click $i @%x,%y] - focus $i - " - bind $i <Any-Motion> [cb _show_tooltip $i @%x,%y] - bind $i <Any-Enter> [cb _hide_tooltip] - bind $i <Any-Leave> [cb _hide_tooltip] - bind $i <Deactivate> [cb _hide_tooltip] - bind_button3 $i " - [cb _hide_tooltip] - set cursorX %x - set cursorY %y - set cursorW %W - tk_popup $w.ctxm %X %Y - " - bind $i <Shift-Tab> "[list focus $w_cviewer];break" - bind $i <Tab> "[cb _focus_search $w_cviewer];break" - } - - foreach i [concat $w_columns $w_cviewer] { - bind $i <Key-Up> {catch {%W yview scroll -1 units};break} - bind $i <Key-Down> {catch {%W yview scroll 1 units};break} - bind $i <Key-Left> {catch {%W xview scroll -1 units};break} - bind $i <Key-Right> {catch {%W xview scroll 1 units};break} - bind $i <Key-k> {catch {%W yview scroll -1 units};break} - bind $i <Key-j> {catch {%W yview scroll 1 units};break} - bind $i <Key-h> {catch {%W xview scroll -1 units};break} - bind $i <Key-l> {catch {%W xview scroll 1 units};break} - bind $i <Control-Key-b> {catch {%W yview scroll -1 pages};break} - bind $i <Control-Key-f> {catch {%W yview scroll 1 pages};break} - } - - bind $w_cviewer <Shift-Tab> "[cb _focus_search $w_file];break" - bind $w_cviewer <Tab> "[list focus $w_file];break" - bind $w_cviewer <Button-1> [list focus $w_cviewer] - bind $w_file <Visibility> [cb _focus_search $w_file] - bind $top <F7> [cb _show_finder] - bind $top <Key-slash> [cb _show_finder] - bind $top <Control-Key-s> [cb _show_finder] - bind $top <Escape> [list searchbar::hide $finder] - bind $top <F3> [list searchbar::find_next $finder] - bind $top <Shift-F3> [list searchbar::find_prev $finder] - bind $top <Control-Key-g> [cb _show_linebar] - catch { bind $top <Shift-Key-XF86_Switch_VT_3> [list searchbar::find_prev $finder] } - - grid configure $w.header -sticky ew - grid configure $w.file_pane -sticky nsew - grid configure $w.status -sticky ew - grid columnconfigure $top 0 -weight 1 - grid rowconfigure $top 0 -weight 0 - grid rowconfigure $top 1 -weight 1 - grid rowconfigure $top 2 -weight 0 - - set req_w [winfo reqwidth $top] - set req_h [winfo reqheight $top] - set scr_w [expr {[winfo screenwidth $top] - 40}] - set scr_h [expr {[winfo screenheight $top] - 120}] - set opt_w [expr {$font_w * (80 + 5*3 + 3)}] - if {$req_w < $opt_w} {set req_w $opt_w} - if {$req_w > $scr_w} {set req_w $scr_w} - set opt_h [expr {$req_w*4/3}] - if {$req_h < $scr_h} {set req_h $scr_h} - if {$req_h > $opt_h} {set req_h $opt_h} - set g "${req_w}x${req_h}" - wm geometry $top $g - update - - set old_height [winfo height $w.file_pane] - $w.file_pane sash place 0 \ - [lindex [$w.file_pane sash coord 0] 0] \ - [expr {int($old_height * 0.80)}] - bind $w.file_pane <Configure> \ - "if {{$w.file_pane} eq {%W}} {[cb _resize %h]}" - - wm protocol $top WM_DELETE_WINDOW "destroy $top" - bind $top <Destroy> [cb _handle_destroy %W] - - _load $this $i_jump -} - -method _focus_search {win} { - if {[searchbar::visible $finder]} { - focus [searchbar::editor $finder] - } else { - focus $win - } -} - -method _handle_destroy {win} { - if {$win eq $w} { - _kill $this - delete_this - } -} - -method _kill {} { - if {$current_fd ne {}} { - kill_file_process $current_fd - catch {close $current_fd} - set current_fd {} - } -} - -method _load {jump} { - variable group_colors - - _hide_tooltip $this - - if {$total_lines != 0 || $current_fd ne {}} { - _kill $this - - foreach i $w_columns { - $i conf -state normal - $i delete 0.0 end - foreach g [$i tag names] { - if {[regexp {^g[0-9a-f]{40}$} $g]} { - $i tag delete $g - } - } - $i conf -state disabled - } - - $w_cviewer conf -state normal - $w_cviewer delete 0.0 end - $w_cviewer conf -state disabled - - set highlight_line -1 - set highlight_column {} - set highlight_commit {} - set total_lines 0 - } - - if {$history eq {}} { - $w_back conf -state disabled - } else { - $w_back conf -state normal - } - - # Index 0 is always empty. There is never line 0 as - # we use only 1 based lines, as that matches both with - # git-blame output and with Tk's text widget. - # - set amov_data [list [list]] - set asim_data [list [list]] - - $status show [mc "Reading %s..." "$commit:[escape_path $path]"] - $w_path conf -text [escape_path $path] - - set do_textconv 0 - if {![is_config_false gui.textconv] && [git-version >= 1.7.2]} { - set filter [gitattr $path diff set] - set textconv [get_config [join [list diff $filter textconv] .]] - if {$filter ne {set} && $textconv ne {}} { - set do_textconv 1 - } - } - if {$commit eq {}} { - if {$do_textconv ne 0} { - set fd [open_cmd_pipe $textconv $path] - } else { - set fd [open $path r] - } - fconfigure $fd -eofchar {} - } else { - if {$do_textconv ne 0} { - set fd [git_read cat-file --textconv "$commit:$path"] - } else { - set fd [git_read cat-file blob "$commit:$path"] - } - } - fconfigure $fd \ - -blocking 0 \ - -translation lf \ - -encoding [get_path_encoding $path] - fileevent $fd readable [cb _read_file $fd $jump] - set current_fd $fd -} - -method _history_menu {} { - set m $w.backmenu - if {[winfo exists $m]} { - $m delete 0 end - } else { - menu $m -tearoff 0 - } - - for {set i [expr {[llength $history] - 1}] - } {$i >= 0} {incr i -1} { - set e [lindex $history $i] - set c [lindex $e 0] - set f [lindex $e 1] - - if {[regexp {^[0-9a-f]{40}$} $c]} { - set t [string range $c 0 8]... - } elseif {$c eq {}} { - set t {Working Directory} - } else { - set t $c - } - if {![catch {set summary $header($c,summary)}]} { - append t " $summary" - if {[string length $t] > 70} { - set t [string range $t 0 66]... - } - } - - $m add command -label $t -command [cb _goback $i] - } - set X [winfo rootx $w_back] - set Y [expr {[winfo rooty $w_back] + [winfo height $w_back]}] - tk_popup $m $X $Y -} - -method _goback {i} { - set dat [lindex $history $i] - set history [lrange $history 0 [expr {$i - 1}]] - set commit [lindex $dat 0] - set path [lindex $dat 1] - _load $this [lrange $dat 2 5] -} - -method _read_file {fd jump} { - if {$fd ne $current_fd} { - catch {close $fd} - return - } - - foreach i $w_columns {$i conf -state normal} - while {[gets $fd line] >= 0} { - regsub "\r\$" $line {} line - incr total_lines - lappend amov_data {} - lappend asim_data {} - - if {$total_lines > 1} { - foreach i $w_columns {$i insert end "\n"} - } - - $w_line insert end "$total_lines" linenumber - $w_file insert end "$line" - } - - set ln_wc [expr {[string length $total_lines] + 2}] - if {[$w_line cget -width] < $ln_wc} { - $w_line conf -width $ln_wc - } - - foreach i $w_columns {$i conf -state disabled} - - if {[eof $fd]} { - fconfigure $fd -blocking 1; # enable error reporting on close - if {[catch {close $fd} err]} { - tk_messageBox -icon error -title [mc Error] \ - -message $err - } - - # If we don't force Tk to update the widgets *right now* - # none of our jump commands will cause a change in the UI. - # - update - - if {[llength $jump] == 1} { - set highlight_line [lindex $jump 0] - $w_file see "$highlight_line.0" - } elseif {[llength $jump] == 4} { - set highlight_column [lindex $jump 0] - set highlight_line [lindex $jump 1] - $w_file xview moveto [lindex $jump 2] - $w_file yview moveto [lindex $jump 3] - } - - _exec_blame $this $w_asim @asim_data \ - [list] \ - [mc "Loading copy/move tracking annotations..."] - } -} ifdeleted { catch {close $fd} } - -method _exec_blame {cur_w cur_d options cur_s} { - lappend options --incremental --encoding=utf-8 - if {$commit eq {}} { - lappend options --contents $path - } else { - lappend options $commit - } - - # We may recurse in from another call to _exec_blame and already have - # a status operation. - if {$status_operation == {}} { - set status_operation [$status start \ - $cur_s \ - [mc "lines annotated"]] - } else { - $status_operation restart $cur_s - } - - lappend options -- $path - set fd [eval git_read --nice blame $options] - fconfigure $fd -blocking 0 -translation lf -encoding utf-8 - fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d] - set current_fd $fd - set blame_lines 0 -} - -method _read_blame {fd cur_w cur_d} { - upvar #0 $cur_d line_data - variable group_colors - - if {$fd ne $current_fd} { - catch {close $fd} - return - } - - $cur_w conf -state normal - while {[gets $fd line] >= 0} { - if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \ - cmit original_line final_line line_count]} { - set r_commit $cmit - set r_orig_line $original_line - set r_final_line $final_line - set r_line_count $line_count - } elseif {[string match {filename *} $line]} { - set file [string range $line 9 end] - set n $r_line_count - set lno $r_final_line - set oln $r_orig_line - set cmit $r_commit - - if {[regexp {^0{40}$} $cmit]} { - set commit_abbr work - set commit_type curr_commit - } elseif {$cmit eq $commit} { - set commit_abbr this - set commit_type curr_commit - } else { - set commit_type prior_commit - set commit_abbr [string range $cmit 0 3] - } - - set author_abbr {} - set a_name {} - catch {set a_name $header($cmit,author)} - while {$a_name ne {}} { - if {$author_abbr ne {} - && [string index $a_name 0] eq {'}} { - regsub {^'[^']+'\s+} $a_name {} a_name - } - if {![regexp {^([[:upper:]])} $a_name _a]} break - append author_abbr $_a - unset _a - if {![regsub \ - {^[[:upper:]][^\s]*\s+} \ - $a_name {} a_name ]} break - } - if {$author_abbr eq {}} { - set author_abbr { |} - } else { - set author_abbr [string range $author_abbr 0 3] - } - unset a_name - - set first_lno $lno - while { - $first_lno > 1 - && $cmit eq [lindex $line_data [expr {$first_lno - 1}] 0] - && $file eq [lindex $line_data [expr {$first_lno - 1}] 1] - } { - incr first_lno -1 - } - - set color {} - if {$first_lno < $lno} { - foreach g [$w_file tag names $first_lno.0] { - if {[regexp {^color[0-9]+$} $g]} { - set color $g - break - } - } - } else { - set i [lsort [concat \ - [$w_file tag names "[expr {$first_lno - 1}].0"] \ - [$w_file tag names "[expr {$lno + $n}].0"] \ - ]] - for {set g 0} {$g < [llength $group_colors]} {incr g} { - if {[lsearch -sorted -exact $i color$g] == -1} { - set color color$g - break - } - } - } - if {$color eq {}} { - set color color0 - } - - while {$n > 0} { - set lno_e "$lno.0 lineend + 1c" - if {[lindex $line_data $lno] ne {}} { - set g [lindex $line_data $lno 0] - foreach i $w_columns { - $i tag remove g$g $lno.0 $lno_e - } - } - lset line_data $lno [list $cmit $file $oln] - - $cur_w delete $lno.0 "$lno.0 lineend" - if {$lno == $first_lno} { - $cur_w insert $lno.0 $commit_abbr $commit_type - } elseif {$lno == [expr {$first_lno + 1}]} { - $cur_w insert $lno.0 $author_abbr author_abbr - } else { - $cur_w insert $lno.0 { |} - } - - foreach i $w_columns { - if {$cur_w eq $w_amov} { - for {set g 0} \ - {$g < [llength $group_colors]} \ - {incr g} { - $i tag remove color$g $lno.0 $lno_e - } - $i tag add $color $lno.0 $lno_e - } - $i tag add g$cmit $lno.0 $lno_e - } - - if {$highlight_column eq $cur_w} { - if {$highlight_line == -1 - && [lindex [$w_file yview] 0] == 0} { - $w_file see $lno.0 - set highlight_line $lno - } - if {$highlight_line == $lno} { - _showcommit $this $cur_w $lno - } - } - - incr n -1 - incr lno - incr oln - incr blame_lines - } - - while { - $cmit eq [lindex $line_data $lno 0] - && $file eq [lindex $line_data $lno 1] - } { - $cur_w delete $lno.0 "$lno.0 lineend" - - if {$lno == $first_lno} { - $cur_w insert $lno.0 $commit_abbr $commit_type - } elseif {$lno == [expr {$first_lno + 1}]} { - $cur_w insert $lno.0 $author_abbr author_abbr - } else { - $cur_w insert $lno.0 { |} - } - - if {$cur_w eq $w_amov} { - foreach i $w_columns { - for {set g 0} \ - {$g < [llength $group_colors]} \ - {incr g} { - $i tag remove color$g $lno.0 $lno_e - } - $i tag add $color $lno.0 $lno_e - } - } - - incr lno - } - - } elseif {[regexp {^([a-z-]+) (.*)$} $line line key data]} { - set header($r_commit,$key) $data - } - } - $cur_w conf -state disabled - - if {[eof $fd]} { - close $fd - if {$cur_w eq $w_asim} { - # Switches for original location detection - set threshold [get_config gui.copyblamethreshold] - set original_options [list "-C$threshold"] - - if {![is_config_true gui.fastcopyblame]} { - # thorough copy search; insert before the threshold - set original_options [linsert $original_options 0 -C] - } - if {[git-version >= 1.5.3]} { - lappend original_options -w ; # ignore indentation changes - } - - _exec_blame $this $w_amov @amov_data \ - $original_options \ - [mc "Loading original location annotations..."] - } else { - set current_fd {} - $status_operation stop [mc "Annotation complete."] - set status_operation {} - } - } else { - $status_operation update $blame_lines $total_lines - } -} ifdeleted { catch {close $fd} } - -method _find_commit_bound {data_list start_idx delta} { - upvar #0 $data_list line_data - set pos $start_idx - set limit [expr {[llength $line_data] - 1}] - set base_commit [lindex $line_data $pos 0] - - while {$pos > 0 && $pos < $limit} { - set new_pos [expr {$pos + $delta}] - if {[lindex $line_data $new_pos 0] ne $base_commit} { - return $pos - } - - set pos $new_pos - } - - return $pos -} - -method _fullcopyblame {} { - if {$current_fd ne {}} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [mc "Busy"] \ - -message [mc "Annotation process is already running."] - - return - } - - # Switches for original location detection - set threshold [get_config gui.copyblamethreshold] - set original_options [list -C -C "-C$threshold"] - - if {[git-version >= 1.5.3]} { - lappend original_options -w ; # ignore indentation changes - } - - # Find the line range - set pos @$::cursorX,$::cursorY - set lno [lindex [split [$::cursorW index $pos] .] 0] - set min_amov_lno [_find_commit_bound $this @amov_data $lno -1] - set max_amov_lno [_find_commit_bound $this @amov_data $lno 1] - set min_asim_lno [_find_commit_bound $this @asim_data $lno -1] - set max_asim_lno [_find_commit_bound $this @asim_data $lno 1] - - if {$min_asim_lno < $min_amov_lno} { - set min_amov_lno $min_asim_lno - } - - if {$max_asim_lno > $max_amov_lno} { - set max_amov_lno $max_asim_lno - } - - lappend original_options -L "$min_amov_lno,$max_amov_lno" - - # Clear lines - for {set i $min_amov_lno} {$i <= $max_amov_lno} {incr i} { - lset amov_data $i [list ] - } - - # Start the back-end process - _exec_blame $this $w_amov @amov_data \ - $original_options \ - [mc "Running thorough copy detection..."] -} - -method _click {cur_w pos} { - set lno [lindex [split [$cur_w index $pos] .] 0] - _showcommit $this $cur_w $lno -} - -method _setencoding {enc} { - force_path_encoding $path $enc - _load $this [list \ - $highlight_column \ - $highlight_line \ - [lindex [$w_file xview] 0] \ - [lindex [$w_file yview] 0] \ - ] -} - -method _load_commit {cur_w cur_d pos} { - upvar #0 $cur_d line_data - set lno [lindex [split [$cur_w index $pos] .] 0] - set dat [lindex $line_data $lno] - if {$dat ne {}} { - _load_new_commit $this \ - [lindex $dat 0] \ - [lindex $dat 1] \ - [list [lindex $dat 2]] - } -} - -method _load_new_commit {new_commit new_path jump} { - lappend history [list \ - $commit $path \ - $highlight_column \ - $highlight_line \ - [lindex [$w_file xview] 0] \ - [lindex [$w_file yview] 0] \ - ] - - set commit $new_commit - set path $new_path - _load $this $jump -} - -method _showcommit {cur_w lno} { - global repo_config - variable active_color - - if {$highlight_commit ne {}} { - foreach i $w_columns { - $i tag conf g$highlight_commit -background {} - $i tag lower g$highlight_commit - } - } - - if {$cur_w eq $w_asim} { - set dat [lindex $asim_data $lno] - set highlight_column $w_asim - } else { - set dat [lindex $amov_data $lno] - set highlight_column $w_amov - } - - $w_cviewer conf -state normal - $w_cviewer delete 0.0 end - - if {$dat eq {}} { - set cmit {} - $w_cviewer insert end [mc "Loading annotation..."] still_loading - } else { - set cmit [lindex $dat 0] - set file [lindex $dat 1] - - foreach i $w_columns { - $i tag conf g$cmit -background $active_color - $i tag raise g$cmit - if {$i eq $w_file} { - $w_file tag raise found - } - $i tag raise sel - } - - set author_name {} - set author_email {} - set author_time {} - catch {set author_name $header($cmit,author)} - catch {set author_email $header($cmit,author-mail)} - catch {set author_time [format_date $header($cmit,author-time)]} - - set committer_name {} - set committer_email {} - set committer_time {} - catch {set committer_name $header($cmit,committer)} - catch {set committer_email $header($cmit,committer-mail)} - catch {set committer_time [format_date $header($cmit,committer-time)]} - - if {[catch {set msg $header($cmit,message)}]} { - set msg {} - catch { - set fd [git_read cat-file commit $cmit] - fconfigure $fd -encoding binary -translation lf - # By default commits are assumed to be in utf-8 - set enc utf-8 - while {[gets $fd line] > 0} { - if {[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] - } - set header($cmit,message) $msg - } - - $w_cviewer insert end "commit $cmit\n" header_key - $w_cviewer insert end [strcat [mc "Author:"] "\t"] header_key - $w_cviewer insert end "$author_name $author_email" header_val - $w_cviewer insert end " $author_time\n" header_val - - $w_cviewer insert end [strcat [mc "Committer:"] "\t"] header_key - $w_cviewer insert end "$committer_name $committer_email" header_val - $w_cviewer insert end " $committer_time\n" header_val - - if {$file ne $path} { - $w_cviewer insert end [strcat [mc "Original File:"] "\t"] header_key - $w_cviewer insert end "[escape_path $file]\n" header_val - } - - $w_cviewer insert end "\n$msg" - } - $w_cviewer conf -state disabled - - set highlight_line $lno - set highlight_commit $cmit - - if {[lsearch -exact $tooltip_commit $highlight_commit] != -1} { - _hide_tooltip $this - } -} - -method _get_click_amov_info {} { - set pos @$::cursorX,$::cursorY - set lno [lindex [split [$::cursorW index $pos] .] 0] - return [lindex $amov_data $lno] -} - -method _copycommit {} { - set dat [_get_click_amov_info $this] - if {$dat ne {}} { - clipboard clear - clipboard append \ - -format STRING \ - -type STRING \ - -- [lindex $dat 0] - } -} - -method _format_offset_date {base offset} { - set exval [expr {$base + $offset*24*60*60}] - return [clock format $exval -format {%Y-%m-%d}] -} - -method _gitkcommit {} { - global nullid - - set dat [_get_click_amov_info $this] - if {$dat ne {}} { - set cmit [lindex $dat 0] - - # If the line belongs to the working copy, use HEAD instead - if {$cmit eq $nullid} { - if {[catch {set cmit [git rev-parse --verify HEAD]} err]} { - error_popup [strcat [mc "Cannot find HEAD commit:"] "\n\n$err"] - return; - } - } - - set radius [get_config gui.blamehistoryctx] - set cmdline [list --select-commit=$cmit] - - if {$radius > 0} { - set author_time {} - set committer_time {} - - catch {set author_time $header($cmit,author-time)} - catch {set committer_time $header($cmit,committer-time)} - - if {$committer_time eq {}} { - set committer_time $author_time - } - - set after_time [_format_offset_date $this $committer_time [expr {-$radius}]] - set before_time [_format_offset_date $this $committer_time $radius] - - lappend cmdline --after=$after_time --before=$before_time - } - - lappend cmdline $cmit - - set base_rev "HEAD" - if {$commit ne {}} { - set base_rev $commit - } - - if {$base_rev ne $cmit} { - lappend cmdline $base_rev - } - - do_gitk $cmdline - } -} - -method _blameparent {} { - global nullid - - set dat [_get_click_amov_info $this] - if {$dat ne {}} { - set cmit [lindex $dat 0] - set new_path [lindex $dat 1] - - # Allow using Blame Parent on lines modified in the working copy - if {$cmit eq $nullid} { - set parent_ref "HEAD" - } else { - set parent_ref "$cmit^" - } - if {[catch {set cparent [git rev-parse --verify $parent_ref]} err]} { - error_popup [strcat [mc "Cannot find parent commit:"] "\n\n$err"] - return; - } - - _kill $this - - # Generate a diff between the commit and its parent, - # and use the hunks to update the line number. - # Request zero context to simplify calculations. - if {$cmit eq $nullid} { - set diffcmd [list diff-index --unified=0 $cparent -- $new_path] - } else { - set diffcmd [list diff-tree --unified=0 $cparent $cmit -- $new_path] - } - if {[catch {set fd [eval git_read $diffcmd]} err]} { - $status_operation stop [mc "Unable to display parent"] - error_popup [strcat [mc "Error loading diff:"] "\n\n$err"] - return - } - - set r_orig_line [lindex $dat 2] - - fconfigure $fd \ - -blocking 0 \ - -encoding binary \ - -translation binary - fileevent $fd readable [cb _read_diff_load_commit \ - $fd $cparent $new_path $r_orig_line] - set current_fd $fd - } -} - -method _read_diff_load_commit {fd cparent new_path tline} { - if {$fd ne $current_fd} { - catch {close $fd} - return - } - - while {[gets $fd line] >= 0} { - if {[regexp {^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@} $line line \ - old_line osz old_size new_line nsz new_size]} { - - if {$osz eq {}} { set old_size 1 } - if {$nsz eq {}} { set new_size 1 } - - if {$new_line <= $tline} { - if {[expr {$new_line + $new_size}] > $tline} { - # Target line within the hunk - set line_shift [expr { - ($new_size-$old_size)*($tline-$new_line)/$new_size - }] - } else { - set line_shift [expr {$new_size-$old_size}] - } - - set r_orig_line [expr {$r_orig_line - $line_shift}] - } - } - } - - if {[eof $fd]} { - close $fd - set current_fd {} - - _load_new_commit $this \ - $cparent \ - $new_path \ - [list $r_orig_line] - } -} ifdeleted { catch {close $fd} } - -method _show_tooltip {cur_w pos} { - if {$tooltip_wm ne {}} { - _open_tooltip $this $cur_w - } elseif {$tooltip_timer eq {}} { - set tooltip_timer [after 1000 [cb _open_tooltip $cur_w]] - } -} - -method _open_tooltip {cur_w} { - set tooltip_timer {} - set pos_x [winfo pointerx $cur_w] - set pos_y [winfo pointery $cur_w] - if {[winfo containing $pos_x $pos_y] ne $cur_w} { - _hide_tooltip $this - return - } - - if {$tooltip_wm ne "$cur_w.tooltip"} { - _hide_tooltip $this - - set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1] - catch {wm attributes $tooltip_wm -type tooltip} - wm overrideredirect $tooltip_wm 1 - wm transient $tooltip_wm [winfo toplevel $cur_w] - set tooltip_t $tooltip_wm.label - text $tooltip_t \ - -takefocus 0 \ - -highlightthickness 0 \ - -relief flat \ - -borderwidth 0 \ - -wrap none \ - -background lightyellow \ - -foreground black - $tooltip_t tag conf section_header -font font_uibold - pack $tooltip_t - } else { - $tooltip_t conf -state normal - $tooltip_t delete 0.0 end - } - - set pos @[join [list \ - [expr {$pos_x - [winfo rootx $cur_w]}] \ - [expr {$pos_y - [winfo rooty $cur_w]}]] ,] - set lno [lindex [split [$cur_w index $pos] .] 0] - if {$cur_w eq $w_amov} { - set dat [lindex $amov_data $lno] - set org {} - } else { - set dat [lindex $asim_data $lno] - set org [lindex $amov_data $lno] - } - - if {$dat eq {}} { - _hide_tooltip $this - return - } - - set cmit [lindex $dat 0] - set tooltip_commit [list $cmit] - - set author_name {} - set summary {} - set author_time {} - catch {set author_name $header($cmit,author)} - catch {set summary $header($cmit,summary)} - catch {set author_time [format_date $header($cmit,author-time)]} - - $tooltip_t insert end "commit $cmit\n" - $tooltip_t insert end "$author_name $author_time\n" - $tooltip_t insert end "$summary" - - if {$org ne {} && [lindex $org 0] ne $cmit} { - set save [$tooltip_t get 0.0 end] - $tooltip_t delete 0.0 end - - set cmit [lindex $org 0] - set file [lindex $org 1] - lappend tooltip_commit $cmit - - set author_name {} - set summary {} - set author_time {} - catch {set author_name $header($cmit,author)} - catch {set summary $header($cmit,summary)} - catch {set author_time [format_date $header($cmit,author-time)]} - - $tooltip_t insert end [strcat [mc "Originally By:"] "\n"] section_header - $tooltip_t insert end "commit $cmit\n" - $tooltip_t insert end "$author_name $author_time\n" - $tooltip_t insert end "$summary\n" - - if {$file ne $path} { - $tooltip_t insert end [strcat [mc "In File:"] " "] section_header - $tooltip_t insert end "$file\n" - } - - $tooltip_t insert end "\n" - $tooltip_t insert end [strcat [mc "Copied Or Moved Here By:"] "\n"] section_header - $tooltip_t insert end $save - } - - $tooltip_t conf -state disabled - _position_tooltip $this - - # On MacOS raising a window causes it to acquire focus. - # Tk 8.5 on MacOS seems to properly support wm transient, - # so we can safely counter the effect there. - if {$::have_tk85 && [is_MacOSX]} { - update - if {$w eq {}} { - raise . - } else { - raise $w - } - } -} - -method _position_tooltip {} { - set max_h [lindex [split [$tooltip_t index end] .] 0] - set max_w 0 - for {set i 1} {$i <= $max_h} {incr i} { - set c [lindex [split [$tooltip_t index "$i.0 lineend"] .] 1] - if {$c > $max_w} {set max_w $c} - } - $tooltip_t conf -width $max_w -height $max_h - - set req_w [winfo reqwidth $tooltip_t] - set req_h [winfo reqheight $tooltip_t] - set pos_x [expr {[winfo pointerx .] + 5}] - set pos_y [expr {[winfo pointery .] + 10}] - - set g "${req_w}x${req_h}" - if {[tk windowingsystem] eq "win32" || $pos_x >= 0} {append g +} - append g $pos_x - if {[tk windowingsystem] eq "win32" || $pos_y >= 0} {append g +} - append g $pos_y - - wm geometry $tooltip_wm $g - if {![is_MacOSX]} { - raise $tooltip_wm - } -} - -method _hide_tooltip {} { - if {$tooltip_wm ne {}} { - destroy $tooltip_wm - set tooltip_wm {} - set tooltip_commit {} - } - if {$tooltip_timer ne {}} { - after cancel $tooltip_timer - set tooltip_timer {} - } -} - -method _resize {new_height} { - set diff [expr {$new_height - $old_height}] - if {$diff == 0} return - - set my [expr {[winfo height $w.file_pane] - 25}] - set o [$w.file_pane sash coord 0] - set ox [lindex $o 0] - set oy [expr {[lindex $o 1] + $diff}] - if {$oy < 0} {set oy 0} - if {$oy > $my} {set oy $my} - $w.file_pane sash place 0 $ox $oy - - set old_height $new_height -} - -method _show_finder {} { - linebar::hide $gotoline - searchbar::show $finder -} - -method _show_linebar {} { - searchbar::hide $finder - linebar::show $gotoline -} - -} diff --git a/third_party/git/git-gui/lib/branch.tcl b/third_party/git/git-gui/lib/branch.tcl deleted file mode 100644 index 8b0c4858890f..000000000000 --- a/third_party/git/git-gui/lib/branch.tcl +++ /dev/null @@ -1,40 +0,0 @@ -# git-gui branch (create/delete) support -# Copyright (C) 2006, 2007 Shawn Pearce - -proc load_all_heads {} { - global some_heads_tracking - - set rh refs/heads - set rh_len [expr {[string length $rh] + 1}] - set all_heads [list] - set fd [git_read for-each-ref --format=%(refname) $rh] - fconfigure $fd -translation binary -encoding utf-8 - while {[gets $fd line] > 0} { - if {!$some_heads_tracking || ![is_tracking_branch $line]} { - lappend all_heads [string range $line $rh_len end] - } - } - close $fd - - return [lsort $all_heads] -} - -proc load_all_tags {} { - set all_tags [list] - set fd [git_read for-each-ref \ - --sort=-taggerdate \ - --format=%(refname) \ - refs/tags] - fconfigure $fd -translation binary -encoding utf-8 - while {[gets $fd line] > 0} { - if {![regsub ^refs/tags/ $line {} name]} continue - lappend all_tags $name - } - close $fd - return $all_tags -} - -proc radio_selector {varname value args} { - upvar #0 $varname var - set var $value -} diff --git a/third_party/git/git-gui/lib/branch_checkout.tcl b/third_party/git/git-gui/lib/branch_checkout.tcl deleted file mode 100644 index d06037decc1a..000000000000 --- a/third_party/git/git-gui/lib/branch_checkout.tcl +++ /dev/null @@ -1,93 +0,0 @@ -# git-gui branch checkout support -# Copyright (C) 2007 Shawn Pearce - -class branch_checkout { - -field w ; # widget path -field w_rev ; # mega-widget to pick the initial revision - -field opt_fetch 1; # refetch tracking branch if used? -field opt_detach 0; # force a detached head case? - -constructor dialog {} { - global use_ttk NS - make_dialog top w - wm withdraw $w - wm title $top [mc "%s (%s): Checkout Branch" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - } - - ${NS}::label $w.header -text [mc "Checkout Branch"] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.create -text [mc Checkout] \ - -default active \ - -command [cb _checkout] - pack $w.buttons.create -side right - ${NS}::button $w.buttons.cancel -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - set w_rev [::choose_rev::new $w.rev [mc Revision]] - $w_rev bind_listbox <Double-Button-1> [cb _checkout] - pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 - - ${NS}::labelframe $w.options -text [mc Options] - - ${NS}::checkbutton $w.options.fetch \ - -text [mc "Fetch Tracking Branch"] \ - -variable @opt_fetch - pack $w.options.fetch -anchor nw - - ${NS}::checkbutton $w.options.detach \ - -text [mc "Detach From Local Branch"] \ - -variable @opt_detach - pack $w.options.detach -anchor nw - - pack $w.options -anchor nw -fill x -pady 5 -padx 5 - - bind $w <Visibility> [cb _visible] - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [cb _checkout]\;break - wm deiconify $w - tkwait window $w -} - -method _checkout {} { - set spec [$w_rev get_tracking_branch] - if {$spec ne {} && $opt_fetch} { - set new {} - } elseif {[catch {set new [$w_rev commit_or_die]}]} { - return - } - - if {$opt_detach} { - set ref {} - } else { - set ref [$w_rev get_local_branch] - } - - set co [::checkout_op::new [$w_rev get] $new $ref] - $co parent $w - $co enable_checkout 1 - if {$spec ne {} && $opt_fetch} { - $co enable_fetch $spec - } - - if {[$co run]} { - destroy $w - } else { - $w_rev focus_filter - } -} - -method _visible {} { - grab $w - $w_rev focus_filter -} - -} diff --git a/third_party/git/git-gui/lib/branch_create.tcl b/third_party/git/git-gui/lib/branch_create.tcl deleted file mode 100644 index ba367d551d21..000000000000 --- a/third_party/git/git-gui/lib/branch_create.tcl +++ /dev/null @@ -1,224 +0,0 @@ -# git-gui branch create support -# Copyright (C) 2006, 2007 Shawn Pearce - -class branch_create { - -field w ; # widget path -field w_rev ; # mega-widget to pick the initial revision -field w_name ; # new branch name widget - -field name {}; # name of the branch the user has chosen -field name_type user; # type of branch name to use - -field opt_merge ff; # type of merge to apply to existing branch -field opt_checkout 1; # automatically checkout the new branch? -field opt_fetch 1; # refetch tracking branch if used? -field reset_ok 0; # did the user agree to reset? - -constructor dialog {} { - global repo_config use_ttk NS - - make_dialog top w - wm withdraw $w - wm title $top [mc "%s (%s): Create Branch" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - } - - ${NS}::label $w.header -text [mc "Create New Branch"] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.create -text [mc Create] \ - -default active \ - -command [cb _create] - pack $w.buttons.create -side right - ${NS}::button $w.buttons.cancel -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::labelframe $w.desc -text [mc "Branch Name"] - ${NS}::radiobutton $w.desc.name_r \ - -text [mc "Name:"] \ - -value user \ - -variable @name_type - if {!$use_ttk} {$w.desc.name_r configure -anchor w} - set w_name $w.desc.name_t - ${NS}::entry $w_name \ - -width 40 \ - -textvariable @name \ - -validate key \ - -validatecommand [cb _validate %d %S] - grid $w.desc.name_r $w_name -sticky we -padx {0 5} - - ${NS}::radiobutton $w.desc.match_r \ - -text [mc "Match Tracking Branch Name"] \ - -value match \ - -variable @name_type - if {!$use_ttk} {$w.desc.match_r configure -anchor w} - grid $w.desc.match_r -sticky we -padx {0 5} -columnspan 2 - - grid columnconfigure $w.desc 1 -weight 1 - pack $w.desc -anchor nw -fill x -pady 5 -padx 5 - - set w_rev [::choose_rev::new $w.rev [mc "Starting Revision"]] - pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 - - ${NS}::labelframe $w.options -text [mc Options] - - ${NS}::frame $w.options.merge - ${NS}::label $w.options.merge.l -text [mc "Update Existing Branch:"] - pack $w.options.merge.l -side left - ${NS}::radiobutton $w.options.merge.no \ - -text [mc No] \ - -value none \ - -variable @opt_merge - pack $w.options.merge.no -side left - ${NS}::radiobutton $w.options.merge.ff \ - -text [mc "Fast Forward Only"] \ - -value ff \ - -variable @opt_merge - pack $w.options.merge.ff -side left - ${NS}::radiobutton $w.options.merge.reset \ - -text [mc Reset] \ - -value reset \ - -variable @opt_merge - pack $w.options.merge.reset -side left - pack $w.options.merge -anchor nw - - ${NS}::checkbutton $w.options.fetch \ - -text [mc "Fetch Tracking Branch"] \ - -variable @opt_fetch - pack $w.options.fetch -anchor nw - - ${NS}::checkbutton $w.options.checkout \ - -text [mc "Checkout After Creation"] \ - -variable @opt_checkout - pack $w.options.checkout -anchor nw - pack $w.options -anchor nw -fill x -pady 5 -padx 5 - - trace add variable @name_type write [cb _select] - - set name $repo_config(gui.newbranchtemplate) - if {[is_config_true gui.matchtrackingbranch]} { - set name_type match - } - - bind $w <Visibility> [cb _visible] - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [cb _create]\;break - wm deiconify $w - tkwait window $w -} - -method _create {} { - global repo_config - global M1B - - set spec [$w_rev get_tracking_branch] - switch -- $name_type { - user { - set newbranch $name - } - match { - if {$spec eq {}} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Please select a tracking branch."] - return - } - if {![regsub ^refs/heads/ [lindex $spec 2] {} newbranch]} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Tracking branch %s is not a branch in the remote repository." [$w get]] - return - } - } - } - - if {$newbranch eq {} - || $newbranch eq $repo_config(gui.newbranchtemplate)} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Please supply a branch name."] - focus $w_name - return - } - - if {[catch {git check-ref-format "heads/$newbranch"}]} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "'%s' is not an acceptable branch name." $newbranch] - focus $w_name - return - } - - if {$spec ne {} && $opt_fetch} { - set new {} - } elseif {[catch {set new [$w_rev commit_or_die]}]} { - return - } - - set co [::checkout_op::new \ - [$w_rev get] \ - $new \ - refs/heads/$newbranch] - $co parent $w - $co enable_create 1 - $co enable_merge $opt_merge - $co enable_checkout $opt_checkout - if {$spec ne {} && $opt_fetch} { - $co enable_fetch $spec - } - if {$spec ne {}} { - $co remote_source $spec - } - - if {[$co run]} { - destroy $w - } else { - focus $w_name - } -} - -method _validate {d S} { - if {$d == 1} { - if {[regexp {[~^:?*\[\0- ]} $S]} { - return 0 - } - if {[string length $S] > 0} { - set name_type user - } - } - return 1 -} - -method _select {args} { - if {$name_type eq {match}} { - $w_rev pick_tracking_branch - } -} - -method _visible {} { - grab $w - if {$name_type eq {user}} { - $w_name icursor end - focus $w_name - } -} - -} diff --git a/third_party/git/git-gui/lib/branch_delete.tcl b/third_party/git/git-gui/lib/branch_delete.tcl deleted file mode 100644 index a5051637bbc2..000000000000 --- a/third_party/git/git-gui/lib/branch_delete.tcl +++ /dev/null @@ -1,147 +0,0 @@ -# git-gui branch delete support -# Copyright (C) 2007 Shawn Pearce - -class branch_delete { - -field w ; # widget path -field w_heads ; # listbox of local head names -field w_check ; # revision picker for merge test -field w_delete ; # delete button - -constructor dialog {} { - global current_branch use_ttk NS - - make_dialog top w - wm withdraw $w - wm title $top [mc "%s (%s): Delete Branch" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - } - - ${NS}::label $w.header -text [mc "Delete Local Branch"] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - set w_delete $w.buttons.delete - ${NS}::button $w_delete \ - -text [mc Delete] \ - -default active \ - -state disabled \ - -command [cb _delete] - pack $w_delete -side right - ${NS}::button $w.buttons.cancel \ - -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::labelframe $w.list -text [mc "Local Branches"] - set w_heads $w.list.l - slistbox $w_heads \ - -height 10 \ - -width 70 \ - -selectmode extended \ - -exportselection false - pack $w.list.l -side left -fill both -expand 1 - pack $w.list -fill both -expand 1 -pady 5 -padx 5 - - set w_check [choose_rev::new \ - $w.check \ - [mc "Delete Only If Merged Into"] \ - ] - $w_check none [mc "Always (Do not perform merge checks)"] - pack $w.check -anchor nw -fill x -pady 5 -padx 5 - - foreach h [load_all_heads] { - if {$h ne $current_branch} { - $w_heads insert end $h - } - } - - bind $w_heads <<ListboxSelect>> [cb _select] - bind $w <Visibility> " - grab $w - focus $w - " - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [cb _delete]\;break - wm deiconify $w - tkwait window $w -} - -method _select {} { - if {[$w_heads curselection] eq {}} { - $w_delete configure -state disabled - } else { - $w_delete configure -state normal - } -} - -method _delete {} { - if {[catch {set check_cmt [$w_check commit_or_die]}]} { - return - } - - set to_delete [list] - set not_merged [list] - foreach i [$w_heads curselection] { - set b [$w_heads get $i] - if {[catch { - set o [git rev-parse --verify "refs/heads/$b"] - }]} continue - if {$check_cmt ne {}} { - if {[catch {set m [git merge-base $o $check_cmt]}]} continue - if {$o ne $m} { - lappend not_merged $b - continue - } - } - lappend to_delete [list $b $o] - } - if {$not_merged ne {}} { - set msg "[mc "The following branches are not completely merged into %s:" [$w_check get]] - - - [join $not_merged "\n - "]" - tk_messageBox \ - -icon info \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message $msg - } - if {$to_delete eq {}} return - if {$check_cmt eq {}} { - set msg [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"] - if {[tk_messageBox \ - -icon warning \ - -type yesno \ - -title [wm title $w] \ - -parent $w \ - -message $msg] ne yes} { - return - } - } - - set failed {} - foreach i $to_delete { - set b [lindex $i 0] - set o [lindex $i 1] - if {[catch {git branch -D $b} err]} { - append failed [mc " - %s:" $b] " $err\n" - } - } - - if {$failed ne {}} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Failed to delete branches:\n%s" $failed] - } - - destroy $w -} - -} diff --git a/third_party/git/git-gui/lib/branch_rename.tcl b/third_party/git/git-gui/lib/branch_rename.tcl deleted file mode 100644 index 3a2d79a9cc3a..000000000000 --- a/third_party/git/git-gui/lib/branch_rename.tcl +++ /dev/null @@ -1,134 +0,0 @@ -# git-gui branch rename support -# Copyright (C) 2007 Shawn Pearce - -class branch_rename { - -field w -field oldname -field newname - -constructor dialog {} { - global current_branch use_ttk NS - - make_dialog top w - wm withdraw $w - wm title $top [mc "%s (%s): Rename Branch" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - } - - set oldname $current_branch - set newname [get_config gui.newbranchtemplate] - - ${NS}::label $w.header -text [mc "Rename Branch"]\ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.rename -text [mc Rename] \ - -default active \ - -command [cb _rename] - pack $w.buttons.rename -side right - ${NS}::button $w.buttons.cancel -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::frame $w.rename - ${NS}::label $w.rename.oldname_l -text [mc "Branch:"] - if {$use_ttk} { - ttk::combobox $w.rename.oldname_m -textvariable @oldname \ - -values [load_all_heads] -state readonly - } else { - eval tk_optionMenu $w.rename.oldname_m @oldname [load_all_heads] - } - - ${NS}::label $w.rename.newname_l -text [mc "New Name:"] - ${NS}::entry $w.rename.newname_t \ - -width 40 \ - -textvariable @newname \ - -validate key \ - -validatecommand { - if {%d == 1 && [regexp {[~^:?*\[\0- ]} %S]} {return 0} - return 1 - } - - grid $w.rename.oldname_l $w.rename.oldname_m -sticky we -padx {0 5} - grid $w.rename.newname_l $w.rename.newname_t -sticky we -padx {0 5} - grid columnconfigure $w.rename 1 -weight 1 - pack $w.rename -anchor nw -fill x -pady 5 -padx 5 - - bind $w <Key-Return> [cb _rename] - bind $w <Key-Escape> [list destroy $w] - bind $w <Visibility> " - grab $w - $w.rename.newname_t icursor end - focus $w.rename.newname_t - " - wm deiconify $w - tkwait window $w -} - -method _rename {} { - global current_branch - - if {$oldname eq {}} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Please select a branch to rename."] - focus $w.rename.oldname_m - return - } - if {$newname eq {} - || $newname eq [get_config gui.newbranchtemplate]} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Please supply a branch name."] - focus $w.rename.newname_t - return - } - if {![catch {git show-ref --verify -- "refs/heads/$newname"}]} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Branch '%s' already exists." $newname] - focus $w.rename.newname_t - return - } - if {[catch {git check-ref-format "heads/$newname"}]} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "'%s' is not an acceptable branch name." $newname] - focus $w.rename.newname_t - return - } - - if {[catch {git branch -m $oldname $newname} err]} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [strcat [mc "Failed to rename '%s'." $oldname] "\n\n$err"] - return - } - - if {$current_branch eq $oldname} { - set current_branch $newname - } - - destroy $w -} - -} diff --git a/third_party/git/git-gui/lib/browser.tcl b/third_party/git/git-gui/lib/browser.tcl deleted file mode 100644 index a98298366763..000000000000 --- a/third_party/git/git-gui/lib/browser.tcl +++ /dev/null @@ -1,322 +0,0 @@ -# git-gui tree browser -# Copyright (C) 2006, 2007 Shawn Pearce - -class browser { - -image create photo ::browser::img_parent -data {R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=} -image create photo ::browser::img_rblob -data {R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=} -image create photo ::browser::img_xblob -data {R0lGODlhEAAQAIYAAPwCBFRWVFxaXNza3OTi3Nze3Ly2tJyanPz+/Ozq7GxubNzSxMzOzMTGxHRybDQyNLy+vHRydHx6fKSipISChIyKjGxqbERCRCwuLLy6vGRiZExKTCQiJAwKDLSytLy2rJSSlHx+fDw6PKyqrBQWFPTu5Ozm3LyulLS2tCQmJAQCBPTq3Ozi1MSynCwqLAQGBOTazOzizOzezLyqjBweHNzSvOzaxKyurHRuZNzOtLymhDw+PIyCdOzWvOTOpLyidNzKtOTStLyifMTCtMS+rLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAEChYeGg4oCAwQFjgYBBwGKggEECJkICQoIkwADCwwNDY2mDA4Lng8QDhESsLARExQVDhYXGBkWExIaGw8cHR4SCQQfFQ8eFgUgIQEiwiMSBMYfGB4atwEXDyQd0wQlJicPKAHoFyIpJCoeDgMrLC0YKBsX6i4kL+4OMDEyZijr5oLGNxUqUCioEcPGDAwjPNyI6MEDChQjcOSwsUDHgw07RIgI4KCkAgs8cvTw8eOBogAxQtXIASTISiEuBwUYMoRIixYnZggpUgTDywdIkWJIitRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} -image create photo ::browser::img_tree -data {R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=} -image create photo ::browser::img_symlink -data {R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} -image create photo ::browser::img_unknown -data {R0lGODlhEAAQAIUAAPwCBFxaXIyKjNTW1Nze3LS2tJyanER2RGS+VPz+/PTu5GxqbPz69BQ6BCxeLFSqRPT29HRydMzOzDQyNERmPKSypCRWHIyKhERCRDyGPKz2nESiLBxGHCyCHGxubPz6/PTy7Ozi1Ly2rKSipOzm3LyqlKSWhCRyFOzizLymhNTKtNzOvOzaxOTStPz27OzWvOTOpLSupLyedMS+rMS6pMSulLyqjLymfLyifAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAamQIAQECgajcOkYEBoDgoBQyAJOCCuiENCsWBIh9aGw9F4HCARiXciRDQoBUnlYRlcIgsMG5CxXAgMGhscBRAEBRd7AB0eBBoIgxUfICEiikSPgyMMIAokJZcBkBybJgomIaBJAZoMpyCmqkMBFCcVCrgKKAwpoSorKqchKCwtvasIFBIhLiYvLzDHsxQNMcMKLDAwMqEz3jQ1NTY3ONyrE+jp6hN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} - -field w -field browser_commit -field browser_path -field browser_files {} -field browser_status [mc "Starting..."] -field browser_stack {} -field browser_busy 1 - -field ls_buf {}; # Buffered record output from ls-tree - -constructor new {commit {path {}}} { - global cursor_ptr M1B use_ttk NS - make_dialog top w - wm withdraw $top - wm title $top [mc "%s (%s): File Browser" [appname] [reponame]] - - if {$path ne {}} { - if {[string index $path end] ne {/}} { - append path / - } - } - - set browser_commit $commit - set browser_path "$browser_commit:[escape_path $path]" - - ${NS}::label $w.path \ - -textvariable @browser_path \ - -anchor w \ - -justify left \ - -font font_uibold - if {!$use_ttk} { $w.path configure -borderwidth 1 -relief sunken} - pack $w.path -anchor w -side top -fill x - - ${NS}::frame $w.list - set w_list $w.list.l - text $w_list -background white -foreground black \ - -borderwidth 0 \ - -cursor $cursor_ptr \ - -state disabled \ - -wrap none \ - -height 20 \ - -width 70 \ - -xscrollcommand [list $w.list.sbx set] \ - -yscrollcommand [list $w.list.sby set] - rmsel_tag $w_list - ${NS}::scrollbar $w.list.sbx -orient h -command [list $w_list xview] - ${NS}::scrollbar $w.list.sby -orient v -command [list $w_list yview] - pack $w.list.sbx -side bottom -fill x - pack $w.list.sby -side right -fill y - pack $w_list -side left -fill both -expand 1 - pack $w.list -side top -fill both -expand 1 - - ${NS}::label $w.status \ - -textvariable @browser_status \ - -anchor w \ - -justify left - if {!$use_ttk} { $w.status configure -borderwidth 1 -relief sunken} - pack $w.status -anchor w -side bottom -fill x - - bind $w_list <Button-1> "[cb _click 0 @%x,%y];break" - bind $w_list <Double-Button-1> "[cb _click 1 @%x,%y];break" - bind $w_list <$M1B-Up> "[cb _parent] ;break" - bind $w_list <$M1B-Left> "[cb _parent] ;break" - bind $w_list <Up> "[cb _move -1] ;break" - bind $w_list <Down> "[cb _move 1] ;break" - bind $w_list <$M1B-Right> "[cb _enter] ;break" - bind $w_list <Return> "[cb _enter] ;break" - bind $w_list <Prior> "[cb _page -1] ;break" - bind $w_list <Next> "[cb _page 1] ;break" - bind $w_list <Left> break - bind $w_list <Right> break - - bind $w_list <Visibility> [list focus $w_list] - wm deiconify $top - set w $w_list - if {$path ne {}} { - _ls $this $browser_commit:$path $path - } else { - _ls $this $browser_commit $path - } - return $this -} - -method _move {dir} { - if {$browser_busy} return - set lno [lindex [split [$w index in_sel.first] .] 0] - incr lno $dir - if {[lindex $browser_files [expr {$lno - 1}]] ne {}} { - $w tag remove in_sel 0.0 end - $w tag add in_sel $lno.0 [expr {$lno + 1}].0 - $w see $lno.0 - } -} - -method _page {dir} { - if {$browser_busy} return - $w yview scroll $dir pages - set lno [expr {int( - [lindex [$w yview] 0] - * [llength $browser_files] - + 1)}] - if {[lindex $browser_files [expr {$lno - 1}]] ne {}} { - $w tag remove in_sel 0.0 end - $w tag add in_sel $lno.0 [expr {$lno + 1}].0 - $w see $lno.0 - } -} - -method _parent {} { - if {$browser_busy} return - set info [lindex $browser_files 0] - if {[lindex $info 0] eq {parent}} { - set parent [lindex $browser_stack end-1] - set browser_stack [lrange $browser_stack 0 end-2] - if {$browser_stack eq {}} { - regsub {:.*$} $browser_path {:} browser_path - } else { - regsub {/[^/]+/$} $browser_path {/} browser_path - } - set browser_status [mc "Loading %s..." $browser_path] - _ls $this [lindex $parent 0] [lindex $parent 1] - } -} - -method _enter {} { - if {$browser_busy} return - set lno [lindex [split [$w index in_sel.first] .] 0] - set info [lindex $browser_files [expr {$lno - 1}]] - if {$info ne {}} { - switch -- [lindex $info 0] { - parent { - _parent $this - } - tree { - set name [lindex $info 2] - set escn [escape_path $name] - set browser_status [mc "Loading %s..." $escn] - append browser_path $escn - _ls $this [lindex $info 1] $name - } - blob { - set name [lindex $info 2] - set p {} - foreach n $browser_stack { - append p [lindex $n 1] - } - append p $name - blame::new $browser_commit $p {} - } - } - } -} - -method _click {was_double_click pos} { - if {$browser_busy} return - set lno [lindex [split [$w index $pos] .] 0] - focus $w - - if {[lindex $browser_files [expr {$lno - 1}]] ne {}} { - $w tag remove in_sel 0.0 end - $w tag add in_sel $lno.0 [expr {$lno + 1}].0 - if {$was_double_click} { - _enter $this - } - } -} - -method _ls {tree_id {name {}}} { - set ls_buf {} - set browser_files {} - set browser_busy 1 - - $w conf -state normal - $w tag remove in_sel 0.0 end - $w delete 0.0 end - if {$browser_stack ne {}} { - $w image create end \ - -align center -padx 5 -pady 1 \ - -name icon0 \ - -image ::browser::img_parent - $w insert end [mc "\[Up To Parent\]"] - lappend browser_files parent - } - lappend browser_stack [list $tree_id $name] - $w conf -state disabled - - set fd [git_read ls-tree -z $tree_id] - fconfigure $fd -blocking 0 -translation binary -encoding utf-8 - fileevent $fd readable [cb _read $fd] -} - -method _read {fd} { - append ls_buf [read $fd] - set pck [split $ls_buf "\0"] - set ls_buf [lindex $pck end] - - set n [llength $browser_files] - $w conf -state normal - foreach p [lrange $pck 0 end-1] { - set tab [string first "\t" $p] - if {$tab == -1} continue - - set info [split [string range $p 0 [expr {$tab - 1}]] { }] - set path [string range $p [expr {$tab + 1}] end] - set type [lindex $info 1] - set object [lindex $info 2] - - switch -- $type { - blob { - scan [lindex $info 0] %o mode - if {$mode == 0120000} { - set image ::browser::img_symlink - } elseif {($mode & 0100) != 0} { - set image ::browser::img_xblob - } else { - set image ::browser::img_rblob - } - } - tree { - set image ::browser::img_tree - append path / - } - default { - set image ::browser::img_unknown - } - } - - if {$n > 0} {$w insert end "\n"} - $w image create end \ - -align center -padx 5 -pady 1 \ - -name icon[incr n] \ - -image $image - $w insert end [escape_path $path] - lappend browser_files [list $type $object $path] - } - $w conf -state disabled - - if {[eof $fd]} { - close $fd - set browser_status [mc "Ready."] - set browser_busy 0 - set ls_buf {} - if {$n > 0} { - $w tag add in_sel 1.0 2.0 - focus -force $w - } - } -} ifdeleted { - catch {close $fd} -} - -} - -class browser_open { - -field w ; # widget path -field w_rev ; # mega-widget to pick the initial revision - -constructor dialog {} { - global use_ttk NS - make_dialog top w - wm withdraw $top - wm title $top [mc "%s (%s): Browse Branch Files" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - wm transient $top . - } - - ${NS}::label $w.header \ - -text [mc "Browse Branch Files"] \ - -font font_uibold \ - -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.browse -text [mc Browse] \ - -default active \ - -command [cb _open] - pack $w.buttons.browse -side right - ${NS}::button $w.buttons.cancel -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - set w_rev [::choose_rev::new $w.rev [mc Revision]] - $w_rev bind_listbox <Double-Button-1> [cb _open] - pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 - - bind $w <Visibility> [cb _visible] - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [cb _open]\;break - wm deiconify $top - tkwait window $w -} - -method _open {} { - if {[catch {$w_rev commit_or_die} err]} { - return - } - set name [$w_rev get] - destroy $w - browser::new $name -} - -method _visible {} { - grab $w - $w_rev focus_filter -} - -} diff --git a/third_party/git/git-gui/lib/checkout_op.tcl b/third_party/git/git-gui/lib/checkout_op.tcl deleted file mode 100644 index 21ea768d8036..000000000000 --- a/third_party/git/git-gui/lib/checkout_op.tcl +++ /dev/null @@ -1,646 +0,0 @@ -# git-gui commit checkout support -# Copyright (C) 2007 Shawn Pearce - -class checkout_op { - -field w {}; # our window (if we have one) -field w_cons {}; # embedded console window object - -field new_expr ; # expression the user saw/thinks this is -field new_hash ; # commit SHA-1 we are switching to -field new_ref ; # ref we are updating/creating -field old_hash ; # commit SHA-1 that was checked out when we started - -field parent_w .; # window that started us -field merge_type none; # type of merge to apply to existing branch -field merge_base {}; # merge base if we have another ref involved -field fetch_spec {}; # refetch tracking branch if used? -field checkout 1; # actually checkout the branch? -field create 0; # create the branch if it doesn't exist? -field remote_source {}; # same as fetch_spec, to setup tracking - -field reset_ok 0; # did the user agree to reset? -field fetch_ok 0; # did the fetch succeed? - -field readtree_d {}; # buffered output from read-tree -field update_old {}; # was the update-ref call deferred? -field reflog_msg {}; # log message for the update-ref call - -constructor new {expr hash {ref {}}} { - set new_expr $expr - set new_hash $hash - set new_ref $ref - - return $this -} - -method parent {path} { - set parent_w [winfo toplevel $path] -} - -method enable_merge {type} { - set merge_type $type -} - -method enable_fetch {spec} { - set fetch_spec $spec -} - -method remote_source {spec} { - set remote_source $spec -} - -method enable_checkout {co} { - set checkout $co -} - -method enable_create {co} { - set create $co -} - -method run {} { - if {$fetch_spec ne {}} { - global M1B - - # We were asked to refresh a single tracking branch - # before we get to work. We should do that before we - # consider any ref updating. - # - set fetch_ok 0 - set l_trck [lindex $fetch_spec 0] - set remote [lindex $fetch_spec 1] - set r_head [lindex $fetch_spec 2] - regsub ^refs/heads/ $r_head {} r_name - - set cmd [list git fetch $remote] - if {$l_trck ne {}} { - lappend cmd +$r_head:$l_trck - } else { - lappend cmd $r_head - } - - _toplevel $this {Refreshing Tracking Branch} - set w_cons [::console::embed \ - $w.console \ - [mc "Fetching %s from %s" $r_name $remote]] - pack $w.console -fill both -expand 1 - $w_cons exec $cmd [cb _finish_fetch] - - bind $w <$M1B-Key-w> break - bind $w <$M1B-Key-W> break - bind $w <Visibility> " - [list grab $w] - [list focus $w] - " - wm protocol $w WM_DELETE_WINDOW [cb _noop] - tkwait window $w - - if {!$fetch_ok} { - delete_this - return 0 - } - } - - if {$new_ref ne {}} { - # If we have a ref we need to update it before we can - # proceed with a checkout (if one was enabled). - # - if {![_update_ref $this]} { - delete_this - return 0 - } - } - - if {$checkout} { - _checkout $this - return 1 - } - - delete_this - return 1 -} - -method _noop {} {} - -method _finish_fetch {ok} { - if {$ok} { - set l_trck [lindex $fetch_spec 0] - if {$l_trck eq {}} { - set l_trck FETCH_HEAD - } - if {[catch {set new_hash [git rev-parse --verify "$l_trck^0"]} err]} { - set ok 0 - $w_cons insert [mc "fatal: Cannot resolve %s" $l_trck] - $w_cons insert $err - } - } - - $w_cons done $ok - set w_cons {} - wm protocol $w WM_DELETE_WINDOW {} - - if {$ok} { - destroy $w - set w {} - } else { - button $w.close -text [mc Close] -command [list destroy $w] - pack $w.close -side bottom -anchor e -padx 10 -pady 10 - } - - set fetch_ok $ok -} - -method _update_ref {} { - global null_sha1 current_branch repo_config - - set ref $new_ref - set new $new_hash - - set is_current 0 - set rh refs/heads/ - set rn [string length $rh] - if {[string equal -length $rn $rh $ref]} { - set newbranch [string range $ref $rn end] - if {$current_branch eq $newbranch} { - set is_current 1 - } - } else { - set newbranch $ref - } - - if {[catch {set cur [git rev-parse --verify "$ref^0"]}]} { - # Assume it does not exist, and that is what the error was. - # - if {!$create} { - _error $this [mc "Branch '%s' does not exist." $newbranch] - return 0 - } - - set reflog_msg "branch: Created from $new_expr" - set cur $null_sha1 - - if {($repo_config(branch.autosetupmerge) eq {true} - || $repo_config(branch.autosetupmerge) eq {always}) - && $remote_source ne {} - && "refs/heads/$newbranch" eq $ref} { - - set c_remote [lindex $remote_source 1] - set c_merge [lindex $remote_source 2] - if {[catch { - git config branch.$newbranch.remote $c_remote - git config branch.$newbranch.merge $c_merge - } err]} { - _error $this [strcat \ - [mc "Failed to configure simplified git-pull for '%s'." $newbranch] \ - "\n\n$err"] - } - } - } elseif {$create && $merge_type eq {none}} { - # We were told to create it, but not do a merge. - # Bad. Name shouldn't have existed. - # - _error $this [mc "Branch '%s' already exists." $newbranch] - return 0 - } elseif {!$create && $merge_type eq {none}} { - # We aren't creating, it exists and we don't merge. - # We are probably just a simple branch switch. - # Use whatever value we just read. - # - set new $cur - set new_hash $cur - } elseif {$new eq $cur} { - # No merge would be required, don't compute anything. - # - } else { - catch {set merge_base [git merge-base $new $cur]} - if {$merge_base eq $cur} { - # The current branch is older. - # - set reflog_msg "merge $new_expr: Fast-forward" - } else { - switch -- $merge_type { - ff { - if {$merge_base eq $new} { - # The current branch is actually newer. - # - set new $cur - set new_hash $cur - } else { - _error $this [mc "Branch '%s' already exists.\n\nIt cannot fast-forward to %s.\nA merge is required." $newbranch $new_expr] - return 0 - } - } - reset { - # The current branch will lose things. - # - if {[_confirm_reset $this $cur]} { - set reflog_msg "reset $new_expr" - } else { - return 0 - } - } - default { - _error $this [mc "Merge strategy '%s' not supported." $merge_type] - return 0 - } - } - } - } - - if {$new ne $cur} { - if {$is_current} { - # No so fast. We should defer this in case - # we cannot update the working directory. - # - set update_old $cur - return 1 - } - - if {[catch { - git update-ref -m $reflog_msg $ref $new $cur - } err]} { - _error $this [strcat [mc "Failed to update '%s'." $newbranch] "\n\n$err"] - return 0 - } - } - - return 1 -} - -method _checkout {} { - if {[lock_index checkout_op]} { - after idle [cb _start_checkout] - } else { - _error $this [mc "Staging area (index) is already locked."] - delete_this - } -} - -method _start_checkout {} { - global HEAD commit_type - - # -- Our in memory state should match the repository. - # - repository_state curType old_hash curMERGE_HEAD - if {[string match amend* $commit_type] - && $curType eq {normal} - && $old_hash eq $HEAD} { - } elseif {$commit_type ne $curType || $HEAD ne $old_hash} { - 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 the current branch can be changed. - -The rescan will be automatically started now. -"] - unlock_index - rescan ui_ready - delete_this - return - } - - if {$old_hash eq $new_hash} { - _after_readtree $this - } elseif {[is_config_true gui.trustmtime]} { - _readtree $this - } else { - ui_status [mc "Refreshing file status..."] - set fd [git_read update-index \ - -q \ - --unmerged \ - --ignore-missing \ - --refresh \ - ] - fconfigure $fd -blocking 0 -translation binary - fileevent $fd readable [cb _refresh_wait $fd] - } -} - -method _refresh_wait {fd} { - read $fd - if {[eof $fd]} { - close $fd - _readtree $this - } -} - -method _name {} { - if {$new_ref eq {}} { - return [string range $new_hash 0 7] - } - - set rh refs/heads/ - set rn [string length $rh] - if {[string equal -length $rn $rh $new_ref]} { - return [string range $new_ref $rn end] - } else { - return $new_ref - } -} - -method _readtree {} { - global HEAD - - set readtree_d {} - set status_bar_operation [$::main_status start \ - [mc "Updating working directory to '%s'..." [_name $this]] \ - [mc "files checked out"]] - - set fd [git_read --stderr read-tree \ - -m \ - -u \ - -v \ - --exclude-per-directory=.gitignore \ - $HEAD \ - $new_hash \ - ] - fconfigure $fd -blocking 0 -translation binary - fileevent $fd readable [cb _readtree_wait $fd $status_bar_operation] -} - -method _readtree_wait {fd status_bar_operation} { - global current_branch - - set buf [read $fd] - $status_bar_operation update_meter $buf - append readtree_d $buf - - fconfigure $fd -blocking 1 - if {![eof $fd]} { - fconfigure $fd -blocking 0 - $status_bar_operation stop - return - } - - if {[catch {close $fd}]} { - set err $readtree_d - regsub {^fatal: } $err {} err - $status_bar_operation stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]] - warn_popup [strcat [mc "File level merge required."] " - -$err - -" [mc "Staying on branch '%s'." $current_branch]] - unlock_index - delete_this - return - } - - $status_bar_operation stop - _after_readtree $this -} - -method _after_readtree {} { - global commit_type HEAD MERGE_HEAD PARENT - global current_branch is_detached - global ui_comm - - set name [_name $this] - set log "checkout: moving" - if {!$is_detached} { - append log " from $current_branch" - } - - # -- Move/create HEAD as a symbolic ref. Core git does not - # even check for failure here, it Just Works(tm). If it - # doesn't we are in some really ugly state that is difficult - # to recover from within git-gui. - # - set rh refs/heads/ - set rn [string length $rh] - if {[string equal -length $rn $rh $new_ref]} { - set new_branch [string range $new_ref $rn end] - if {$is_detached || $current_branch ne $new_branch} { - append log " to $new_branch" - if {[catch { - git symbolic-ref -m $log HEAD $new_ref - } err]} { - _fatal $this $err - } - set current_branch $new_branch - set is_detached 0 - } - } else { - if {!$is_detached || $new_hash ne $HEAD} { - append log " to $new_expr" - if {[catch { - _detach_HEAD $log $new_hash - } err]} { - _fatal $this $err - } - } - set current_branch HEAD - set is_detached 1 - } - - # -- We had to defer updating the branch itself until we - # knew the working directory would update. So now we - # need to finish that work. If it fails we're in big - # trouble. - # - if {$update_old ne {}} { - if {[catch { - git update-ref \ - -m $reflog_msg \ - $new_ref \ - $new_hash \ - $update_old - } err]} { - _fatal $this $err - } - } - - if {$is_detached} { - info_popup [mc "You are no longer on a local branch. - -If you wanted to be on a branch, create one now starting from 'This Detached Checkout'."] - } - - # -- Run the post-checkout hook. - # - set fd_ph [githook_read post-checkout $old_hash $new_hash 1] - if {$fd_ph ne {}} { - global pch_error - set pch_error {} - fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} - fileevent $fd_ph readable [cb _postcheckout_wait $fd_ph] - } else { - _update_repo_state $this - } -} - -method _postcheckout_wait {fd_ph} { - global pch_error - - append pch_error [read $fd_ph] - fconfigure $fd_ph -blocking 1 - if {[eof $fd_ph]} { - if {[catch {close $fd_ph}]} { - hook_failed_popup post-checkout $pch_error 0 - } - unset pch_error - _update_repo_state $this - return - } - fconfigure $fd_ph -blocking 0 -} - -method _update_repo_state {} { - # -- Update our repository state. If we were previously in - # amend mode we need to toss the current buffer and do a - # full rescan to update our file lists. If we weren't in - # amend mode our file lists are accurate and we can avoid - # the rescan. - # - global commit_type_is_amend commit_type HEAD MERGE_HEAD PARENT - global ui_comm - - unlock_index - set name [_name $this] - set commit_type_is_amend 0 - if {[string match amend* $commit_type]} { - $ui_comm delete 0.0 end - $ui_comm edit reset - $ui_comm edit modified false - rescan [list ui_status [mc "Checked out '%s'." $name]] - } else { - repository_state commit_type HEAD MERGE_HEAD - set PARENT $HEAD - ui_status [mc "Checked out '%s'." $name] - } - delete_this -} - -git-version proc _detach_HEAD {log new} { - >= 1.5.3 { - git update-ref --no-deref -m $log HEAD $new - } - default { - set p [gitdir HEAD] - file delete $p - set fd [open $p w] - fconfigure $fd -translation lf -encoding utf-8 - puts $fd $new - close $fd - } -} - -method _confirm_reset {cur} { - set reset_ok 0 - set name [_name $this] - set gitk [list do_gitk [list $cur ^$new_hash]] - - _toplevel $this {Confirm Branch Reset} - pack [label $w.msg1 \ - -anchor w \ - -justify left \ - -text [mc "Resetting '%s' to '%s' will lose the following commits:" $name $new_expr]\ - ] -anchor w - - set list $w.list.l - frame $w.list - text $list \ - -font font_diff \ - -width 80 \ - -height 10 \ - -wrap none \ - -xscrollcommand [list $w.list.sbx set] \ - -yscrollcommand [list $w.list.sby set] - scrollbar $w.list.sbx -orient h -command [list $list xview] - scrollbar $w.list.sby -orient v -command [list $list yview] - pack $w.list.sbx -fill x -side bottom - pack $w.list.sby -fill y -side right - pack $list -fill both -expand 1 - pack $w.list -fill both -expand 1 -padx 5 -pady 5 - - pack [label $w.msg2 \ - -anchor w \ - -justify left \ - -text [mc "Recovering lost commits may not be easy."] \ - ] - pack [label $w.msg3 \ - -anchor w \ - -justify left \ - -text [mc "Reset '%s'?" $name] \ - ] - - frame $w.buttons - button $w.buttons.visualize \ - -text [mc Visualize] \ - -command $gitk - pack $w.buttons.visualize -side left - button $w.buttons.reset \ - -text [mc Reset] \ - -command " - set @reset_ok 1 - destroy $w - " - pack $w.buttons.reset -side right - button $w.buttons.cancel \ - -default active \ - -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - set fd [git_read rev-list --pretty=oneline $cur ^$new_hash] - while {[gets $fd line] > 0} { - set abbr [string range $line 0 7] - set subj [string range $line 41 end] - $list insert end "$abbr $subj\n" - } - close $fd - $list configure -state disabled - - bind $w <Key-v> $gitk - bind $w <Visibility> " - grab $w - focus $w.buttons.cancel - " - bind $w <Key-Return> [list destroy $w] - bind $w <Key-Escape> [list destroy $w] - tkwait window $w - return $reset_ok -} - -method _error {msg} { - if {[winfo ismapped $parent_w]} { - set p $parent_w - } else { - set p . - } - - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $p] \ - -parent $p \ - -message $msg -} - -method _toplevel {title} { - regsub -all {::} $this {__} w - set w .$w - - if {[winfo ismapped $parent_w]} { - set p $parent_w - } else { - set p . - } - - toplevel $w - wm title $w $title - wm geometry $w "+[winfo rootx $p]+[winfo rooty $p]" -} - -method _fatal {err} { - error_popup [strcat [mc "Failed to set current branch. - -This working directory is only partially switched. We successfully updated your files, but failed to update an internal Git file. - -This should not have occurred. %s will now close and give up." [appname]] " - -$err"] - exit 1 -} - -} diff --git a/third_party/git/git-gui/lib/choose_font.tcl b/third_party/git/git-gui/lib/choose_font.tcl deleted file mode 100644 index ebe50bd7d07e..000000000000 --- a/third_party/git/git-gui/lib/choose_font.tcl +++ /dev/null @@ -1,171 +0,0 @@ -# git-gui font chooser -# Copyright (C) 2007 Shawn Pearce - -class choose_font { - -field w -field w_family ; # UI widget of all known family names -field w_example ; # Example to showcase the chosen font - -field f_family ; # Currently chosen family name -field f_size ; # Currently chosen point size - -field v_family ; # Name of global variable for family -field v_size ; # Name of global variable for size - -variable all_families [list] ; # All fonts known to Tk - -constructor pick {path title a_family a_size} { - variable all_families - global use_ttk NS - - set v_family $a_family - set v_size $a_size - - upvar #0 $v_family pv_family - upvar #0 $v_size pv_size - - set f_family $pv_family - set f_size $pv_size - - make_dialog top w - wm withdraw $top - wm title $top "[appname] ([reponame]): $title" - wm geometry $top "+[winfo rootx $path]+[winfo rooty $path]" - - ${NS}::label $w.header -text $title -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.select \ - -text [mc Select] \ - -default active \ - -command [cb _select] - ${NS}::button $w.buttons.cancel \ - -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.select -side right - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::frame $w.inner - - ${NS}::frame $w.inner.family - ${NS}::label $w.inner.family.l \ - -text [mc "Font Family"] \ - -anchor w - set w_family $w.inner.family.v - text $w_family \ - -background white \ - -foreground black \ - -borderwidth 1 \ - -relief sunken \ - -cursor $::cursor_ptr \ - -wrap none \ - -width 30 \ - -height 10 \ - -yscrollcommand [list $w.inner.family.sby set] - rmsel_tag $w_family - ${NS}::scrollbar $w.inner.family.sby -command [list $w_family yview] - pack $w.inner.family.l -side top -fill x - pack $w.inner.family.sby -side right -fill y - pack $w_family -fill both -expand 1 - - ${NS}::frame $w.inner.size - ${NS}::label $w.inner.size.l \ - -text [mc "Font Size"] \ - -anchor w - tspinbox $w.inner.size.v \ - -textvariable @f_size \ - -from 2 -to 80 -increment 1 \ - -width 3 - bind $w.inner.size.v <FocusIn> {%W selection range 0 end} - pack $w.inner.size.l -fill x -side top - pack $w.inner.size.v -fill x -padx 2 - - grid configure $w.inner.family $w.inner.size -sticky nsew - grid rowconfigure $w.inner 0 -weight 1 - grid columnconfigure $w.inner 0 -weight 1 - pack $w.inner -fill both -expand 1 -padx 5 -pady 5 - - ${NS}::frame $w.example - ${NS}::label $w.example.l \ - -text [mc "Font Example"] \ - -anchor w - set w_example $w.example.t - text $w_example \ - -background white \ - -foreground black \ - -borderwidth 1 \ - -relief sunken \ - -height 3 \ - -width 40 - rmsel_tag $w_example - $w_example tag conf example -justify center - $w_example insert end [mc "This is example text.\nIf you like this text, it can be your font."] example - $w_example conf -state disabled - pack $w.example.l -fill x - pack $w_example -fill x - pack $w.example -fill x -padx 5 - - if {$all_families eq {}} { - set all_families [lsort [font families]] - } - - $w_family tag conf pick - $w_family tag bind pick <Button-1> [cb _pick_family %x %y]\;break - foreach f $all_families { - set sel [list pick] - if {$f eq $f_family} { - lappend sel in_sel - } - $w_family insert end "$f\n" $sel - } - $w_family conf -state disabled - _update $this - - trace add variable @f_size write [cb _update] - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [cb _select]\;break - bind $w <Visibility> " - grab $w - focus $w - " - wm deiconify $w - tkwait window $w -} - -method _select {} { - upvar #0 $v_family pv_family - upvar #0 $v_size pv_size - - set pv_family $f_family - set pv_size $f_size - - destroy $w -} - -method _pick_family {x y} { - variable all_families - - set i [lindex [split [$w_family index @$x,$y] .] 0] - set n [lindex $all_families [expr {$i - 1}]] - if {$n ne {}} { - $w_family tag remove in_sel 0.0 end - $w_family tag add in_sel $i.0 [expr {$i + 1}].0 - set f_family $n - _update $this - } -} - -method _update {args} { - variable all_families - - set i [lsearch -exact $all_families $f_family] - if {$i < 0} return - - $w_example tag conf example -font [list $f_family $f_size] - $w_family see [expr {$i + 1}].0 -} - -} diff --git a/third_party/git/git-gui/lib/choose_repository.tcl b/third_party/git/git-gui/lib/choose_repository.tcl deleted file mode 100644 index af1fee7c751d..000000000000 --- a/third_party/git/git-gui/lib/choose_repository.tcl +++ /dev/null @@ -1,1149 +0,0 @@ -# git-gui Git repository chooser -# Copyright (C) 2007 Shawn Pearce - -class choose_repository { - -field top -field w -field w_body ; # Widget holding the center content -field w_next ; # Next button -field w_quit ; # Quit button -field o_cons ; # Console object (if active) - -# Status mega-widget instance during _do_clone2 (used by _copy_files and -# _link_files). Widget is destroyed before _do_clone2 calls -# _do_clone_checkout -field o_status - -# Operation displayed by status mega-widget during _do_clone_checkout => -# _readtree_wait => _postcheckout_wait => _do_clone_submodules => -# _do_validate_submodule_cloning. The status mega-widget is a different -# instance than that stored in $o_status in earlier operations. -field o_status_op - -field w_types ; # List of type buttons in clone -field w_recentlist ; # Listbox containing recent repositories -field w_localpath ; # Entry widget bound to local_path - -field done 0 ; # Finished picking the repository? -field local_path {} ; # Where this repository is locally -field origin_url {} ; # Where we are cloning from -field origin_name origin ; # What we shall call 'origin' -field clone_type hardlink ; # Type of clone to construct -field recursive true ; # Recursive cloning flag -field readtree_err ; # Error output from read-tree (if any) -field sorted_recent ; # recent repositories (sorted) - -constructor pick {} { - global M1T M1B use_ttk NS - - if {[set maxrecent [get_config gui.maxrecentrepo]] eq {}} { - set maxrecent 10 - } - - make_dialog top w - wm title $top [mc "Git Gui"] - - if {$top eq {.}} { - menu $w.mbar -tearoff 0 - $top configure -menu $w.mbar - - set m_repo $w.mbar.repository - $w.mbar add cascade \ - -label [mc Repository] \ - -menu $m_repo - menu $m_repo - - if {[is_MacOSX]} { - $w.mbar add cascade -label Apple -menu .mbar.apple - menu $w.mbar.apple - $w.mbar.apple add command \ - -label [mc "About %s" [appname]] \ - -command do_about - $w.mbar.apple add command \ - -label [mc "Show SSH Key"] \ - -command do_ssh_key - } else { - $w.mbar add cascade -label [mc Help] -menu $w.mbar.help - menu $w.mbar.help - $w.mbar.help add command \ - -label [mc "About %s" [appname]] \ - -command do_about - $w.mbar.help add command \ - -label [mc "Show SSH Key"] \ - -command do_ssh_key - } - - wm protocol $top WM_DELETE_WINDOW exit - bind $top <$M1B-q> exit - bind $top <$M1B-Q> exit - bind $top <Key-Escape> exit - } else { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - bind $top <Key-Escape> [list destroy $top] - set m_repo {} - } - - pack [git_logo $w.git_logo] -side left -fill y -padx 10 -pady 10 - - set w_body $w.body - set opts $w_body.options - ${NS}::frame $w_body - text $opts \ - -cursor $::cursor_ptr \ - -relief flat \ - -background [get_bg_color $w_body] \ - -wrap none \ - -spacing1 5 \ - -width 50 \ - -height 3 - pack $opts -anchor w -fill x - - $opts tag conf link_new -foreground blue -underline 1 - $opts tag bind link_new <1> [cb _next new] - $opts insert end [mc "Create New Repository"] link_new - $opts insert end "\n" - if {$m_repo ne {}} { - $m_repo add command \ - -command [cb _next new] \ - -accelerator $M1T-N \ - -label [mc "New..."] - bind $top <$M1B-n> [cb _next new] - bind $top <$M1B-N> [cb _next new] - } - - $opts tag conf link_clone -foreground blue -underline 1 - $opts tag bind link_clone <1> [cb _next clone] - $opts insert end [mc "Clone Existing Repository"] link_clone - $opts insert end "\n" - if {$m_repo ne {}} { - if {[tk windowingsystem] eq "win32"} { - set key L - } else { - set key C - } - $m_repo add command \ - -command [cb _next clone] \ - -accelerator $M1T-$key \ - -label [mc "Clone..."] - bind $top <$M1B-[string tolower $key]> [cb _next clone] - bind $top <$M1B-[string toupper $key]> [cb _next clone] - } - - $opts tag conf link_open -foreground blue -underline 1 - $opts tag bind link_open <1> [cb _next open] - $opts insert end [mc "Open Existing Repository"] link_open - $opts insert end "\n" - if {$m_repo ne {}} { - $m_repo add command \ - -command [cb _next open] \ - -accelerator $M1T-O \ - -label [mc "Open..."] - bind $top <$M1B-o> [cb _next open] - bind $top <$M1B-O> [cb _next open] - } - - $opts conf -state disabled - - set sorted_recent [_get_recentrepos] - if {[llength $sorted_recent] > 0} { - if {$m_repo ne {}} { - $m_repo add separator - $m_repo add command \ - -state disabled \ - -label [mc "Recent Repositories"] - } - - if {[set lenrecent [llength $sorted_recent]] < $maxrecent} { - set lenrecent $maxrecent - } - - ${NS}::label $w_body.space - ${NS}::label $w_body.recentlabel \ - -anchor w \ - -text [mc "Open Recent Repository:"] - set w_recentlist $w_body.recentlist - text $w_recentlist \ - -cursor $::cursor_ptr \ - -relief flat \ - -background [get_bg_color $w_body.recentlabel] \ - -wrap none \ - -width 50 \ - -height $lenrecent - $w_recentlist tag conf link \ - -foreground blue \ - -underline 1 - set home $::env(HOME) - if {[is_Cygwin]} { - set home [exec cygpath --windows --absolute $home] - } - set home "[file normalize $home]/" - set hlen [string length $home] - foreach p $sorted_recent { - set path $p - if {[string equal -length $hlen $home $p]} { - set p "~/[string range $p $hlen end]" - } - regsub -all "\n" $p "\\n" p - $w_recentlist insert end $p link - $w_recentlist insert end "\n" - - if {$m_repo ne {}} { - $m_repo add command \ - -command [cb _open_recent_path $path] \ - -label " $p" - } - } - $w_recentlist conf -state disabled - $w_recentlist tag bind link <1> [cb _open_recent %x,%y] - pack $w_body.space -anchor w -fill x - pack $w_body.recentlabel -anchor w -fill x - pack $w_recentlist -anchor w -fill x - } - pack $w_body -fill x -padx 10 -pady 10 - - ${NS}::frame $w.buttons - set w_next $w.buttons.next - set w_quit $w.buttons.quit - ${NS}::button $w_quit \ - -text [mc "Quit"] \ - -command exit - pack $w_quit -side right -padx 5 - pack $w.buttons -side bottom -fill x -padx 10 -pady 10 - - if {$m_repo ne {}} { - $m_repo add separator - $m_repo add command \ - -label [mc Quit] \ - -command exit \ - -accelerator $M1T-Q - } - - bind $top <Return> [cb _invoke_next] - bind $top <Visibility> " - [cb _center] - grab $top - focus $top - bind $top <Visibility> {} - " - wm deiconify $top - tkwait variable @done - - grab release $top - if {$top eq {.}} { - eval destroy [winfo children $top] - } -} - -method _center {} { - set nx [winfo reqwidth $top] - set ny [winfo reqheight $top] - set rx [expr {([winfo screenwidth $top] - $nx) / 3}] - set ry [expr {([winfo screenheight $top] - $ny) / 3}] - wm geometry $top [format {+%d+%d} $rx $ry] -} - -method _invoke_next {} { - if {[winfo exists $w_next]} { - uplevel #0 [$w_next cget -command] - } -} - -proc _get_recentrepos {} { - set recent [list] - foreach p [lsort -unique [get_config gui.recentrepo]] { - if {[_is_git [file join $p .git]]} { - lappend recent $p - } else { - _unset_recentrepo $p - } - } - return $recent -} - -proc _unset_recentrepo {p} { - regsub -all -- {([()\[\]{}\.^$+*?\\])} $p {\\\1} p - catch {git config --global --unset-all gui.recentrepo "^$p\$"} - load_config 1 -} - -proc _append_recentrepos {path} { - set path [file normalize $path] - set recent [get_config gui.recentrepo] - - if {[lindex $recent end] eq $path} { - return - } - - set i [lsearch $recent $path] - if {$i >= 0} { - _unset_recentrepo $path - } - - git config --global --add gui.recentrepo $path - load_config 1 - set recent [get_config gui.recentrepo] - - if {[set maxrecent [get_config gui.maxrecentrepo]] eq {}} { - set maxrecent 10 - } - - while {[llength $recent] > $maxrecent} { - _unset_recentrepo [lindex $recent 0] - set recent [get_config gui.recentrepo] - } -} - -method _open_recent {xy} { - set id [lindex [split [$w_recentlist index @$xy] .] 0] - set local_path [lindex $sorted_recent [expr {$id - 1}]] - _do_open2 $this -} - -method _open_recent_path {p} { - set local_path $p - _do_open2 $this -} - -method _next {action} { - global NS - destroy $w_body - if {![winfo exists $w_next]} { - ${NS}::button $w_next -default active - set pos -before - if {[tk windowingsystem] eq "win32"} { set pos -after } - pack $w_next -side right -padx 5 $pos $w_quit - } - _do_$action $this -} - -method _write_local_path {args} { - if {$local_path eq {}} { - $w_next conf -state disabled - } else { - $w_next conf -state normal - } -} - -method _git_init {} { - if {[catch {file mkdir $local_path} err]} { - error_popup [strcat \ - [mc "Failed to create repository %s:" $local_path] \ - "\n\n$err"] - return 0 - } - - if {[catch {cd $local_path} err]} { - error_popup [strcat \ - [mc "Failed to create repository %s:" $local_path] \ - "\n\n$err"] - return 0 - } - - if {[catch {git init} err]} { - error_popup [strcat \ - [mc "Failed to create repository %s:" $local_path] \ - "\n\n$err"] - return 0 - } - - _append_recentrepos [pwd] - set ::_gitdir .git - set ::_prefix {} - return 1 -} - -proc _is_git {path {outdir_var ""}} { - if {$outdir_var ne ""} { - upvar 1 $outdir_var outdir - } - if {[catch {set outdir [git rev-parse --resolve-git-dir $path]}]} { - return 0 - } - return 1 -} - -proc _objdir {path} { - set objdir [file join $path .git objects] - if {[file isdirectory $objdir]} { - return $objdir - } - - set objdir [file join $path objects] - if {[file isdirectory $objdir]} { - return $objdir - } - - if {[is_Cygwin]} { - set objdir [file join $path .git objects.lnk] - if {[file isfile $objdir]} { - return [win32_read_lnk $objdir] - } - - set objdir [file join $path objects.lnk] - if {[file isfile $objdir]} { - return [win32_read_lnk $objdir] - } - } - - return {} -} - -###################################################################### -## -## Create New Repository - -method _do_new {} { - global use_ttk NS - $w_next conf \ - -state disabled \ - -command [cb _do_new2] \ - -text [mc "Create"] - - ${NS}::frame $w_body - ${NS}::label $w_body.h \ - -font font_uibold -anchor center \ - -text [mc "Create New Repository"] - pack $w_body.h -side top -fill x -pady 10 - pack $w_body -fill x -padx 10 - - ${NS}::frame $w_body.where - ${NS}::label $w_body.where.l -text [mc "Directory:"] - ${NS}::entry $w_body.where.t \ - -textvariable @local_path \ - -width 50 - ${NS}::button $w_body.where.b \ - -text [mc "Browse"] \ - -command [cb _new_local_path] - set w_localpath $w_body.where.t - - grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew - pack $w_body.where -fill x - - grid columnconfigure $w_body.where 1 -weight 1 - - trace add variable @local_path write [cb _write_local_path] - bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]] - update - focus $w_body.where.t -} - -method _new_local_path {} { - if {$local_path ne {}} { - set p [file dirname $local_path] - } else { - set p [pwd] - } - - set p [tk_chooseDirectory \ - -initialdir $p \ - -parent $top \ - -title [mc "Git Repository"] \ - -mustexist false] - if {$p eq {}} return - - set p [file normalize $p] - if {![_new_ok $p]} { - return - } - set local_path $p - $w_localpath icursor end -} - -method _do_new2 {} { - if {![_new_ok $local_path]} { - return - } - if {![_git_init $this]} { - return - } - set done 1 -} - -proc _new_ok {p} { - if {[file isdirectory $p]} { - if {[_is_git [file join $p .git]]} { - error_popup [mc "Directory %s already exists." $p] - return 0 - } - } elseif {[file exists $p]} { - error_popup [mc "File %s already exists." $p] - return 0 - } - return 1 -} - -###################################################################### -## -## Clone Existing Repository - -method _do_clone {} { - global use_ttk NS - $w_next conf \ - -state disabled \ - -command [cb _do_clone2] \ - -text [mc "Clone"] - - ${NS}::frame $w_body - ${NS}::label $w_body.h \ - -font font_uibold -anchor center \ - -text [mc "Clone Existing Repository"] - pack $w_body.h -side top -fill x -pady 10 - pack $w_body -fill x -padx 10 - - set args $w_body.args - ${NS}::frame $w_body.args - pack $args -fill both - - ${NS}::label $args.origin_l -text [mc "Source Location:"] - ${NS}::entry $args.origin_t \ - -textvariable @origin_url \ - -width 50 - ${NS}::button $args.origin_b \ - -text [mc "Browse"] \ - -command [cb _open_origin] - grid $args.origin_l $args.origin_t $args.origin_b -sticky ew - - ${NS}::label $args.where_l -text [mc "Target Directory:"] - ${NS}::entry $args.where_t \ - -textvariable @local_path \ - -width 50 - ${NS}::button $args.where_b \ - -text [mc "Browse"] \ - -command [cb _new_local_path] - grid $args.where_l $args.where_t $args.where_b -sticky ew - set w_localpath $args.where_t - - ${NS}::label $args.type_l -text [mc "Clone Type:"] - ${NS}::frame $args.type_f - set w_types [list] - lappend w_types [${NS}::radiobutton $args.type_f.hardlink \ - -state disabled \ - -text [mc "Standard (Fast, Semi-Redundant, Hardlinks)"] \ - -variable @clone_type \ - -value hardlink] - lappend w_types [${NS}::radiobutton $args.type_f.full \ - -state disabled \ - -text [mc "Full Copy (Slower, Redundant Backup)"] \ - -variable @clone_type \ - -value full] - lappend w_types [${NS}::radiobutton $args.type_f.shared \ - -state disabled \ - -text [mc "Shared (Fastest, Not Recommended, No Backup)"] \ - -variable @clone_type \ - -value shared] - foreach r $w_types { - pack $r -anchor w - } - ${NS}::checkbutton $args.type_f.recursive \ - -text [mc "Recursively clone submodules too"] \ - -variable @recursive \ - -onvalue true -offvalue false - pack $args.type_f.recursive -anchor w - grid $args.type_l $args.type_f -sticky new - - grid columnconfigure $args 1 -weight 1 - - trace add variable @local_path write [cb _update_clone] - trace add variable @origin_url write [cb _update_clone] - bind $w_body.h <Destroy> " - [list trace remove variable @local_path write [cb _update_clone]] - [list trace remove variable @origin_url write [cb _update_clone]] - " - update - focus $args.origin_t -} - -method _open_origin {} { - if {$origin_url ne {} && [file isdirectory $origin_url]} { - set p $origin_url - } else { - set p [pwd] - } - - set p [tk_chooseDirectory \ - -initialdir $p \ - -parent $top \ - -title [mc "Git Repository"] \ - -mustexist true] - if {$p eq {}} return - - set p [file normalize $p] - if {![_is_git [file join $p .git]] && ![_is_git $p]} { - error_popup [mc "Not a Git repository: %s" [file tail $p]] - return - } - set origin_url $p -} - -method _update_clone {args} { - if {$local_path ne {} && $origin_url ne {}} { - $w_next conf -state normal - } else { - $w_next conf -state disabled - } - - if {$origin_url ne {} && - ( [_is_git [file join $origin_url .git]] - || [_is_git $origin_url])} { - set e normal - if {[[lindex $w_types 0] cget -state] eq {disabled}} { - set clone_type hardlink - } - } else { - set e disabled - set clone_type full - } - - foreach r $w_types { - $r conf -state $e - } -} - -method _do_clone2 {} { - if {[file isdirectory $origin_url]} { - set origin_url [file normalize $origin_url] - } - - if {$clone_type eq {hardlink} && ![file isdirectory $origin_url]} { - error_popup [mc "Standard only available for local repository."] - return - } - if {$clone_type eq {shared} && ![file isdirectory $origin_url]} { - error_popup [mc "Shared only available for local repository."] - return - } - - if {$clone_type eq {hardlink} || $clone_type eq {shared}} { - set objdir [_objdir $origin_url] - if {$objdir eq {}} { - error_popup [mc "Not a Git repository: %s" [file tail $origin_url]] - return - } - } - - set giturl $origin_url - if {[is_Cygwin] && [file isdirectory $giturl]} { - set giturl [exec cygpath --unix --absolute $giturl] - if {$clone_type eq {shared}} { - set objdir [exec cygpath --unix --absolute $objdir] - } - } - - if {[file exists $local_path]} { - error_popup [mc "Location %s already exists." $local_path] - return - } - - if {![_git_init $this]} return - set local_path [pwd] - - if {[catch { - git config remote.$origin_name.url $giturl - git config remote.$origin_name.fetch +refs/heads/*:refs/remotes/$origin_name/* - } err]} { - error_popup [strcat [mc "Failed to configure origin"] "\n\n$err"] - return - } - - destroy $w_body $w_next - - switch -exact -- $clone_type { - hardlink { - set o_status [status_bar::two_line $w_body] - pack $w_body -fill x -padx 10 -pady 10 - - set status_op [$o_status start \ - [mc "Counting objects"] \ - [mc "buckets"]] - update - - if {[file exists [file join $objdir info alternates]]} { - set pwd [pwd] - if {[catch { - file mkdir [gitdir objects info] - set f_in [open [file join $objdir info alternates] r] - set f_cp [open [gitdir objects info alternates] w] - fconfigure $f_in -translation binary -encoding binary - fconfigure $f_cp -translation binary -encoding binary - cd $objdir - while {[gets $f_in line] >= 0} { - if {[is_Cygwin]} { - puts $f_cp [exec cygpath --unix --absolute $line] - } else { - puts $f_cp [file normalize $line] - } - } - close $f_in - close $f_cp - cd $pwd - } err]} { - catch {cd $pwd} - _clone_failed $this [mc "Unable to copy objects/info/alternates: %s" $err] - $status_op stop - return - } - } - - set tolink [list] - set buckets [glob \ - -tails \ - -nocomplain \ - -directory [file join $objdir] ??] - set bcnt [expr {[llength $buckets] + 2}] - set bcur 1 - $status_op update $bcur $bcnt - update - - file mkdir [file join .git objects pack] - foreach i [glob -tails -nocomplain \ - -directory [file join $objdir pack] *] { - lappend tolink [file join pack $i] - } - $status_op update [incr bcur] $bcnt - update - - foreach i $buckets { - file mkdir [file join .git objects $i] - foreach j [glob -tails -nocomplain \ - -directory [file join $objdir $i] *] { - lappend tolink [file join $i $j] - } - $status_op update [incr bcur] $bcnt - update - } - $status_op stop - - if {$tolink eq {}} { - info_popup [strcat \ - [mc "Nothing to clone from %s." $origin_url] \ - "\n" \ - [mc "The 'master' branch has not been initialized."] \ - ] - destroy $w_body - set done 1 - return - } - - set i [lindex $tolink 0] - if {[catch { - file link -hard \ - [file join .git objects $i] \ - [file join $objdir $i] - } err]} { - info_popup [mc "Hardlinks are unavailable. Falling back to copying."] - set i [_copy_files $this $objdir $tolink] - } else { - set i [_link_files $this $objdir [lrange $tolink 1 end]] - } - if {!$i} return - - destroy $w_body - - set o_status {} - } - full { - set o_cons [console::embed \ - $w_body \ - [mc "Cloning from %s" $origin_url]] - pack $w_body -fill both -expand 1 -padx 10 - $o_cons exec \ - [list git fetch --no-tags -k $origin_name] \ - [cb _do_clone_tags] - } - shared { - set fd [open [gitdir objects info alternates] w] - fconfigure $fd -translation binary - puts $fd $objdir - close $fd - } - } - - if {$clone_type eq {hardlink} || $clone_type eq {shared}} { - if {![_clone_refs $this]} return - set pwd [pwd] - if {[catch { - cd $origin_url - set HEAD [git rev-parse --verify HEAD^0] - } err]} { - _clone_failed $this [mc "Not a Git repository: %s" [file tail $origin_url]] - return 0 - } - cd $pwd - _do_clone_checkout $this $HEAD - } -} - -method _copy_files {objdir tocopy} { - set status_op [$o_status start \ - [mc "Copying objects"] \ - [mc "KiB"]] - set tot 0 - set cmp 0 - foreach p $tocopy { - incr tot [file size [file join $objdir $p]] - } - foreach p $tocopy { - if {[catch { - set f_in [open [file join $objdir $p] r] - set f_cp [open [file join .git objects $p] w] - fconfigure $f_in -translation binary -encoding binary - fconfigure $f_cp -translation binary -encoding binary - - while {![eof $f_in]} { - incr cmp [fcopy $f_in $f_cp -size 16384] - $status_op update \ - [expr {$cmp / 1024}] \ - [expr {$tot / 1024}] - update - } - - close $f_in - close $f_cp - } err]} { - _clone_failed $this [mc "Unable to copy object: %s" $err] - $status_op stop - return 0 - } - } - $status_op stop - return 1 -} - -method _link_files {objdir tolink} { - set total [llength $tolink] - set status_op [$o_status start \ - [mc "Linking objects"] \ - [mc "objects"]] - for {set i 0} {$i < $total} {} { - set p [lindex $tolink $i] - if {[catch { - file link -hard \ - [file join .git objects $p] \ - [file join $objdir $p] - } err]} { - _clone_failed $this [mc "Unable to hardlink object: %s" $err] - $status_op stop - return 0 - } - - incr i - if {$i % 5 == 0} { - $status_op update $i $total - update - } - } - $status_op stop - return 1 -} - -method _clone_refs {} { - set pwd [pwd] - if {[catch {cd $origin_url} err]} { - error_popup [mc "Not a Git repository: %s" [file tail $origin_url]] - return 0 - } - set fd_in [git_read for-each-ref \ - --tcl \ - {--format=list %(refname) %(objectname) %(*objectname)}] - cd $pwd - - set fd [open [gitdir packed-refs] w] - fconfigure $fd -translation binary - puts $fd "# pack-refs with: peeled" - while {[gets $fd_in line] >= 0} { - set line [eval $line] - set refn [lindex $line 0] - set robj [lindex $line 1] - set tobj [lindex $line 2] - - if {[regsub ^refs/heads/ $refn \ - "refs/remotes/$origin_name/" refn]} { - puts $fd "$robj $refn" - } elseif {[string match refs/tags/* $refn]} { - puts $fd "$robj $refn" - if {$tobj ne {}} { - puts $fd "^$tobj" - } - } - } - close $fd_in - close $fd - return 1 -} - -method _do_clone_tags {ok} { - if {$ok} { - $o_cons exec \ - [list git fetch --tags -k $origin_name] \ - [cb _do_clone_HEAD] - } else { - $o_cons done $ok - _clone_failed $this [mc "Cannot fetch branches and objects. See console output for details."] - } -} - -method _do_clone_HEAD {ok} { - if {$ok} { - $o_cons exec \ - [list git fetch $origin_name HEAD] \ - [cb _do_clone_full_end] - } else { - $o_cons done $ok - _clone_failed $this [mc "Cannot fetch tags. See console output for details."] - } -} - -method _do_clone_full_end {ok} { - $o_cons done $ok - - if {$ok} { - destroy $w_body - - set HEAD {} - if {[file exists [gitdir FETCH_HEAD]]} { - set fd [open [gitdir FETCH_HEAD] r] - while {[gets $fd line] >= 0} { - if {[regexp "^(.{40})\t\t" $line line HEAD]} { - break - } - } - close $fd - } - - catch {git pack-refs} - _do_clone_checkout $this $HEAD - } else { - _clone_failed $this [mc "Cannot determine HEAD. See console output for details."] - } -} - -method _clone_failed {{why {}}} { - if {[catch {file delete -force $local_path} err]} { - set why [strcat \ - $why \ - "\n\n" \ - [mc "Unable to cleanup %s" $local_path] \ - "\n\n" \ - $err] - } - if {$why ne {}} { - update - error_popup [strcat [mc "Clone failed."] "\n" $why] - } -} - -method _do_clone_checkout {HEAD} { - if {$HEAD eq {}} { - info_popup [strcat \ - [mc "No default branch obtained."] \ - "\n" \ - [mc "The 'master' branch has not been initialized."] \ - ] - set done 1 - return - } - if {[catch { - git update-ref HEAD $HEAD^0 - } err]} { - info_popup [strcat \ - [mc "Cannot resolve %s as a commit." $HEAD^0] \ - "\n $err" \ - "\n" \ - [mc "The 'master' branch has not been initialized."] \ - ] - set done 1 - return - } - - set status [status_bar::two_line $w_body] - pack $w_body -fill x -padx 10 -pady 10 - - # We start the status operation here. - # - # This function calls _readtree_wait as a callback. - # - # _readtree_wait in turn either calls _do_clone_submodules directly, - # or calls _postcheckout_wait as a callback which then calls - # _do_clone_submodules. - # - # _do_clone_submodules calls _do_validate_submodule_cloning. - # - # _do_validate_submodule_cloning stops the status operation. - # - # There are no other calls into this chain from other code. - - set o_status_op [$status start \ - [mc "Creating working directory"] \ - [mc "files"]] - - set readtree_err {} - set fd [git_read --stderr read-tree \ - -m \ - -u \ - -v \ - HEAD \ - HEAD \ - ] - fconfigure $fd -blocking 0 -translation binary - fileevent $fd readable [cb _readtree_wait $fd] -} - -method _readtree_wait {fd} { - set buf [read $fd] - $o_status_op update_meter $buf - append readtree_err $buf - - fconfigure $fd -blocking 1 - if {![eof $fd]} { - fconfigure $fd -blocking 0 - return - } - - if {[catch {close $fd}]} { - set err $readtree_err - regsub {^fatal: } $err {} err - error_popup [strcat \ - [mc "Initial file checkout failed."] \ - "\n\n$err"] - return - } - - # -- Run the post-checkout hook. - # - set fd_ph [githook_read post-checkout [string repeat 0 40] \ - [git rev-parse HEAD] 1] - if {$fd_ph ne {}} { - global pch_error - set pch_error {} - fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} - fileevent $fd_ph readable [cb _postcheckout_wait $fd_ph] - } else { - _do_clone_submodules $this - } -} - -method _postcheckout_wait {fd_ph} { - global pch_error - - append pch_error [read $fd_ph] - fconfigure $fd_ph -blocking 1 - if {[eof $fd_ph]} { - if {[catch {close $fd_ph}]} { - hook_failed_popup post-checkout $pch_error 0 - } - unset pch_error - _do_clone_submodules $this - return - } - fconfigure $fd_ph -blocking 0 -} - -method _do_clone_submodules {} { - if {$recursive eq {true}} { - $o_status_op stop - set o_status_op {} - - destroy $w_body - - set o_cons [console::embed \ - $w_body \ - [mc "Cloning submodules"]] - pack $w_body -fill both -expand 1 -padx 10 - $o_cons exec \ - [list git submodule update --init --recursive] \ - [cb _do_validate_submodule_cloning] - } else { - set done 1 - } -} - -method _do_validate_submodule_cloning {ok} { - if {$ok} { - $o_cons done $ok - set done 1 - } else { - _clone_failed $this [mc "Cannot clone submodules."] - } -} - -###################################################################### -## -## Open Existing Repository - -method _do_open {} { - global NS - $w_next conf \ - -state disabled \ - -command [cb _do_open2] \ - -text [mc "Open"] - - ${NS}::frame $w_body - ${NS}::label $w_body.h \ - -font font_uibold -anchor center \ - -text [mc "Open Existing Repository"] - pack $w_body.h -side top -fill x -pady 10 - pack $w_body -fill x -padx 10 - - ${NS}::frame $w_body.where - ${NS}::label $w_body.where.l -text [mc "Repository:"] - ${NS}::entry $w_body.where.t \ - -textvariable @local_path \ - -width 50 - ${NS}::button $w_body.where.b \ - -text [mc "Browse"] \ - -command [cb _open_local_path] - - grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew - pack $w_body.where -fill x - - grid columnconfigure $w_body.where 1 -weight 1 - - trace add variable @local_path write [cb _write_local_path] - bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]] - update - focus $w_body.where.t -} - -method _open_local_path {} { - if {$local_path ne {}} { - set p $local_path - } else { - set p [pwd] - } - - set p [tk_chooseDirectory \ - -initialdir $p \ - -parent $top \ - -title [mc "Git Repository"] \ - -mustexist true] - if {$p eq {}} return - - set p [file normalize $p] - if {![_is_git [file join $p .git]]} { - error_popup [mc "Not a Git repository: %s" [file tail $p]] - return - } - set local_path $p -} - -method _do_open2 {} { - if {![_is_git [file join $local_path .git] actualgit]} { - error_popup [mc "Not a Git repository: %s" [file tail $local_path]] - return - } - - if {[catch {cd $local_path} err]} { - error_popup [strcat \ - [mc "Failed to open repository %s:" $local_path] \ - "\n\n$err"] - return - } - - _append_recentrepos [pwd] - set ::_gitdir $actualgit - set ::_prefix {} - set done 1 -} - -} diff --git a/third_party/git/git-gui/lib/choose_rev.tcl b/third_party/git/git-gui/lib/choose_rev.tcl deleted file mode 100644 index 6dae7937d589..000000000000 --- a/third_party/git/git-gui/lib/choose_rev.tcl +++ /dev/null @@ -1,634 +0,0 @@ -# git-gui revision chooser -# Copyright (C) 2006, 2007 Shawn Pearce - -class choose_rev { - -image create photo ::choose_rev::img_find -data {R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} - -field w ; # our megawidget path -field w_list ; # list of currently filtered specs -field w_filter ; # filter entry for $w_list - -field c_expr {}; # current revision expression -field filter ""; # current filter string -field revtype head; # type of revision chosen -field cur_specs [list]; # list of specs for $revtype -field spec_head ; # list of all head specs -field spec_trck ; # list of all tracking branch specs -field spec_tag ; # list of all tag specs -field tip_data ; # array of tip commit info by refname -field log_last ; # array of reflog date by refname - -field tooltip_wm {} ; # Current tooltip toplevel, if open -field tooltip_t {} ; # Text widget in $tooltip_wm -field tooltip_timer {} ; # Current timer event for our tooltip - -proc new {path {title {}}} { - return [_new $path 0 $title] -} - -proc new_unmerged {path {title {}}} { - return [_new $path 1 $title] -} - -constructor _new {path unmerged_only title} { - global current_branch is_detached use_ttk NS - - if {![info exists ::all_remotes]} { - load_all_remotes - } - - set w $path - - if {$title ne {}} { - ${NS}::labelframe $w -text $title - } else { - ${NS}::frame $w - } - bind $w <Destroy> [cb _delete %W] - - if {$is_detached} { - ${NS}::radiobutton $w.detachedhead_r \ - -text [mc "This Detached Checkout"] \ - -value HEAD \ - -variable @revtype - if {!$use_ttk} {$w.detachedhead_r configure -anchor w} - grid $w.detachedhead_r -sticky we -padx {0 5} -columnspan 2 - } - - ${NS}::radiobutton $w.expr_r \ - -text [mc "Revision Expression:"] \ - -value expr \ - -variable @revtype - ${NS}::entry $w.expr_t \ - -width 50 \ - -textvariable @c_expr \ - -validate key \ - -validatecommand [cb _validate %d %S] - grid $w.expr_r $w.expr_t -sticky we -padx {0 5} - - ${NS}::frame $w.types - ${NS}::radiobutton $w.types.head_r \ - -text [mc "Local Branch"] \ - -value head \ - -variable @revtype - pack $w.types.head_r -side left - ${NS}::radiobutton $w.types.trck_r \ - -text [mc "Tracking Branch"] \ - -value trck \ - -variable @revtype - pack $w.types.trck_r -side left - ${NS}::radiobutton $w.types.tag_r \ - -text [mc "Tag"] \ - -value tag \ - -variable @revtype - pack $w.types.tag_r -side left - set w_filter $w.types.filter - ${NS}::entry $w_filter \ - -width 12 \ - -textvariable @filter \ - -validate key \ - -validatecommand [cb _filter %P] - pack $w_filter -side right - pack [${NS}::label $w.types.filter_icon \ - -image ::choose_rev::img_find \ - ] -side right - grid $w.types -sticky we -padx {0 5} -columnspan 2 - - if {$use_ttk} { - ttk::frame $w.list -style SListbox.TFrame -padding 2 - } else { - frame $w.list - } - set w_list $w.list.l - listbox $w_list \ - -font font_diff \ - -width 50 \ - -height 10 \ - -selectmode browse \ - -exportselection false \ - -xscrollcommand [cb _sb_set $w.list.sbx h] \ - -yscrollcommand [cb _sb_set $w.list.sby v] - if {$use_ttk} { - $w_list configure -relief flat -highlightthickness 0 -borderwidth 0 - } - pack $w_list -fill both -expand 1 - grid $w.list -sticky nswe -padx {20 5} -columnspan 2 - bind $w_list <Any-Motion> [cb _show_tooltip @%x,%y] - bind $w_list <Any-Enter> [cb _hide_tooltip] - bind $w_list <Any-Leave> [cb _hide_tooltip] - bind $w_list <Destroy> [cb _hide_tooltip] - - grid columnconfigure $w 1 -weight 1 - if {$is_detached} { - grid rowconfigure $w 3 -weight 1 - } else { - grid rowconfigure $w 2 -weight 1 - } - - trace add variable @revtype write [cb _select] - bind $w_filter <Key-Return> [list focus $w_list]\;break - bind $w_filter <Key-Down> [list focus $w_list] - - set fmt list - append fmt { %(refname)} - append fmt { [list} - append fmt { %(objecttype)} - append fmt { %(objectname)} - append fmt { [concat %(taggername) %(authorname)]} - append fmt { [reformat_date [concat %(taggerdate) %(authordate)]]} - append fmt { %(subject)} - append fmt {] [list} - append fmt { %(*objecttype)} - append fmt { %(*objectname)} - append fmt { %(*authorname)} - append fmt { [reformat_date %(*authordate)]} - append fmt { %(*subject)} - append fmt {]} - set all_refn [list] - set fr_fd [git_read for-each-ref \ - --tcl \ - --sort=-taggerdate \ - --format=$fmt \ - refs/heads \ - refs/remotes \ - refs/tags \ - ] - fconfigure $fr_fd -translation lf -encoding utf-8 - while {[gets $fr_fd line] > 0} { - set line [eval $line] - if {[lindex $line 1 0] eq {tag}} { - if {[lindex $line 2 0] eq {commit}} { - set sha1 [lindex $line 2 1] - } else { - continue - } - } elseif {[lindex $line 1 0] eq {commit}} { - set sha1 [lindex $line 1 1] - } else { - continue - } - set refn [lindex $line 0] - set tip_data($refn) [lrange $line 1 end] - lappend cmt_refn($sha1) $refn - lappend all_refn $refn - } - close $fr_fd - - if {$unmerged_only} { - set fr_fd [git_read rev-list --all ^$::HEAD] - while {[gets $fr_fd sha1] > 0} { - if {[catch {set rlst $cmt_refn($sha1)}]} continue - foreach refn $rlst { - set inc($refn) 1 - } - } - close $fr_fd - } else { - foreach refn $all_refn { - set inc($refn) 1 - } - } - - set spec_head [list] - foreach name [load_all_heads] { - set refn refs/heads/$name - if {[info exists inc($refn)]} { - lappend spec_head [list $name $refn] - } - } - - set spec_trck [list] - foreach spec [all_tracking_branches] { - set refn [lindex $spec 0] - if {[info exists inc($refn)]} { - regsub ^refs/(heads|remotes)/ $refn {} name - lappend spec_trck [concat $name $spec] - } - } - - set spec_tag [list] - foreach name [load_all_tags] { - set refn refs/tags/$name - if {[info exists inc($refn)]} { - lappend spec_tag [list $name $refn] - } - } - - if {$is_detached} { set revtype HEAD - } elseif {[llength $spec_head] > 0} { set revtype head - } elseif {[llength $spec_trck] > 0} { set revtype trck - } elseif {[llength $spec_tag ] > 0} { set revtype tag - } else { set revtype expr - } - - if {$revtype eq {head} && $current_branch ne {}} { - set i 0 - foreach spec $spec_head { - if {[lindex $spec 0] eq $current_branch} { - $w_list selection clear 0 end - $w_list selection set $i - break - } - incr i - } - } - - return $this -} - -method none {text} { - global NS use_ttk - if {![winfo exists $w.none_r]} { - ${NS}::radiobutton $w.none_r \ - -value none \ - -variable @revtype - if {!$use_ttk} {$w.none_r configure -anchor w} - grid $w.none_r -sticky we -padx {0 5} -columnspan 2 - } - $w.none_r configure -text $text -} - -method get {} { - switch -- $revtype { - head - - trck - - tag { - set i [$w_list curselection] - if {$i ne {}} { - return [lindex $cur_specs $i 0] - } else { - return {} - } - } - - HEAD { return HEAD } - expr { return $c_expr } - none { return {} } - default { error "unknown type of revision" } - } -} - -method pick_tracking_branch {} { - set revtype trck -} - -method focus_filter {} { - if {[$w_filter cget -state] eq {normal}} { - focus $w_filter - } -} - -method bind_listbox {event script} { - bind $w_list $event $script -} - -method get_local_branch {} { - if {$revtype eq {head}} { - return [_expr $this] - } else { - return {} - } -} - -method get_tracking_branch {} { - set i [$w_list curselection] - if {$i eq {} || $revtype ne {trck}} { - return {} - } - return [lrange [lindex $cur_specs $i] 1 end] -} - -method get_commit {} { - set e [_expr $this] - if {$e eq {}} { - return {} - } - return [git rev-parse --verify "$e^0"] -} - -method commit_or_die {} { - if {[catch {set new [get_commit $this]} err]} { - - # Cleanup the not-so-friendly error from rev-parse. - # - regsub {^fatal:\s*} $err {} err - if {$err eq {Needed a single revision}} { - set err {} - } - - set top [winfo toplevel $w] - set msg [strcat [mc "Invalid revision: %s" [get $this]] "\n\n$err"] - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $top] \ - -parent $top \ - -message $msg - error $msg - } - return $new -} - -method _expr {} { - switch -- $revtype { - head - - trck - - tag { - set i [$w_list curselection] - if {$i ne {}} { - return [lindex $cur_specs $i 1] - } else { - error [mc "No revision selected."] - } - } - - expr { - if {$c_expr ne {}} { - return $c_expr - } else { - error [mc "Revision expression is empty."] - } - } - HEAD { return HEAD } - none { return {} } - default { error "unknown type of revision" } - } -} - -method _validate {d S} { - if {$d == 1} { - if {[regexp {\s} $S]} { - return 0 - } - if {[string length $S] > 0} { - set revtype expr - } - } - return 1 -} - -method _filter {P} { - if {[regexp {\s} $P]} { - return 0 - } - _rebuild $this $P - return 1 -} - -method _select {args} { - _rebuild $this $filter - focus_filter $this -} - -method _rebuild {pat} { - set ste normal - switch -- $revtype { - head { set new $spec_head } - trck { set new $spec_trck } - tag { set new $spec_tag } - expr - - HEAD - - none { - set new [list] - set ste disabled - } - } - - if {[$w_list cget -state] eq {disabled}} { - $w_list configure -state normal - } - $w_list delete 0 end - - if {$pat ne {}} { - set pat *${pat}* - } - set cur_specs [list] - foreach spec $new { - set txt [lindex $spec 0] - if {$pat eq {} || [string match $pat $txt]} { - lappend cur_specs $spec - $w_list insert end $txt - } - } - if {$cur_specs ne {}} { - $w_list selection clear 0 end - $w_list selection set 0 - } - - if {[$w_filter cget -state] ne $ste} { - $w_list configure -state $ste - $w_filter configure -state $ste - } -} - -method _delete {current} { - if {$current eq $w} { - delete_this - } -} - -method _sb_set {sb orient first last} { - global NS - set old_focus [focus -lastfor $w] - - if {$first == 0 && $last == 1} { - if {[winfo exists $sb]} { - destroy $sb - if {$old_focus ne {}} { - update - focus $old_focus - } - } - return - } - - if {![winfo exists $sb]} { - if {$orient eq {h}} { - ${NS}::scrollbar $sb -orient h -command [list $w_list xview] - pack $sb -fill x -side bottom -before $w_list - } else { - ${NS}::scrollbar $sb -orient v -command [list $w_list yview] - pack $sb -fill y -side right -before $w_list - } - if {$old_focus ne {}} { - update - focus $old_focus - } - } - - catch {$sb set $first $last} -} - -method _show_tooltip {pos} { - if {$tooltip_wm ne {}} { - _open_tooltip $this - } elseif {$tooltip_timer eq {}} { - set tooltip_timer [after 1000 [cb _open_tooltip]] - } -} - -method _open_tooltip {} { - global remote_url - - set tooltip_timer {} - set pos_x [winfo pointerx $w_list] - set pos_y [winfo pointery $w_list] - if {[winfo containing $pos_x $pos_y] ne $w_list} { - _hide_tooltip $this - return - } - - set pos @[join [list \ - [expr {$pos_x - [winfo rootx $w_list]}] \ - [expr {$pos_y - [winfo rooty $w_list]}]] ,] - set lno [$w_list index $pos] - if {$lno eq {}} { - _hide_tooltip $this - return - } - - set spec [lindex $cur_specs $lno] - set refn [lindex $spec 1] - if {$refn eq {}} { - _hide_tooltip $this - return - } - - if {$tooltip_wm eq {}} { - set tooltip_wm [toplevel $w_list.tooltip -borderwidth 1] - catch {wm attributes $tooltip_wm -type tooltip} - wm overrideredirect $tooltip_wm 1 - wm transient $tooltip_wm [winfo toplevel $w_list] - set tooltip_t $tooltip_wm.label - text $tooltip_t \ - -takefocus 0 \ - -highlightthickness 0 \ - -relief flat \ - -borderwidth 0 \ - -wrap none \ - -background lightyellow \ - -foreground black - $tooltip_t tag conf section_header -font font_uibold - bind $tooltip_wm <Escape> [cb _hide_tooltip] - pack $tooltip_t - } else { - $tooltip_t conf -state normal - $tooltip_t delete 0.0 end - } - - set data $tip_data($refn) - if {[lindex $data 0 0] eq {tag}} { - set tag [lindex $data 0] - if {[lindex $data 1 0] eq {commit}} { - set cmit [lindex $data 1] - } else { - set cmit {} - } - } elseif {[lindex $data 0 0] eq {commit}} { - set tag {} - set cmit [lindex $data 0] - } - - $tooltip_t insert end [lindex $spec 0] - set last [_reflog_last $this [lindex $spec 1]] - if {$last ne {}} { - $tooltip_t insert end "\n" - $tooltip_t insert end [mc "Updated"] - $tooltip_t insert end " $last" - } - $tooltip_t insert end "\n" - - if {$tag ne {}} { - $tooltip_t insert end "\n" - $tooltip_t insert end [mc "Tag"] section_header - $tooltip_t insert end " [lindex $tag 1]\n" - $tooltip_t insert end [lindex $tag 2] - $tooltip_t insert end " ([lindex $tag 3])\n" - $tooltip_t insert end [lindex $tag 4] - $tooltip_t insert end "\n" - } - - if {$cmit ne {}} { - $tooltip_t insert end "\n" - $tooltip_t insert end [mc "Commit@@noun"] section_header - $tooltip_t insert end " [lindex $cmit 1]\n" - $tooltip_t insert end [lindex $cmit 2] - $tooltip_t insert end " ([lindex $cmit 3])\n" - $tooltip_t insert end [lindex $cmit 4] - } - - if {[llength $spec] > 2} { - $tooltip_t insert end "\n" - $tooltip_t insert end [mc "Remote"] section_header - $tooltip_t insert end " [lindex $spec 2]\n" - $tooltip_t insert end [mc "URL"] - $tooltip_t insert end " $remote_url([lindex $spec 2])\n" - $tooltip_t insert end [mc "Branch"] - $tooltip_t insert end " [lindex $spec 3]" - } - - $tooltip_t conf -state disabled - _position_tooltip $this -} - -method _reflog_last {name} { - if {[info exists reflog_last($name)]} { - return reflog_last($name) - } - - set last {} - if {[catch {set last [file mtime [gitdir $name]]}] - && ![catch {set g [open [gitdir logs $name] r]}]} { - fconfigure $g -translation binary - while {[gets $g line] >= 0} { - if {[regexp {> ([1-9][0-9]*) } $line line when]} { - set last $when - } - } - close $g - } - - if {$last ne {}} { - set last [format_date $last] - } - set reflog_last($name) $last - return $last -} - -method _position_tooltip {} { - set max_h [lindex [split [$tooltip_t index end] .] 0] - set max_w 0 - for {set i 1} {$i <= $max_h} {incr i} { - set c [lindex [split [$tooltip_t index "$i.0 lineend"] .] 1] - if {$c > $max_w} {set max_w $c} - } - $tooltip_t conf -width $max_w -height $max_h - - set req_w [winfo reqwidth $tooltip_t] - set req_h [winfo reqheight $tooltip_t] - set pos_x [expr {[winfo pointerx .] + 5}] - set pos_y [expr {[winfo pointery .] + 10}] - - set g "${req_w}x${req_h}" - if {[tk windowingsystem] eq "win32" || $pos_x >= 0} {append g +} - append g $pos_x - if {[tk windowingsystem] eq "win32" || $pos_y >= 0} {append g +} - append g $pos_y - - wm geometry $tooltip_wm $g - raise $tooltip_wm -} - -method _hide_tooltip {} { - if {$tooltip_wm ne {}} { - destroy $tooltip_wm - set tooltip_wm {} - } - if {$tooltip_timer ne {}} { - after cancel $tooltip_timer - set tooltip_timer {} - } -} - -} diff --git a/third_party/git/git-gui/lib/chord.tcl b/third_party/git/git-gui/lib/chord.tcl deleted file mode 100644 index e21e7d3d0b79..000000000000 --- a/third_party/git/git-gui/lib/chord.tcl +++ /dev/null @@ -1,158 +0,0 @@ -# Simple Chord for Tcl -# -# A "chord" is a method with more than one entrypoint and only one body, such -# that the body runs only once all the entrypoints have been called by -# different asynchronous tasks. In this implementation, the chord is defined -# dynamically for each invocation. A SimpleChord object is created, supplying -# body script to be run when the chord is completed, and then one or more notes -# are added to the chord. Each note can be called like a proc, and returns -# immediately if the chord isn't yet complete. When the last remaining note is -# called, the body runs before the note returns. -# -# The SimpleChord class has a constructor that takes the body script, and a -# method add_note that returns a note object. Since the body script does not -# run in the context of the procedure that defined it, a mechanism is provided -# for injecting variables into the chord for use by the body script. The -# activation of a note is idempotent; multiple calls have the same effect as -# a simple call. -# -# If you are invoking asynchronous operations with chord notes as completion -# callbacks, and there is a possibility that earlier operations could complete -# before later ones are started, it is a good practice to create a "common" -# note on the chord that prevents it from being complete until you're certain -# you've added all the notes you need. -# -# Example: -# -# # Turn off the UI while running a couple of async operations. -# lock_ui -# -# set chord [SimpleChord::new { -# unlock_ui -# # Note: $notice here is not referenced in the calling scope -# if {$notice} { info_popup $notice } -# } -# -# # Configure a note to keep the chord from completing until -# # all operations have been initiated. -# set common_note [$chord add_note] -# -# # Activate notes in 'after' callbacks to other operations -# set newnote [$chord add_note] -# async_operation $args [list $newnote activate] -# -# # Communicate with the chord body -# if {$condition} { -# # This sets $notice in the same context that the chord body runs in. -# $chord eval { set notice "Something interesting" } -# } -# -# # Activate the common note, making the chord eligible to complete -# $common_note activate -# -# At this point, the chord will complete at some unknown point in the future. -# The common note might have been the first note activated, or the async -# operations might have completed synchronously and the common note is the -# last one, completing the chord before this code finishes, or anything in -# between. The purpose of the chord is to not have to worry about the order. - -# SimpleChord class: -# Represents a procedure that conceptually has multiple entrypoints that must -# all be called before the procedure executes. Each entrypoint is called a -# "note". The chord is only "completed" when all the notes are "activated". -class SimpleChord { - field notes - field body - field is_completed - field eval_ns - - # Constructor: - # set chord [SimpleChord::new {body}] - # Creates a new chord object with the specified body script. The - # body script is evaluated at most once, when a note is activated - # and the chord has no other non-activated notes. - constructor new {i_body} { - set notes [list] - set body $i_body - set is_completed 0 - set eval_ns "[namespace qualifiers $this]::eval" - return $this - } - - # Method: - # $chord eval {script} - # Runs the specified script in the same context (namespace) in which - # the chord body will be evaluated. This can be used to set variable - # values for the chord body to use. - method eval {script} { - namespace eval $eval_ns $script - } - - # Method: - # set note [$chord add_note] - # Adds a new note to the chord, an instance of ChordNote. Raises an - # error if the chord is already completed, otherwise the chord is - # updated so that the new note must also be activated before the - # body is evaluated. - method add_note {} { - if {$is_completed} { error "Cannot add a note to a completed chord" } - - set note [ChordNote::new $this] - - lappend notes $note - - return $note - } - - # This method is for internal use only and is intentionally undocumented. - method notify_note_activation {} { - if {!$is_completed} { - foreach note $notes { - if {![$note is_activated]} { return } - } - - set is_completed 1 - - namespace eval $eval_ns $body - delete_this - } - } -} - -# ChordNote class: -# Represents a note within a chord, providing a way to activate it. When the -# final note of the chord is activated (this can be any note in the chord, -# with all other notes already previously activated in any order), the chord's -# body is evaluated. -class ChordNote { - field chord - field is_activated - - # Constructor: - # Instances of ChordNote are created internally by calling add_note on - # SimpleChord objects. - constructor new {c} { - set chord $c - set is_activated 0 - return $this - } - - # Method: - # [$note is_activated] - # Returns true if this note has already been activated. - method is_activated {} { - return $is_activated - } - - # Method: - # $note activate - # Activates the note, if it has not already been activated, and - # completes the chord if there are no other notes awaiting - # activation. Subsequent calls will have no further effect. - method activate {} { - if {!$is_activated} { - set is_activated 1 - $chord notify_note_activation - } - } -} diff --git a/third_party/git/git-gui/lib/class.tcl b/third_party/git/git-gui/lib/class.tcl deleted file mode 100644 index f08506f3834a..000000000000 --- a/third_party/git/git-gui/lib/class.tcl +++ /dev/null @@ -1,194 +0,0 @@ -# git-gui simple class/object fake-alike -# Copyright (C) 2007 Shawn Pearce - -proc class {class body} { - if {[namespace exists $class]} { - error "class $class already declared" - } - namespace eval $class " - variable __nextid 0 - variable __sealed 0 - variable __field_list {} - variable __field_array - - proc cb {name args} { - upvar this this - concat \[list ${class}::\$name \$this\] \$args - } - " - namespace eval $class $body -} - -proc field {name args} { - set class [uplevel {namespace current}] - variable ${class}::__sealed - variable ${class}::__field_array - - switch [llength $args] { - 0 { set new [list $name] } - 1 { set new [list $name [lindex $args 0]] } - default { error "wrong # args: field name value?" } - } - - if {$__sealed} { - error "class $class is sealed (cannot add new fields)" - } - - if {[catch {set old $__field_array($name)}]} { - variable ${class}::__field_list - lappend __field_list $new - set __field_array($name) 1 - } else { - error "field $name already declared" - } -} - -proc constructor {name params body} { - set class [uplevel {namespace current}] - set ${class}::__sealed 1 - variable ${class}::__field_list - set mbodyc {} - - append mbodyc {set this } $class - append mbodyc {::__o[incr } $class {::__nextid]::__d} \; - append mbodyc {create_this } $class \; - append mbodyc {set __this [namespace qualifiers $this]} \; - - if {$__field_list ne {}} { - append mbodyc {upvar #0} - foreach n $__field_list { - set n [lindex $n 0] - append mbodyc { ${__this}::} $n { } $n - regsub -all @$n\\M $body "\${__this}::$n" body - } - append mbodyc \; - foreach n $__field_list { - if {[llength $n] == 2} { - append mbodyc \ - {set } [lindex $n 0] { } [list [lindex $n 1]] \; - } - } - } - append mbodyc $body - namespace eval $class [list proc $name $params $mbodyc] -} - -proc method {name params body {deleted {}} {del_body {}}} { - set class [uplevel {namespace current}] - set ${class}::__sealed 1 - variable ${class}::__field_list - set params [linsert $params 0 this] - set mbodyc {} - - append mbodyc {set __this [namespace qualifiers $this]} \; - - switch $deleted { - {} {} - ifdeleted { - append mbodyc {if {![namespace exists $__this]} } - append mbodyc \{ $del_body \; return \} \; - } - default { - error "wrong # args: method name args body (ifdeleted body)?" - } - } - - set decl {} - foreach n $__field_list { - set n [lindex $n 0] - if {[regexp -- $n\\M $body]} { - if { [regexp -all -- $n\\M $body] == 1 - && [regexp -all -- \\\$$n\\M $body] == 1 - && [regexp -all -- \\\$$n\\( $body] == 0} { - regsub -all \ - \\\$$n\\M $body \ - "\[set \${__this}::$n\]" body - } else { - append decl { ${__this}::} $n { } $n - regsub -all @$n\\M $body "\${__this}::$n" body - } - } - } - if {$decl ne {}} { - append mbodyc {upvar #0} $decl \; - } - append mbodyc $body - namespace eval $class [list proc $name $params $mbodyc] -} - -proc create_this {class} { - upvar this this - namespace eval [namespace qualifiers $this] [list proc \ - [namespace tail $this] \ - [list name args] \ - "eval \[list ${class}::\$name $this\] \$args" \ - ] -} - -proc delete_this {{t {}}} { - if {$t eq {}} { - upvar this this - set t $this - } - set t [namespace qualifiers $t] - if {[namespace exists $t]} {namespace delete $t} -} - -proc make_dialog {t w args} { - upvar $t top $w pfx this this - global use_ttk - uplevel [linsert $args 0 make_toplevel $t $w] - catch {wm attributes $top -type dialog} - pave_toplevel $pfx -} - -proc make_toplevel {t w args} { - upvar $t top $w pfx this this - - if {[llength $args] % 2} { - error "make_toplevel topvar winvar {options}" - } - set autodelete 1 - foreach {name value} $args { - switch -exact -- $name { - -autodelete {set autodelete $value} - default {error "unsupported option $name"} - } - } - - if {$::root_exists || [winfo ismapped .]} { - regsub -all {::} $this {__} w - set top .$w - set pfx $top - toplevel $top - set ::root_exists 1 - } else { - set top . - set pfx {} - } - - if {$autodelete} { - wm protocol $top WM_DELETE_WINDOW " - [list delete_this $this] - [list destroy $top] - " - } -} - - -## auto_mkindex support for class/constructor/method -## -auto_mkindex_parser::command class {name body} { - variable parser - variable contextStack - set contextStack [linsert $contextStack 0 $name] - $parser eval [list _%@namespace eval $name] $body - set contextStack [lrange $contextStack 1 end] -} -auto_mkindex_parser::command constructor {name args} { - variable index - variable scriptFile - append index [list set auto_index([fullname $name])] \ - [format { [list source [file join $dir %s]]} \ - [file split $scriptFile]] "\n" -} diff --git a/third_party/git/git-gui/lib/commit.tcl b/third_party/git/git-gui/lib/commit.tcl deleted file mode 100644 index b516aa299069..000000000000 --- a/third_party/git/git-gui/lib/commit.tcl +++ /dev/null @@ -1,547 +0,0 @@ -# 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 commit_author - 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 name "" - set email "" - set fd [git_read cat-file commit $curHEAD] - fconfigure $fd -encoding binary -translation lf - # By default commits are assumed to be in utf-8 - 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]] - } elseif {[regexp "author (.*)\\s<(.*)>\\s(\\d.*$)" $line all name email time]} { } - } - set msg [read $fd] - close $fd - - set enc [tcl_encoding $enc] - if {$enc ne {}} { - set msg [encoding convertfrom $enc $msg] - set name [encoding convertfrom $enc $name] - set email [encoding convertfrom $enc $email] - } - if {$name ne {} && $email ne {}} { - set commit_author [list name $name email $email date $time] - } - - 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 commit_author - - set commit_type normal - unset -nocomplain commit_author - $ui_comm delete 0.0 end - $ui_comm edit reset - $ui_comm edit modified false - rescan ui_ready -} - -proc setup_commit_encoding {msg_wt {quiet 0}} { - global repo_config - - 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 { - if {!$quiet} { - error_popup [mc "warning: Tcl does not support encoding '%s'." $enc] - } - fconfigure $msg_wt -encoding utf-8 - } -} - -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] { - set s $file_states($path) - switch -glob -- [lindex $s 0] { - _? {continue} - A? - - D? - - T? - - M? {set files_ready 1} - _U - - 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] && ![is_enabled nocommit]} { - info_popup [mc "No changes to commit. - -You must stage at least 1 file before you can commit. -"] - unlock_index - return - } - - if {[is_enabled nocommitmsg]} { do_quit 0 } - - # -- 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 sentence what you did. -- Second line: Blank -- Remaining lines: Describe why this change is good. -"] - unlock_index - return - } - - # -- Build the message file. - # - set msg_p [gitdir GITGUI_EDITMSG] - set msg_wt [open $msg_p w] - fconfigure $msg_wt -translation lf - setup_commit_encoding $msg_wt - puts $msg_wt $msg - close $msg_wt - - if {[is_enabled nocommit]} { do_quit 0 } - - # -- Run the pre-commit hook. - # - set fd_ph [githook_read pre-commit] - if {$fd_ph eq {}} { - commit_commitmsg $curHEAD $msg_p - return - } - - ui_status [mc "Calling pre-commit hook..."] - set pch_error {} - fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} - fileevent $fd_ph readable \ - [list commit_prehook_wait $fd_ph $curHEAD $msg_p] -} - -proc commit_prehook_wait {fd_ph curHEAD msg_p} { - global pch_error - - append pch_error [read $fd_ph] - fconfigure $fd_ph -blocking 1 - if {[eof $fd_ph]} { - if {[catch {close $fd_ph}]} { - catch {file delete $msg_p} - ui_status [mc "Commit declined by pre-commit hook."] - hook_failed_popup pre-commit $pch_error - unlock_index - } else { - commit_commitmsg $curHEAD $msg_p - } - set pch_error {} - return - } - fconfigure $fd_ph -blocking 0 -} - -proc commit_commitmsg {curHEAD msg_p} { - global is_detached repo_config - global pch_error - - if {$is_detached - && ![file exists [gitdir rebase-merge head-name]] - && [is_config_true gui.warndetachedcommit]} { - set msg [mc "You are about to commit on a detached head.\ -This is a potentially dangerous thing to do because if you switch\ -to another branch you will lose your changes and it can be difficult\ -to retrieve them later from the reflog. You should probably cancel this\ -commit and create a new branch to continue.\n\ -\n\ -Do you really want to proceed with your Commit?"] - if {[ask_popup $msg] ne yes} { - unlock_index - return - } - } - - # -- Run the commit-msg hook. - # - set fd_ph [githook_read commit-msg $msg_p] - if {$fd_ph eq {}} { - commit_writetree $curHEAD $msg_p - return - } - - ui_status [mc "Calling commit-msg hook..."] - set pch_error {} - fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} - fileevent $fd_ph readable \ - [list commit_commitmsg_wait $fd_ph $curHEAD $msg_p] -} - -proc commit_commitmsg_wait {fd_ph curHEAD msg_p} { - global pch_error - - append pch_error [read $fd_ph] - fconfigure $fd_ph -blocking 1 - if {[eof $fd_ph]} { - if {[catch {close $fd_ph}]} { - catch {file delete $msg_p} - ui_status [mc "Commit declined by commit-msg hook."] - hook_failed_popup commit-msg $pch_error - unlock_index - } else { - commit_writetree $curHEAD $msg_p - } - set pch_error {} - return - } - fconfigure $fd_ph -blocking 0 -} - -proc commit_writetree {curHEAD msg_p} { - ui_status [mc "Committing changes..."] - set fd_wt [git_read write-tree] - fileevent $fd_wt readable \ - [list commit_committree $fd_wt $curHEAD $msg_p] -} - -proc commit_committree {fd_wt curHEAD msg_p} { - global HEAD PARENT MERGE_HEAD commit_type commit_author - global current_branch - global ui_comm commit_type_is_amend - global file_states selected_paths rescan_active - global repo_config - global env - - gets $fd_wt tree_id - if {[catch {close $fd_wt} err]} { - catch {file delete $msg_p} - error_popup [strcat [mc "write-tree failed:"] "\n\n$err"] - ui_status [mc "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} { - catch {file delete $msg_p} - 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 - } - } - - if {[info exists commit_author]} { - set old_author [commit_author_ident $commit_author] - } - # -- Create the commit. - # - set cmd [list commit-tree $tree_id] - if {[is_config_true commit.gpgsign]} { - lappend cmd -S - } - foreach p [concat $PARENT $MERGE_HEAD] { - lappend cmd -p $p - } - lappend cmd <$msg_p - if {[catch {set cmt_id [eval git $cmd]} err]} { - catch {file delete $msg_p} - error_popup [strcat [mc "commit-tree failed:"] "\n\n$err"] - ui_status [mc "Commit failed."] - unlock_index - unset -nocomplain commit_author - commit_author_reset $old_author - return - } - if {[info exists commit_author]} { - unset -nocomplain commit_author - commit_author_reset $old_author - } - - # -- Update the HEAD ref. - # - set reflogm commit - if {$commit_type ne {normal}} { - append reflogm " ($commit_type)" - } - set msg_fd [open $msg_p r] - setup_commit_encoding $msg_fd 1 - gets $msg_fd subject - close $msg_fd - append reflogm {: } $subject - if {[catch { - git update-ref -m $reflogm HEAD $cmt_id $curHEAD - } err]} { - catch {file delete $msg_p} - error_popup [strcat [mc "update-ref failed:"] "\n\n$err"] - ui_status [mc "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]} - catch {file delete [gitdir CHERRY_PICK_HEAD]} - - # -- 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 fd_ph [githook_read post-commit] - if {$fd_ph ne {}} { - global pch_error - set pch_error {} - fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} - fileevent $fd_ph readable \ - [list commit_postcommit_wait $fd_ph $cmt_id] - } - - $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 0 } - - # -- Update in memory status - # - set commit_type normal - set commit_type_is_amend 0 - 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_ - - T_ - - D_ { - unset file_states($path) - catch {unset selected_paths($path)} - } - DO { - set file_states($path) [list _O [lindex $s 1] {} {}] - } - AM - - AD - - AT - - TM - - TD - - MM - - MT - - 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] -} - -proc commit_postcommit_wait {fd_ph cmt_id} { - global pch_error - - append pch_error [read $fd_ph] - fconfigure $fd_ph -blocking 1 - if {[eof $fd_ph]} { - if {[catch {close $fd_ph}]} { - hook_failed_popup post-commit $pch_error 0 - } - unset pch_error - return - } - fconfigure $fd_ph -blocking 0 -} - -proc commit_author_ident {details} { - global env - array set author $details - set old [array get env GIT_AUTHOR_*] - set env(GIT_AUTHOR_NAME) $author(name) - set env(GIT_AUTHOR_EMAIL) $author(email) - set env(GIT_AUTHOR_DATE) $author(date) - return $old -} -proc commit_author_reset {details} { - global env - unset env(GIT_AUTHOR_NAME) env(GIT_AUTHOR_EMAIL) env(GIT_AUTHOR_DATE) - if {$details ne {}} { - array set env $details - } -} diff --git a/third_party/git/git-gui/lib/console.tcl b/third_party/git/git-gui/lib/console.tcl deleted file mode 100644 index bb6b9c889e20..000000000000 --- a/third_party/git/git-gui/lib/console.tcl +++ /dev/null @@ -1,225 +0,0 @@ -# git-gui console support -# Copyright (C) 2006, 2007 Shawn Pearce - -class console { - -field t_short -field t_long -field w -field w_t -field console_cr -field is_toplevel 1; # are we our own window? - -constructor new {short_title long_title} { - set t_short $short_title - set t_long $long_title - _init $this - return $this -} - -constructor embed {path title} { - set t_short {} - set t_long $title - set w $path - set is_toplevel 0 - _init $this - return $this -} - -method _init {} { - global M1B use_ttk NS - - if {$is_toplevel} { - make_dialog top w -autodelete 0 - wm title $top "[appname] ([reponame]): $t_short" - } else { - ${NS}::frame $w - } - - set console_cr 1.0 - set w_t $w.m.t - - ${NS}::frame $w.m - ${NS}::label $w.m.l1 \ - -textvariable @t_long \ - -anchor w \ - -justify left \ - -font font_uibold - text $w_t \ - -background white \ - -foreground black \ - -borderwidth 1 \ - -relief sunken \ - -width 80 -height 10 \ - -wrap none \ - -font font_diff \ - -state disabled \ - -xscrollcommand [cb _sb_set $w.m.sbx h] \ - -yscrollcommand [cb _sb_set $w.m.sby v] - label $w.m.s -text [mc "Working... please wait..."] \ - -anchor w \ - -justify left \ - -font font_uibold - pack $w.m.l1 -side top -fill x - pack $w.m.s -side bottom -fill x - pack $w_t -side left -fill both -expand 1 - pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10 - - menu $w.ctxm -tearoff 0 - $w.ctxm add command -label [mc "Copy"] \ - -command "tk_textCopy $w_t" - $w.ctxm add command -label [mc "Select All"] \ - -command "focus $w_t;$w_t tag add sel 0.0 end" - $w.ctxm add command -label [mc "Copy All"] \ - -command " - $w_t tag add sel 0.0 end - tk_textCopy $w_t - $w_t tag remove sel 0.0 end - " - - if {$is_toplevel} { - ${NS}::button $w.ok -text [mc "Close"] \ - -state disabled \ - -command [list destroy $w] - pack $w.ok -side bottom -anchor e -pady 10 -padx 10 - bind $w <Visibility> [list focus $w] - } - - bind_button3 $w_t "tk_popup $w.ctxm %X %Y" - bind $w_t <$M1B-Key-a> "$w_t tag add sel 0.0 end;break" - bind $w_t <$M1B-Key-A> "$w_t tag add sel 0.0 end;break" -} - -method exec {cmd {after {}}} { - if {[lindex $cmd 0] eq {git}} { - set fd_f [eval git_read --stderr [lrange $cmd 1 end]] - } else { - lappend cmd 2>@1 - set fd_f [_open_stdout_stderr $cmd] - } - fconfigure $fd_f -blocking 0 -translation binary - fileevent $fd_f readable [cb _read $fd_f $after] -} - -method _read {fd after} { - set buf [read $fd] - if {$buf ne {}} { - if {![winfo exists $w_t]} {_init $this} - $w_t conf -state normal - set c 0 - set n [string length $buf] - while {$c < $n} { - set cr [string first "\r" $buf $c] - set lf [string first "\n" $buf $c] - if {$cr < 0} {set cr [expr {$n + 1}]} - if {$lf < 0} {set lf [expr {$n + 1}]} - - if {$lf < $cr} { - $w_t insert end [string range $buf $c $lf] - set console_cr [$w_t index {end -1c}] - set c $lf - incr c - } else { - $w_t delete $console_cr end - $w_t insert end "\n" - $w_t insert end [string range $buf $c [expr {$cr - 1}]] - set c $cr - incr c - } - } - $w_t conf -state disabled - $w_t see end - } - - fconfigure $fd -blocking 1 - if {[eof $fd]} { - if {[catch {close $fd}]} { - set ok 0 - } else { - set ok 1 - } - if {$after ne {}} { - uplevel #0 $after $ok - } else { - done $this $ok - } - return - } - fconfigure $fd -blocking 0 -} - -method chain {cmdlist {ok 1}} { - if {$ok} { - if {[llength $cmdlist] == 0} { - done $this $ok - return - } - - set cmd [lindex $cmdlist 0] - set cmdlist [lrange $cmdlist 1 end] - - if {[lindex $cmd 0] eq {exec}} { - exec $this \ - [lrange $cmd 1 end] \ - [cb chain $cmdlist] - } else { - uplevel #0 $cmd [cb chain $cmdlist] - } - } else { - done $this $ok - } -} - -method insert {txt} { - if {![winfo exists $w_t]} {_init $this} - $w_t conf -state normal - $w_t insert end "$txt\n" - set console_cr [$w_t index {end -1c}] - $w_t conf -state disabled -} - -method done {ok} { - if {$ok} { - if {[winfo exists $w.m.s]} { - bind $w.m.s <Destroy> [list delete_this $this] - $w.m.s conf -background green -foreground black \ - -text [mc "Success"] - if {$is_toplevel} { - $w.ok conf -state normal - focus $w.ok - } - } else { - delete_this - } - } else { - if {![winfo exists $w.m.s]} { - _init $this - } - bind $w.m.s <Destroy> [list delete_this $this] - $w.m.s conf -background red -foreground black \ - -text [mc "Error: Command Failed"] - if {$is_toplevel} { - $w.ok conf -state normal - focus $w.ok - } - } - - bind $w <Key-Escape> "destroy $w;break" -} - -method _sb_set {sb orient first last} { - global NS - if {![winfo exists $sb]} { - if {$first == $last || ($first == 0 && $last == 1)} return - if {$orient eq {h}} { - ${NS}::scrollbar $sb -orient h -command [list $w_t xview] - pack $sb -fill x -side bottom -before $w_t - } else { - ${NS}::scrollbar $sb -orient v -command [list $w_t yview] - pack $sb -fill y -side right -before $w_t - } - } - $sb set $first $last -} - -} diff --git a/third_party/git/git-gui/lib/database.tcl b/third_party/git/git-gui/lib/database.tcl deleted file mode 100644 index 85783081e0d8..000000000000 --- a/third_party/git/git-gui/lib/database.tcl +++ /dev/null @@ -1,115 +0,0 @@ -# git-gui object database management support -# Copyright (C) 2006, 2007 Shawn Pearce - -proc do_stats {} { - global use_ttk NS - set fd [git_read count-objects -v] - while {[gets $fd line] > 0} { - if {[regexp {^([^:]+): (\d+)$} $line _ name value]} { - set stats($name) $value - } - } - close $fd - - set packed_sz 0 - foreach p [glob -directory [gitdir objects pack] \ - -type f \ - -nocomplain -- *] { - incr packed_sz [file size $p] - } - if {$packed_sz > 0} { - set stats(size-pack) [expr {$packed_sz / 1024}] - } - - set w .stats_view - Dialog $w - wm withdraw $w - wm geometry $w "+[winfo rootx .]+[winfo rooty .]" - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.close -text [mc Close] \ - -default active \ - -command [list destroy $w] - ${NS}::button $w.buttons.gc -text [mc "Compress Database"] \ - -default normal \ - -command "destroy $w;do_gc" - pack $w.buttons.close -side right - pack $w.buttons.gc -side left - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::labelframe $w.stat -text [mc "Database Statistics"] - foreach s { - {count {mc "Number of loose objects"}} - {size {mc "Disk space used by loose objects"} { KiB}} - {in-pack {mc "Number of packed objects"}} - {packs {mc "Number of packs"}} - {size-pack {mc "Disk space used by packed objects"} { KiB}} - {prune-packable {mc "Packed objects waiting for pruning"}} - {garbage {mc "Garbage files"}} - } { - set name [lindex $s 0] - set label [eval [lindex $s 1]] - if {[catch {set value $stats($name)}]} continue - if {[llength $s] > 2} { - set value "$value[lindex $s 2]" - } - - ${NS}::label $w.stat.l_$name -text [mc "%s:" $label] -anchor w - ${NS}::label $w.stat.v_$name -text $value -anchor w - grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5} - } - pack $w.stat -pady 10 -padx 10 - - bind $w <Visibility> "grab $w; focus $w.buttons.close" - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [list destroy $w] - wm title $w [mc "%s (%s): Database Statistics" [appname] [reponame]] - wm deiconify $w - tkwait window $w -} - -proc do_gc {} { - set w [console::new {gc} [mc "Compressing the object database"]] - console::chain $w { - {exec git pack-refs --prune} - {exec git reflog expire --all} - {exec git repack -a -d -l} - {exec git rerere gc} - } -} - -proc do_fsck_objects {} { - set w [console::new {fsck-objects} \ - [mc "Verifying the object database with fsck-objects"]] - set cmd [list git fsck-objects] - lappend cmd --full - lappend cmd --cache - lappend cmd --strict - console::exec $w $cmd -} - -proc hint_gc {} { - set ndirs 1 - set limit 8 - if {[is_Windows]} { - set ndirs 4 - set limit 1 - } - - set count [llength [glob \ - -nocomplain \ - -- \ - [gitdir objects 4\[0-[expr {$ndirs-1}]\]/*]]] - - if {$count >= $limit * $ndirs} { - set objects_current [expr {$count * 256/$ndirs}] - if {[ask_popup \ - [mc "This repository currently has approximately %i loose objects. - -To maintain optimal performance it is strongly recommended that you compress the database. - -Compress the database now?" $objects_current]] eq yes} { - do_gc - } - } -} diff --git a/third_party/git/git-gui/lib/date.tcl b/third_party/git/git-gui/lib/date.tcl deleted file mode 100644 index abe82992b652..000000000000 --- a/third_party/git/git-gui/lib/date.tcl +++ /dev/null @@ -1,53 +0,0 @@ -# git-gui date processing support -# Copyright (C) 2007 Shawn Pearce - -set git_month(Jan) 1 -set git_month(Feb) 2 -set git_month(Mar) 3 -set git_month(Apr) 4 -set git_month(May) 5 -set git_month(Jun) 6 -set git_month(Jul) 7 -set git_month(Aug) 8 -set git_month(Sep) 9 -set git_month(Oct) 10 -set git_month(Nov) 11 -set git_month(Dec) 12 - -proc parse_git_date {s} { - if {$s eq {}} { - return {} - } - - if {![regexp \ - {^... (...) (\d{1,2}) (\d\d):(\d\d):(\d\d) (\d{4}) ([+-]?)(\d\d)(\d\d)$} $s s \ - month day hr mm ss yr ew tz_h tz_m]} { - error [mc "Invalid date from Git: %s" $s] - } - - set s [clock scan [format {%4.4i%2.2i%2.2iT%2s%2s%2s} \ - $yr $::git_month($month) $day \ - $hr $mm $ss] \ - -gmt 1] - - regsub ^0 $tz_h {} tz_h - regsub ^0 $tz_m {} tz_m - switch -- $ew { - - {set ew +} - + {set ew -} - {} {set ew -} - } - - return [expr "$s $ew ($tz_h * 3600 + $tz_m * 60)"] -} - -proc format_date {s} { - if {$s eq {}} { - return {} - } - return [clock format $s -format {%a %b %e %H:%M:%S %Y}] -} - -proc reformat_date {s} { - return [format_date [parse_git_date $s]] -} diff --git a/third_party/git/git-gui/lib/diff.tcl b/third_party/git/git-gui/lib/diff.tcl deleted file mode 100644 index 871ad488c2a1..000000000000 --- a/third_party/git/git-gui/lib/diff.tcl +++ /dev/null @@ -1,905 +0,0 @@ -# git-gui diff viewer -# Copyright (C) 2006, 2007 Shawn Pearce - -proc apply_tab_size {{firsttab {}}} { - global have_tk85 repo_config ui_diff - - set w [font measure font_diff "0"] - if {$have_tk85 && $firsttab != 0} { - $ui_diff configure -tabs [list [expr {$firsttab * $w}] [expr {($firsttab + $repo_config(gui.tabsize)) * $w}]] - } elseif {$have_tk85 || $repo_config(gui.tabsize) != 8} { - $ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}] - } else { - $ui_diff configure -tabs {} - } -} - -proc clear_diff {} { - global ui_diff current_diff_path current_diff_header - global ui_index ui_workdir - - $ui_diff conf -state normal - $ui_diff delete 0.0 end - $ui_diff conf -state disabled - - set current_diff_path {} - set current_diff_header {} - - $ui_index tag remove in_diff 0.0 end - $ui_workdir tag remove in_diff 0.0 end -} - -proc reshow_diff {{after {}}} { - global file_states file_lists - global current_diff_path current_diff_side - global ui_diff - - set p $current_diff_path - if {$p eq {}} { - # No diff is being shown. - } elseif {$current_diff_side eq {}} { - clear_diff - } elseif {[catch {set s $file_states($p)}] - || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} { - - if {[find_next_diff $current_diff_side $p {} {[^O]}]} { - next_diff $after - } else { - clear_diff - } - } else { - set save_pos [lindex [$ui_diff yview] 0] - show_diff $p $current_diff_side {} $save_pos $after - } -} - -proc force_diff_encoding {enc} { - global current_diff_path - - if {$current_diff_path ne {}} { - force_path_encoding $current_diff_path $enc - reshow_diff - } -} - -proc handle_empty_diff {} { - global current_diff_path file_states file_lists - global diff_empty_count - - set path $current_diff_path - set s $file_states($path) - if {[lindex $s 0] ne {_M} || [has_textconv $path]} return - - # Prevent infinite rescan loops - incr diff_empty_count - if {$diff_empty_count > 1} return - - info_popup [mc "No differences detected. - -%s has no changes. - -The modification date of this file was updated by another application, but the content within the file was not changed. - -A rescan will be automatically started to find other files which may have the same state." [short_path $path]] - - clear_diff - display_file $path __ - rescan ui_ready 0 -} - -proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} { - global file_states file_lists - global is_3way_diff is_conflict_diff diff_active repo_config - global ui_diff ui_index ui_workdir - global current_diff_path current_diff_side current_diff_header - global current_diff_queue - - if {$diff_active || ![lock_index read]} return - - clear_diff - if {$lno == {}} { - set lno [lsearch -sorted -exact $file_lists($w) $path] - if {$lno >= 0} { - incr lno - } - } - if {$lno >= 1} { - $w tag add in_diff $lno.0 [expr {$lno + 1}].0 - $w see $lno.0 - } - - set s $file_states($path) - set m [lindex $s 0] - set is_conflict_diff 0 - set current_diff_path $path - set current_diff_side $w - set current_diff_queue {} - ui_status [mc "Loading diff of %s..." [escape_path $path]] - - set cont_info [list $scroll_pos $callback] - - apply_tab_size 0 - - if {[string first {U} $m] >= 0} { - merge_load_stages $path [list show_unmerged_diff $cont_info] - } elseif {$m eq {_O}} { - show_other_diff $path $w $m $cont_info - } else { - start_show_diff $cont_info - } - - global current_diff_path selected_paths - set selected_paths($current_diff_path) 1 -} - -proc show_unmerged_diff {cont_info} { - global current_diff_path current_diff_side - global merge_stages ui_diff is_conflict_diff - global current_diff_queue - - if {$merge_stages(2) eq {}} { - set is_conflict_diff 1 - lappend current_diff_queue \ - [list [mc "LOCAL: deleted\nREMOTE:\n"] d= \ - [list ":1:$current_diff_path" ":3:$current_diff_path"]] - } elseif {$merge_stages(3) eq {}} { - set is_conflict_diff 1 - lappend current_diff_queue \ - [list [mc "REMOTE: deleted\nLOCAL:\n"] d= \ - [list ":1:$current_diff_path" ":2:$current_diff_path"]] - } elseif {[lindex $merge_stages(1) 0] eq {120000} - || [lindex $merge_stages(2) 0] eq {120000} - || [lindex $merge_stages(3) 0] eq {120000}} { - set is_conflict_diff 1 - lappend current_diff_queue \ - [list [mc "LOCAL:\n"] d= \ - [list ":1:$current_diff_path" ":2:$current_diff_path"]] - lappend current_diff_queue \ - [list [mc "REMOTE:\n"] d= \ - [list ":1:$current_diff_path" ":3:$current_diff_path"]] - } else { - start_show_diff $cont_info - return - } - - advance_diff_queue $cont_info -} - -proc advance_diff_queue {cont_info} { - global current_diff_queue ui_diff - - set item [lindex $current_diff_queue 0] - set current_diff_queue [lrange $current_diff_queue 1 end] - - $ui_diff conf -state normal - $ui_diff insert end [lindex $item 0] [lindex $item 1] - $ui_diff conf -state disabled - - start_show_diff $cont_info [lindex $item 2] -} - -proc show_other_diff {path w m cont_info} { - global file_states file_lists - global is_3way_diff diff_active repo_config - global ui_diff ui_index ui_workdir - global current_diff_path current_diff_side current_diff_header - - # - Git won't give us the diff, there's nothing to compare to! - # - if {$m eq {_O}} { - set max_sz 100000 - set type unknown - if {[catch { - set type [file type $path] - switch -- $type { - directory { - set type submodule - set content {} - set sz 0 - } - link { - set content [file readlink $path] - set sz [string length $content] - } - file { - set fd [open $path r] - fconfigure $fd \ - -eofchar {} \ - -encoding [get_path_encoding $path] - set content [read $fd $max_sz] - close $fd - set sz [file size $path] - } - default { - error "'$type' not supported" - } - } - } err ]} { - set diff_active 0 - unlock_index - ui_status [mc "Unable to display %s" [escape_path $path]] - error_popup [strcat [mc "Error loading file:"] "\n\n$err"] - return - } - $ui_diff conf -state normal - if {$type eq {submodule}} { - $ui_diff insert end \ - "* [mc "Git Repository (subproject)"]\n" \ - d_info - } elseif {![catch {set type [exec file $path]}]} { - set n [string length $path] - if {[string equal -length $n $path $type]} { - set type [string range $type $n end] - regsub {^:?\s*} $type {} type - } - $ui_diff insert end "* $type\n" d_info - } - if {[string first "\0" $content] != -1} { - $ui_diff insert end \ - [mc "* Binary file (not showing content)."] \ - d_info - } else { - if {$sz > $max_sz} { - $ui_diff insert end [mc \ -"* Untracked file is %d bytes. -* Showing only first %d bytes. -" $sz $max_sz] d_info - } - $ui_diff insert end $content - if {$sz > $max_sz} { - $ui_diff insert end [mc " -* Untracked file clipped here by %s. -* To see the entire file, use an external editor. -" [appname]] d_info - } - } - $ui_diff conf -state disabled - set diff_active 0 - unlock_index - set scroll_pos [lindex $cont_info 0] - if {$scroll_pos ne {}} { - update - $ui_diff yview moveto $scroll_pos - } - ui_ready - set callback [lindex $cont_info 1] - if {$callback ne {}} { - eval $callback - } - return - } -} - -proc start_show_diff {cont_info {add_opts {}}} { - global file_states file_lists - global is_3way_diff is_submodule_diff diff_active repo_config - global ui_diff ui_index ui_workdir - global current_diff_path current_diff_side current_diff_header - - set path $current_diff_path - set w $current_diff_side - - set s $file_states($path) - set m [lindex $s 0] - set is_3way_diff 0 - set is_submodule_diff 0 - set diff_active 1 - set current_diff_header {} - set conflict_size [gitattr $path conflict-marker-size 7] - - set cmd [list] - if {$w eq $ui_index} { - lappend cmd diff-index - lappend cmd --cached - if {[git-version >= "1.7.2"]} { - lappend cmd --ignore-submodules=dirty - } - } elseif {$w eq $ui_workdir} { - if {[string first {U} $m] >= 0} { - lappend cmd diff - } else { - lappend cmd diff-files - } - } - if {![is_config_false gui.textconv] && [git-version >= 1.6.1]} { - lappend cmd --textconv - } - - if {[string match {160000 *} [lindex $s 2]] - || [string match {160000 *} [lindex $s 3]]} { - set is_submodule_diff 1 - - if {[git-version >= "1.6.6"]} { - lappend cmd --submodule - } - } - - lappend cmd -p - lappend cmd --color - set cmd [concat $cmd $repo_config(gui.diffopts)] - if {$repo_config(gui.diffcontext) >= 1} { - lappend cmd "-U$repo_config(gui.diffcontext)" - } - if {$w eq $ui_index} { - lappend cmd [PARENT] - } - if {$add_opts ne {}} { - eval lappend cmd $add_opts - } else { - lappend cmd -- - lappend cmd $path - } - - if {$is_submodule_diff && [git-version < "1.6.6"]} { - if {$w eq $ui_index} { - set cmd [list submodule summary --cached -- $path] - } else { - set cmd [list submodule summary --files -- $path] - } - } - - if {[catch {set fd [eval git_read --nice $cmd]} err]} { - set diff_active 0 - unlock_index - ui_status [mc "Unable to display %s" [escape_path $path]] - error_popup [strcat [mc "Error loading diff:"] "\n\n$err"] - return - } - - set ::current_diff_inheader 1 - # Detect pre-image lines of the diff3 conflict-style. They are just - # '++' lines which is not bijective. Thus, we need to maintain a state - # across lines. - set ::conflict_in_pre_image 0 - fconfigure $fd \ - -blocking 0 \ - -encoding [get_path_encoding $path] \ - -translation lf - fileevent $fd readable [list read_diff $fd $conflict_size $cont_info] -} - -proc parse_color_line {line} { - set start 0 - set result "" - set markup [list] - set regexp {\033\[((?:\d+;)*\d+)?m} - set need_reset 0 - while {[regexp -indices -start $start $regexp $line match code]} { - foreach {begin end} $match break - append result [string range $line $start [expr {$begin - 1}]] - set pos [string length $result] - set col [eval [linsert $code 0 string range $line]] - set start [incr end] - if {$col eq "0" || $col eq ""} { - if {!$need_reset} continue - set need_reset 0 - } else { - set need_reset 1 - } - lappend markup $pos $col - } - append result [string range $line $start end] - if {[llength $markup] < 4} {set markup {}} - return [list $result $markup] -} - -proc read_diff {fd conflict_size cont_info} { - global ui_diff diff_active is_submodule_diff - global is_3way_diff is_conflict_diff current_diff_header - global current_diff_queue - global diff_empty_count - - $ui_diff conf -state normal - while {[gets $fd line] >= 0} { - foreach {line markup} [parse_color_line $line] break - set line [string map {\033 ^} $line] - - set tags {} - - # -- Check for start of diff header. - if { [string match {diff --git *} $line] - || [string match {diff --cc *} $line] - || [string match {diff --combined *} $line]} { - set ::current_diff_inheader 1 - } - - # -- Check for end of diff header (any hunk line will do this). - # - if {[regexp {^@@+ } $line]} {set ::current_diff_inheader 0} - - # -- Automatically detect if this is a 3 way diff. - # - if {[string match {@@@ *} $line]} { - set is_3way_diff 1 - apply_tab_size 1 - } - - if {$::current_diff_inheader} { - - # -- These two lines stop a diff header and shouldn't be in there - if { [string match {Binary files * and * differ} $line] - || [regexp {^\* Unmerged path } $line]} { - set ::current_diff_inheader 0 - } else { - append current_diff_header $line "\n" - } - - # -- Cleanup uninteresting diff header lines. - # - if { [string match {diff --git *} $line] - || [string match {diff --cc *} $line] - || [string match {diff --combined *} $line] - || [string match {--- *} $line] - || [string match {+++ *} $line] - || [string match {index *} $line]} { - continue - } - - # -- Name it symlink, not 120000 - # Note, that the original line is in $current_diff_header - regsub {^(deleted|new) file mode 120000} $line {\1 symlink} line - - } elseif { $line eq {\ No newline at end of file}} { - # -- Handle some special lines - } elseif {$is_3way_diff} { - set op [string range $line 0 1] - switch -- $op { - { } {set tags {}} - {@@} {set tags d_@} - { +} {set tags d_s+} - { -} {set tags d_s-} - {+ } {set tags d_+s} - {- } {set tags d_-s} - {--} {set tags d_--} - {++} { - set regexp [string map [list %conflict_size $conflict_size]\ - {^\+\+([<>=|]){%conflict_size}(?: |$)}] - if {[regexp $regexp $line _g op]} { - set is_conflict_diff 1 - set line [string replace $line 0 1 { }] - set tags d$op - - # The ||| conflict-marker marks the start of the pre-image. - # All those lines are also prefixed with '++'. Thus we need - # to maintain this state. - set ::conflict_in_pre_image [expr {$op eq {|}}] - } elseif {$::conflict_in_pre_image} { - # This is a pre-image line. It is the one which both sides - # are based on. As it has also the '++' line start, it is - # normally shown as 'added'. Invert this to '--' to make - # it a 'removed' line. - set line [string replace $line 0 1 {--}] - set tags d_-- - } else { - set tags d_++ - } - } - default { - puts "error: Unhandled 3 way diff marker: {$op}" - set tags {} - } - } - } elseif {$is_submodule_diff} { - if {$line == ""} continue - if {[regexp {^Submodule } $line]} { - set tags d_info - } elseif {[regexp {^\* } $line]} { - set line [string replace $line 0 1 {Submodule }] - set tags d_info - } else { - set op [string range $line 0 2] - switch -- $op { - { <} {set tags d_-} - { >} {set tags d_+} - { W} {set tags {}} - default { - puts "error: Unhandled submodule diff marker: {$op}" - set tags {} - } - } - } - } else { - set op [string index $line 0] - switch -- $op { - { } {set tags {}} - {@} {set tags d_@} - {-} {set tags d_-} - {+} { - set regexp [string map [list %conflict_size $conflict_size]\ - {^\+([<>=]){%conflict_size}(?: |$)}] - if {[regexp $regexp $line _g op]} { - set is_conflict_diff 1 - set tags d$op - } else { - set tags d_+ - } - } - default { - puts "error: Unhandled 2 way diff marker: {$op}" - set tags {} - } - } - } - set mark [$ui_diff index "end - 1 line linestart"] - $ui_diff insert end $line $tags - if {[string index $line end] eq "\r"} { - $ui_diff tag add d_cr {end - 2c} - } - $ui_diff insert end "\n" $tags - - foreach {posbegin colbegin posend colend} $markup { - set prefix clr - foreach style [lsort -integer [split $colbegin ";"]] { - if {$style eq "7"} {append prefix i; continue} - if {$style != 4 && ($style < 30 || $style > 47)} {continue} - set a "$mark linestart + $posbegin chars" - set b "$mark linestart + $posend chars" - catch {$ui_diff tag add $prefix$style $a $b} - } - } - } - $ui_diff conf -state disabled - - if {[eof $fd]} { - close $fd - - if {$current_diff_queue ne {}} { - advance_diff_queue $cont_info - return - } - - set diff_active 0 - unlock_index - set scroll_pos [lindex $cont_info 0] - if {$scroll_pos ne {}} { - update - $ui_diff yview moveto $scroll_pos - } - ui_ready - - if {[$ui_diff index end] eq {2.0}} { - handle_empty_diff - } else { - set diff_empty_count 0 - } - - set callback [lindex $cont_info 1] - if {$callback ne {}} { - eval $callback - } - } -} - -proc apply_or_revert_hunk {x y revert} { - global current_diff_path current_diff_header current_diff_side - global ui_diff ui_index file_states last_revert last_revert_enc - - if {$current_diff_path eq {} || $current_diff_header eq {}} return - if {![lock_index apply_hunk]} return - - set apply_cmd {apply --whitespace=nowarn} - set mi [lindex $file_states($current_diff_path) 0] - if {$current_diff_side eq $ui_index} { - set failed_msg [mc "Failed to unstage selected hunk."] - lappend apply_cmd --reverse --cached - if {[string index $mi 0] ne {M}} { - unlock_index - return - } - } else { - if {$revert} { - set failed_msg [mc "Failed to revert selected hunk."] - lappend apply_cmd --reverse - } else { - set failed_msg [mc "Failed to stage selected hunk."] - lappend apply_cmd --cached - } - - if {[string index $mi 1] ne {M}} { - unlock_index - return - } - } - - set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0] - set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0] - if {$s_lno eq {}} { - unlock_index - return - } - - set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end] - if {$e_lno eq {}} { - set e_lno end - } - - set wholepatch "$current_diff_header[$ui_diff get $s_lno $e_lno]" - - if {[catch { - set enc [get_path_encoding $current_diff_path] - set p [eval git_write $apply_cmd] - fconfigure $p -translation binary -encoding $enc - puts -nonewline $p $wholepatch - close $p} err]} { - error_popup "$failed_msg\n\n$err" - unlock_index - return - } - - if {$revert} { - # Save a copy of this patch for undoing reverts. - set last_revert $wholepatch - set last_revert_enc $enc - } - - $ui_diff conf -state normal - $ui_diff delete $s_lno $e_lno - $ui_diff conf -state disabled - - # Check if the hunk was the last one in the file. - if {[$ui_diff get 1.0 end] eq "\n"} { - set o _ - } else { - set o ? - } - - # Update the status flags. - if {$revert} { - set mi [string index $mi 0]$o - } elseif {$current_diff_side eq $ui_index} { - set mi ${o}M - } elseif {[string index $mi 0] eq {_}} { - set mi M$o - } else { - set mi ?$o - } - unlock_index - display_file $current_diff_path $mi - # This should trigger shift to the next changed file - if {$o eq {_}} { - reshow_diff - } -} - -proc apply_or_revert_range_or_line {x y revert} { - global current_diff_path current_diff_header current_diff_side - global ui_diff ui_index file_states last_revert - - set selected [$ui_diff tag nextrange sel 0.0] - - if {$selected == {}} { - set first [$ui_diff index "@$x,$y"] - set last $first - } else { - set first [lindex $selected 0] - set last [lindex $selected 1] - } - - set first_l [$ui_diff index "$first linestart"] - set last_l [$ui_diff index "$last lineend"] - - if {$current_diff_path eq {} || $current_diff_header eq {}} return - if {![lock_index apply_hunk]} return - - set apply_cmd {apply --whitespace=nowarn} - set mi [lindex $file_states($current_diff_path) 0] - if {$current_diff_side eq $ui_index} { - set failed_msg [mc "Failed to unstage selected line."] - set to_context {+} - lappend apply_cmd --reverse --cached - if {[string index $mi 0] ne {M}} { - unlock_index - return - } - } else { - if {$revert} { - set failed_msg [mc "Failed to revert selected line."] - set to_context {+} - lappend apply_cmd --reverse - } else { - set failed_msg [mc "Failed to stage selected line."] - set to_context {-} - lappend apply_cmd --cached - } - - if {[string index $mi 1] ne {M}} { - unlock_index - return - } - } - - set wholepatch {} - - while {$first_l < $last_l} { - set i_l [$ui_diff search -backwards -regexp ^@@ $first_l 0.0] - if {$i_l eq {}} { - # If there's not a @@ above, then the selected range - # must have come before the first_l @@ - set i_l [$ui_diff search -regexp ^@@ $first_l $last_l] - } - if {$i_l eq {}} { - unlock_index - return - } - # $i_l is now at the beginning of a line - - # pick start line number from hunk header - set hh [$ui_diff get $i_l "$i_l + 1 lines"] - set hh [lindex [split $hh ,] 0] - set hln [lindex [split $hh -] 1] - set hln [lindex [split $hln " "] 0] - - # There is a special situation to take care of. Consider this - # hunk: - # - # @@ -10,4 +10,4 @@ - # context before - # -old 1 - # -old 2 - # +new 1 - # +new 2 - # context after - # - # We used to keep the context lines in the order they appear in - # the hunk. But then it is not possible to correctly stage only - # "-old 1" and "+new 1" - it would result in this staged text: - # - # context before - # old 2 - # new 1 - # context after - # - # (By symmetry it is not possible to *un*stage "old 2" and "new - # 2".) - # - # We resolve the problem by introducing an asymmetry, namely, - # when a "+" line is *staged*, it is moved in front of the - # context lines that are generated from the "-" lines that are - # immediately before the "+" block. That is, we construct this - # patch: - # - # @@ -10,4 +10,5 @@ - # context before - # +new 1 - # old 1 - # old 2 - # context after - # - # But we do *not* treat "-" lines that are *un*staged in a - # special way. - # - # With this asymmetry it is possible to stage the change "old - # 1" -> "new 1" directly, and to stage the change "old 2" -> - # "new 2" by first staging the entire hunk and then unstaging - # the change "old 1" -> "new 1". - # - # Applying multiple lines adds complexity to the special - # situation. The pre_context must be moved after the entire - # first block of consecutive staged "+" lines, so that - # staging both additions gives the following patch: - # - # @@ -10,4 +10,6 @@ - # context before - # +new 1 - # +new 2 - # old 1 - # old 2 - # context after - - # This is non-empty if and only if we are _staging_ changes; - # then it accumulates the consecutive "-" lines (after - # converting them to context lines) in order to be moved after - # "+" change lines. - set pre_context {} - - set n 0 - set m 0 - set i_l [$ui_diff index "$i_l + 1 lines"] - set patch {} - while {[$ui_diff compare $i_l < "end - 1 chars"] && - [$ui_diff get $i_l "$i_l + 2 chars"] ne {@@}} { - set next_l [$ui_diff index "$i_l + 1 lines"] - set c1 [$ui_diff get $i_l] - if {[$ui_diff compare $first_l <= $i_l] && - [$ui_diff compare $i_l < $last_l] && - ($c1 eq {-} || $c1 eq {+})} { - # a line to stage/unstage - set ln [$ui_diff get $i_l $next_l] - if {$c1 eq {-}} { - set n [expr $n+1] - set patch "$patch$pre_context$ln" - set pre_context {} - } else { - set m [expr $m+1] - set patch "$patch$ln" - } - } elseif {$c1 ne {-} && $c1 ne {+}} { - # context line - set ln [$ui_diff get $i_l $next_l] - set patch "$patch$pre_context$ln" - # Skip the "\ No newline at end of - # file". Depending on the locale setting - # we don't know what this line looks - # like exactly. The only thing we do - # know is that it starts with "\ " - if {![string match {\\ *} $ln]} { - set n [expr $n+1] - set m [expr $m+1] - } - set pre_context {} - } elseif {$c1 eq $to_context} { - # turn change line into context line - set ln [$ui_diff get "$i_l + 1 chars" $next_l] - if {$c1 eq {-}} { - set pre_context "$pre_context $ln" - } else { - set patch "$patch $ln" - } - set n [expr $n+1] - set m [expr $m+1] - } else { - # a change in the opposite direction of - # to_context which is outside the range of - # lines to apply. - set patch "$patch$pre_context" - set pre_context {} - } - set i_l $next_l - } - set patch "$patch$pre_context" - set wholepatch "$wholepatch@@ -$hln,$n +$hln,$m @@\n$patch" - set first_l [$ui_diff index "$next_l + 1 lines"] - } - - if {[catch { - set enc [get_path_encoding $current_diff_path] - set p [eval git_write $apply_cmd] - fconfigure $p -translation binary -encoding $enc - puts -nonewline $p $current_diff_header - puts -nonewline $p $wholepatch - close $p} err]} { - error_popup "$failed_msg\n\n$err" - unlock_index - return - } - - if {$revert} { - # Save a copy of this patch for undoing reverts. - set last_revert $current_diff_header$wholepatch - set last_revert_enc $enc - } - - unlock_index -} - -# Undo the last line/hunk reverted. When hunks and lines are reverted, a copy -# of the diff applied is saved. Re-apply that diff to undo the revert. -# -# Right now, we only use a single variable to hold the copy, and not a -# stack/deque for simplicity, so multiple undos are not possible. Maybe this -# can be added if the need for something like this is felt in the future. -proc undo_last_revert {} { - global last_revert current_diff_path current_diff_header - global last_revert_enc - - if {$last_revert eq {}} return - if {![lock_index apply_hunk]} return - - set apply_cmd {apply --whitespace=nowarn} - set failed_msg [mc "Failed to undo last revert."] - - if {[catch { - set enc $last_revert_enc - set p [eval git_write $apply_cmd] - fconfigure $p -translation binary -encoding $enc - puts -nonewline $p $last_revert - close $p} err]} { - error_popup "$failed_msg\n\n$err" - unlock_index - return - } - - set last_revert {} - - unlock_index -} diff --git a/third_party/git/git-gui/lib/encoding.tcl b/third_party/git/git-gui/lib/encoding.tcl deleted file mode 100644 index 32668fc9c6de..000000000000 --- a/third_party/git/git-gui/lib/encoding.tcl +++ /dev/null @@ -1,466 +0,0 @@ -# git-gui encoding support -# Copyright (C) 2005 Paul Mackerras <paulus@samba.org> -# (Copied from gitk, commit fd8ccbec4f0161) - -# This list of encoding names and aliases is distilled from -# http://www.iana.org/assignments/character-sets. -# Not all of them are supported by Tcl. -set encoding_aliases { - { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII - ISO646-US US-ASCII us IBM367 cp367 csASCII } - { ISO-10646-UTF-1 csISO10646UTF1 } - { ISO_646.basic:1983 ref csISO646basic1983 } - { INVARIANT csINVARIANT } - { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion } - { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom } - { NATS-SEFI iso-ir-8-1 csNATSSEFI } - { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD } - { NATS-DANO iso-ir-9-1 csNATSDANO } - { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD } - { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish } - { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames } - { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 } - { ISO-2022-KR csISO2022KR } - { EUC-KR csEUCKR } - { ISO-2022-JP csISO2022JP } - { ISO-2022-JP-2 csISO2022JP2 } - { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7 - csISO13JISC6220jp } - { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro } - { IT iso-ir-15 ISO646-IT csISO15Italian } - { PT iso-ir-16 ISO646-PT csISO16Portuguese } - { ES iso-ir-17 ISO646-ES csISO17Spanish } - { greek7-old iso-ir-18 csISO18Greek7Old } - { latin-greek iso-ir-19 csISO19LatinGreek } - { DIN_66003 iso-ir-21 de ISO646-DE csISO21German } - { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French } - { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 } - { ISO_5427 iso-ir-37 csISO5427Cyrillic } - { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 } - { BS_viewdata iso-ir-47 csISO47BSViewdata } - { INIS iso-ir-49 csISO49INIS } - { INIS-8 iso-ir-50 csISO50INIS8 } - { INIS-cyrillic iso-ir-51 csISO51INISCyrillic } - { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 } - { ISO_5428:1980 iso-ir-55 csISO5428Greek } - { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 } - { GB_2312-80 iso-ir-58 chinese csISO58GB231280 } - { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian - csISO60Norwegian1 } - { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 } - { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French } - { videotex-suppl iso-ir-70 csISO70VideotexSupp1 } - { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 } - { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 } - { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian } - { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 } - { greek7 iso-ir-88 csISO88Greek7 } - { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 } - { iso-ir-90 csISO90 } - { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a } - { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b - csISO92JISC62991984b } - { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd } - { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand } - { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add - csISO95JIS62291984handadd } - { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana } - { ISO_2033-1983 iso-ir-98 e13b csISO2033 } - { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS } - { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819 - CP819 csISOLatin1 } - { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 } - { T.61-7bit iso-ir-102 csISO102T617bit } - { T.61-8bit T.61 iso-ir-103 csISO103T618bit } - { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 } - { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 } - { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic } - { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 } - { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 } - { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr } - { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708 - arabic csISOLatinArabic } - { ISO_8859-6-E csISO88596E ISO-8859-6-E } - { ISO_8859-6-I csISO88596I ISO-8859-6-I } - { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118 - greek greek8 csISOLatinGreek } - { T.101-G2 iso-ir-128 csISO128T101G2 } - { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew - csISOLatinHebrew } - { ISO_8859-8-E csISO88598E ISO-8859-8-E } - { ISO_8859-8-I csISO88598I ISO-8859-8-I } - { CSN_369103 iso-ir-139 csISO139CSN369103 } - { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 } - { ISO_6937-2-add iso-ir-142 csISOTextComm } - { IEC_P27-1 iso-ir-143 csISO143IECP271 } - { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic - csISOLatinCyrillic } - { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian } - { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian } - { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 } - { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT } - { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba } - { ISO_6937-2-25 iso-ir-152 csISO6937Add } - { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 } - { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp } - { ISO_10367-box iso-ir-155 csISO10367Box } - { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 } - { latin-lap lap iso-ir-158 csISO158Lap } - { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 } - { DS_2089 DS2089 ISO646-DK dk csISO646Danish } - { us-dk csUSDK } - { dk-us csDKUS } - { JIS_X0201 X0201 csHalfWidthKatakana } - { KSC5636 ISO646-KR csKSC5636 } - { ISO-10646-UCS-2 csUnicode } - { ISO-10646-UCS-4 csUCS4 } - { DEC-MCS dec csDECMCS } - { hp-roman8 roman8 r8 csHPRoman8 } - { macintosh mac csMacintosh } - { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl - csIBM037 } - { IBM038 EBCDIC-INT cp038 csIBM038 } - { IBM273 CP273 csIBM273 } - { IBM274 EBCDIC-BE CP274 csIBM274 } - { IBM275 EBCDIC-BR cp275 csIBM275 } - { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 } - { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 } - { IBM280 CP280 ebcdic-cp-it csIBM280 } - { IBM281 EBCDIC-JP-E cp281 csIBM281 } - { IBM284 CP284 ebcdic-cp-es csIBM284 } - { IBM285 CP285 ebcdic-cp-gb csIBM285 } - { IBM290 cp290 EBCDIC-JP-kana csIBM290 } - { IBM297 cp297 ebcdic-cp-fr csIBM297 } - { IBM420 cp420 ebcdic-cp-ar1 csIBM420 } - { IBM423 cp423 ebcdic-cp-gr csIBM423 } - { IBM424 cp424 ebcdic-cp-he csIBM424 } - { IBM437 cp437 437 csPC8CodePage437 } - { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 } - { IBM775 cp775 csPC775Baltic } - { IBM850 cp850 850 csPC850Multilingual } - { IBM851 cp851 851 csIBM851 } - { IBM852 cp852 852 csPCp852 } - { IBM855 cp855 855 csIBM855 } - { IBM857 cp857 857 csIBM857 } - { IBM860 cp860 860 csIBM860 } - { IBM861 cp861 861 cp-is csIBM861 } - { IBM862 cp862 862 csPC862LatinHebrew } - { IBM863 cp863 863 csIBM863 } - { IBM864 cp864 csIBM864 } - { IBM865 cp865 865 csIBM865 } - { IBM866 cp866 866 csIBM866 } - { IBM868 CP868 cp-ar csIBM868 } - { IBM869 cp869 869 cp-gr csIBM869 } - { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 } - { IBM871 CP871 ebcdic-cp-is csIBM871 } - { IBM880 cp880 EBCDIC-Cyrillic csIBM880 } - { IBM891 cp891 csIBM891 } - { IBM903 cp903 csIBM903 } - { IBM904 cp904 904 csIBBM904 } - { IBM905 CP905 ebcdic-cp-tr csIBM905 } - { IBM918 CP918 ebcdic-cp-ar2 csIBM918 } - { IBM1026 CP1026 csIBM1026 } - { EBCDIC-AT-DE csIBMEBCDICATDE } - { EBCDIC-AT-DE-A csEBCDICATDEA } - { EBCDIC-CA-FR csEBCDICCAFR } - { EBCDIC-DK-NO csEBCDICDKNO } - { EBCDIC-DK-NO-A csEBCDICDKNOA } - { EBCDIC-FI-SE csEBCDICFISE } - { EBCDIC-FI-SE-A csEBCDICFISEA } - { EBCDIC-FR csEBCDICFR } - { EBCDIC-IT csEBCDICIT } - { EBCDIC-PT csEBCDICPT } - { EBCDIC-ES csEBCDICES } - { EBCDIC-ES-A csEBCDICESA } - { EBCDIC-ES-S csEBCDICESS } - { EBCDIC-UK csEBCDICUK } - { EBCDIC-US csEBCDICUS } - { UNKNOWN-8BIT csUnknown8BiT } - { MNEMONIC csMnemonic } - { MNEM csMnem } - { VISCII csVISCII } - { VIQR csVIQR } - { KOI8-R csKOI8R } - { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro } - { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro } - { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro } - { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro } - { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro } - { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro } - { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro } - { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro } - { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro } - { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro } - { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro } - { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro } - { IBM1047 IBM-1047 } - { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian } - { Amiga-1251 Ami1251 Amiga1251 Ami-1251 } - { UNICODE-1-1 csUnicode11 } - { CESU-8 csCESU-8 } - { BOCU-1 csBOCU-1 } - { UNICODE-1-1-UTF-7 csUnicode11UTF7 } - { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic - l8 } - { ISO-8859-15 ISO_8859-15 Latin-9 } - { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 } - { GBK CP936 MS936 windows-936 } - { JIS_Encoding csJISEncoding } - { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS } - { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese - EUC-JP } - { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese } - { ISO-10646-UCS-Basic csUnicodeASCII } - { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 } - { ISO-Unicode-IBM-1261 csUnicodeIBM1261 } - { ISO-Unicode-IBM-1268 csUnicodeIBM1268 } - { ISO-Unicode-IBM-1276 csUnicodeIBM1276 } - { ISO-Unicode-IBM-1264 csUnicodeIBM1264 } - { ISO-Unicode-IBM-1265 csUnicodeIBM1265 } - { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 } - { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 } - { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 } - { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 } - { Adobe-Standard-Encoding csAdobeStandardEncoding } - { Ventura-US csVenturaUS } - { Ventura-International csVenturaInternational } - { PC8-Danish-Norwegian csPC8DanishNorwegian } - { PC8-Turkish csPC8Turkish } - { IBM-Symbols csIBMSymbols } - { IBM-Thai csIBMThai } - { HP-Legal csHPLegal } - { HP-Pi-font csHPPiFont } - { HP-Math8 csHPMath8 } - { Adobe-Symbol-Encoding csHPPSMath } - { HP-DeskTop csHPDesktop } - { Ventura-Math csVenturaMath } - { Microsoft-Publishing csMicrosoftPublishing } - { Windows-31J csWindows31J } - { GB2312 csGB2312 } - { Big5 csBig5 } -} - -set encoding_groups { - {"" "" - {"Unicode" UTF-8} - {"Western" ISO-8859-1}} - {we "West European" - {"Western" ISO-8859-15 CP-437 CP-850 MacRoman CP-1252 Windows-1252} - {"Celtic" ISO-8859-14} - {"Greek" ISO-8859-14 ISO-8859-7 CP-737 CP-869 MacGreek CP-1253 Windows-1253} - {"Icelandic" MacIceland MacIcelandic CP-861} - {"Nordic" ISO-8859-10 CP-865} - {"Portuguese" CP-860} - {"South European" ISO-8859-3}} - {ee "East European" - {"Baltic" CP-775 ISO-8859-4 ISO-8859-13 CP-1257 Windows-1257} - {"Central European" CP-852 ISO-8859-2 MacCE CP-1250 Windows-1250} - {"Croatian" MacCroatian} - {"Cyrillic" CP-855 ISO-8859-5 ISO-IR-111 KOI8-R MacCyrillic CP-1251 Windows-1251} - {"Russian" CP-866} - {"Ukrainian" KOI8-U MacUkraine MacUkrainian} - {"Romanian" ISO-8859-16 MacRomania MacRomanian}} - {ea "East Asian" - {"Generic" ISO-2022} - {"Chinese Simplified" GB2312 GB1988 GB12345 GB2312-RAW GBK EUC-CN GB18030 HZ ISO-2022-CN} - {"Chinese Traditional" Big5 Big5-HKSCS EUC-TW CP-950} - {"Japanese" EUC-JP ISO-2022-JP Shift-JIS JIS-0212 JIS-0208 JIS-0201 CP-932 MacJapan} - {"Korean" EUC-KR UHC JOHAB ISO-2022-KR CP-949 KSC5601}} - {sa "SE & SW Asian" - {"Armenian" ARMSCII-8} - {"Georgian" GEOSTD8} - {"Thai" TIS-620 ISO-8859-11 CP-874 Windows-874 MacThai} - {"Turkish" CP-857 CP857 ISO-8859-9 MacTurkish CP-1254 Windows-1254} - {"Vietnamese" TCVN VISCII VPS CP-1258 Windows-1258} - {"Hindi" MacDevanagari} - {"Gujarati" MacGujarati} - {"Gurmukhi" MacGurmukhi}} - {me "Middle Eastern" - {"Arabic" ISO-8859-6 Windows-1256 CP-1256 CP-864 MacArabic} - {"Farsi" MacFarsi} - {"Hebrew" ISO-8859-8-I Windows-1255 CP-1255 ISO-8859-8 CP-862 MacHebrew}} - {mi "Misc" - {"7-bit" ASCII} - {"16-bit" Unicode} - {"Legacy" CP-863 EBCDIC} - {"Symbol" Symbol Dingbats MacDingbats MacCentEuro}} -} - -proc build_encoding_table {} { - global encoding_aliases encoding_lookup_table - - # Prepare the lookup list; cannot use lsort -nocase because - # of compatibility issues with older Tcl (e.g. in msysgit) - set names [list] - foreach item [encoding names] { - lappend names [list [string tolower $item] $item] - } - set names [lsort -ascii -index 0 $names] - # neither can we use lsearch -index - set lnames [list] - foreach item $names { - lappend lnames [lindex $item 0] - } - - foreach grp $encoding_aliases { - set target {} - foreach item $grp { - set i [lsearch -sorted -ascii $lnames \ - [string tolower $item]] - if {$i >= 0} { - set target [lindex $names $i 1] - break - } - } - if {$target eq {}} continue - foreach item $grp { - set encoding_lookup_table([string tolower $item]) $target - } - } - - foreach item $names { - set encoding_lookup_table([lindex $item 0]) [lindex $item 1] - } -} - -proc tcl_encoding {enc} { - global encoding_lookup_table - if {$enc eq {}} { - return {} - } - if {![info exists encoding_lookup_table]} { - build_encoding_table - } - set enc [string tolower $enc] - if {![info exists encoding_lookup_table($enc)]} { - # look for "isonnn" instead of "iso-nnn" or "iso_nnn" - if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} { - set enc $encx - } - } - if {[info exists encoding_lookup_table($enc)]} { - return $encoding_lookup_table($enc) - } else { - return {} - } -} - -proc force_path_encoding {path enc} { - global path_encoding_overrides last_encoding_override - - set enc [tcl_encoding $enc] - if {$enc eq {}} { - catch { unset last_encoding_override } - catch { unset path_encoding_overrides($path) } - } else { - set last_encoding_override $enc - if {$path ne {}} { - set path_encoding_overrides($path) $enc - } - } -} - -proc get_path_encoding {path} { - global path_encoding_overrides last_encoding_override - - if {[info exists last_encoding_override]} { - set tcl_enc $last_encoding_override - } else { - set tcl_enc [tcl_encoding [get_config gui.encoding]] - } - if {$tcl_enc eq {}} { - set tcl_enc [encoding system] - } - if {$path ne {}} { - if {[info exists path_encoding_overrides($path)]} { - set enc2 $path_encoding_overrides($path) - } else { - set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]] - } - if {$enc2 ne {}} { - set tcl_enc $enc2 - } - } - return $tcl_enc -} - -proc build_encoding_submenu {parent grp cmd} { - global used_encodings - - set mid [lindex $grp 0] - set gname [mc [lindex $grp 1]] - - set smenu {} - foreach subset [lrange $grp 2 end] { - set name [mc [lindex $subset 0]] - - foreach enc [lrange $subset 1 end] { - set tcl_enc [tcl_encoding $enc] - if {$tcl_enc eq {}} continue - - if {$smenu eq {}} { - if {$mid eq {}} { - set smenu $parent - } else { - set smenu "$parent.$mid" - menu $smenu - $parent add cascade \ - -label $gname \ - -menu $smenu - } - } - - if {$name ne {}} { - set lbl "$name ($enc)" - } else { - set lbl $enc - } - $smenu add command \ - -label $lbl \ - -command [concat $cmd [list $tcl_enc]] - - lappend used_encodings $tcl_enc - } - } -} - -proc popup_btn_menu {m b} { - tk_popup $m [winfo pointerx $b] [winfo pointery $b] -} - -proc build_encoding_menu {emenu cmd {nodef 0}} { - $emenu configure -postcommand \ - [list do_build_encoding_menu $emenu $cmd $nodef] -} - -proc do_build_encoding_menu {emenu cmd {nodef 0}} { - global used_encodings encoding_groups - - $emenu configure -postcommand {} - - if {!$nodef} { - $emenu add command \ - -label [mc "Default"] \ - -command [concat $cmd [list {}]] - } - set sysenc [encoding system] - $emenu add command \ - -label [mc "System (%s)" $sysenc] \ - -command [concat $cmd [list $sysenc]] - - # Main encoding tree - set used_encodings [list identity] - $emenu add separator - foreach grp $encoding_groups { - build_encoding_submenu $emenu $grp $cmd - } - - # Add unclassified encodings - set unused_grp [list [mc Other]] - foreach enc [encoding names] { - if {[lsearch -exact $used_encodings $enc] < 0} { - lappend unused_grp $enc - } - } - build_encoding_submenu $emenu [list other [mc Other] $unused_grp] $cmd -} diff --git a/third_party/git/git-gui/lib/error.tcl b/third_party/git/git-gui/lib/error.tcl deleted file mode 100644 index 8968a57f33e3..000000000000 --- a/third_party/git/git-gui/lib/error.tcl +++ /dev/null @@ -1,119 +0,0 @@ -# git-gui branch (create/delete) support -# Copyright (C) 2006, 2007 Shawn Pearce - -proc _error_parent {} { - set p [grab current .] - if {$p eq {}} { - return . - } - return $p -} - -proc error_popup {msg} { - set title [appname] - if {[reponame] ne {}} { - append title " ([reponame])" - } - set cmd [list tk_messageBox \ - -icon error \ - -type ok \ - -title [mc "%s: error" $title] \ - -message $msg] - if {[winfo ismapped [_error_parent]]} { - lappend cmd -parent [_error_parent] - } - eval $cmd -} - -proc warn_popup {msg} { - set title [appname] - if {[reponame] ne {}} { - append title " ([reponame])" - } - set cmd [list tk_messageBox \ - -icon warning \ - -type ok \ - -title [mc "%s: warning" $title] \ - -message $msg] - if {[winfo ismapped [_error_parent]]} { - lappend cmd -parent [_error_parent] - } - eval $cmd -} - -proc info_popup {msg} { - set title [appname] - if {[reponame] ne {}} { - append title " ([reponame])" - } - tk_messageBox \ - -parent [_error_parent] \ - -icon info \ - -type ok \ - -title $title \ - -message $msg -} - -proc ask_popup {msg} { - set title [appname] - if {[reponame] ne {}} { - append title " ([reponame])" - } - set cmd [list tk_messageBox \ - -icon question \ - -type yesno \ - -title $title \ - -message $msg] - if {[winfo ismapped [_error_parent]]} { - lappend cmd -parent [_error_parent] - } - eval $cmd -} - -proc hook_failed_popup {hook msg {is_fatal 1}} { - global use_ttk NS - set w .hookfail - Dialog $w - wm withdraw $w - - ${NS}::frame $w.m - ${NS}::label $w.m.l1 -text [mc "%s hook failed:" $hook] \ - -anchor w \ - -justify left \ - -font font_uibold - text $w.m.t \ - -background white \ - -foreground black \ - -borderwidth 1 \ - -relief sunken \ - -width 80 -height 10 \ - -font font_diff \ - -yscrollcommand [list $w.m.sby set] - ${NS}::scrollbar $w.m.sby -command [list $w.m.t yview] - pack $w.m.l1 -side top -fill x - if {$is_fatal} { - ${NS}::label $w.m.l2 \ - -text [mc "You must correct the above errors before committing."] \ - -anchor w \ - -justify left \ - -font font_uibold - pack $w.m.l2 -side bottom -fill x - } - pack $w.m.sby -side right -fill y - pack $w.m.t -side left -fill both -expand 1 - pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10 - - $w.m.t insert 1.0 $msg - $w.m.t conf -state disabled - - ${NS}::button $w.ok -text OK \ - -width 15 \ - -command "destroy $w" - pack $w.ok -side bottom -anchor e -pady 10 -padx 10 - - bind $w <Visibility> "grab $w; focus $w" - bind $w <Key-Return> "destroy $w" - wm title $w [mc "%s (%s): error" [appname] [reponame]] - wm deiconify $w - tkwait window $w -} diff --git a/third_party/git/git-gui/lib/git-gui.ico b/third_party/git/git-gui/lib/git-gui.ico deleted file mode 100644 index 334cfa5a1a59..000000000000 --- a/third_party/git/git-gui/lib/git-gui.ico +++ /dev/null Binary files differdiff --git a/third_party/git/git-gui/lib/index.tcl b/third_party/git/git-gui/lib/index.tcl deleted file mode 100644 index d2ec24bd80e1..000000000000 --- a/third_party/git/git-gui/lib/index.tcl +++ /dev/null @@ -1,753 +0,0 @@ -# git-gui index (add/remove) support -# Copyright (C) 2006, 2007 Shawn Pearce - -proc _delete_indexlock {} { - if {[catch {file delete -- [gitdir index.lock]} err]} { - error_popup [strcat [mc "Unable to unlock the index."] "\n\n$err"] - } -} - -proc close_and_unlock_index {fd after} { - if {![catch {_close_updateindex $fd} err]} { - unlock_index - uplevel #0 $after - } else { - rescan_on_error $err $after - } -} - -proc _close_updateindex {fd} { - fconfigure $fd -blocking 1 - close $fd -} - -proc rescan_on_error {err {after {}}} { - global use_ttk NS - - set w .indexfried - Dialog $w - wm withdraw $w - wm title $w [strcat "[appname] ([reponame]): " [mc "Index Error"]] - wm geometry $w "+[winfo rootx .]+[winfo rooty .]" - set s [mc "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."] - text $w.msg -yscrollcommand [list $w.vs set] \ - -width [string length $s] -relief flat \ - -borderwidth 0 -highlightthickness 0 \ - -background [get_bg_color $w] - $w.msg tag configure bold -font font_uibold -justify center - ${NS}::scrollbar $w.vs -command [list $w.msg yview] - $w.msg insert end $s bold \n\n$err {} - $w.msg configure -state disabled - - ${NS}::button $w.continue \ - -text [mc "Continue"] \ - -command [list destroy $w] - ${NS}::button $w.unlock \ - -text [mc "Unlock Index"] \ - -command "destroy $w; _delete_indexlock" - grid $w.msg - $w.vs -sticky news - grid $w.unlock $w.continue - -sticky se -padx 2 -pady 2 - grid columnconfigure $w 0 -weight 1 - grid rowconfigure $w 0 -weight 1 - - wm protocol $w WM_DELETE_WINDOW update - bind $w.continue <Visibility> " - grab $w - focus %W - " - wm deiconify $w - tkwait window $w - - $::main_status stop_all - unlock_index - rescan [concat $after {ui_ready;}] 0 -} - -proc update_indexinfo {msg path_list after} { - global update_index_cp - - if {![lock_index update]} return - - set update_index_cp 0 - set path_list [lsort $path_list] - set total_cnt [llength $path_list] - set batch [expr {int($total_cnt * .01) + 1}] - if {$batch > 25} {set batch 25} - - set status_bar_operation [$::main_status start $msg [mc "files"]] - set fd [git_write update-index -z --index-info] - fconfigure $fd \ - -blocking 0 \ - -buffering full \ - -buffersize 512 \ - -encoding binary \ - -translation binary - fileevent $fd writable [list \ - write_update_indexinfo \ - $fd \ - $path_list \ - $total_cnt \ - $batch \ - $status_bar_operation \ - $after \ - ] -} - -proc write_update_indexinfo {fd path_list total_cnt batch status_bar_operation \ - after} { - global update_index_cp - global file_states current_diff_path - - if {$update_index_cp >= $total_cnt} { - $status_bar_operation stop - close_and_unlock_index $fd $after - return - } - - for {set i $batch} \ - {$update_index_cp < $total_cnt && $i > 0} \ - {incr i -1} { - set path [lindex $path_list $update_index_cp] - incr update_index_cp - - set s $file_states($path) - switch -glob -- [lindex $s 0] { - A? {set new _O} - MT - - TM - - T_ {set new _T} - M? {set new _M} - TD - - D_ {set new _D} - D? {set new _?} - ?? {continue} - } - set info [lindex $s 2] - if {$info eq {}} continue - - puts -nonewline $fd "$info\t[encoding convertto utf-8 $path]\0" - display_file $path $new - } - - $status_bar_operation update $update_index_cp $total_cnt -} - -proc update_index {msg path_list after} { - global update_index_cp - - if {![lock_index update]} return - - set update_index_cp 0 - set path_list [lsort $path_list] - set total_cnt [llength $path_list] - set batch [expr {int($total_cnt * .01) + 1}] - if {$batch > 25} {set batch 25} - - set status_bar_operation [$::main_status start $msg [mc "files"]] - set fd [git_write update-index --add --remove -z --stdin] - fconfigure $fd \ - -blocking 0 \ - -buffering full \ - -buffersize 512 \ - -encoding binary \ - -translation binary - fileevent $fd writable [list \ - write_update_index \ - $fd \ - $path_list \ - $total_cnt \ - $batch \ - $status_bar_operation \ - $after \ - ] -} - -proc write_update_index {fd path_list total_cnt batch status_bar_operation \ - after} { - global update_index_cp - global file_states current_diff_path - - if {$update_index_cp >= $total_cnt} { - $status_bar_operation stop - close_and_unlock_index $fd $after - return - } - - for {set i $batch} \ - {$update_index_cp < $total_cnt && $i > 0} \ - {incr i -1} { - set path [lindex $path_list $update_index_cp] - incr update_index_cp - - switch -glob -- [lindex $file_states($path) 0] { - AD {set new __} - ?D {set new D_} - _O - - AT - - AM {set new A_} - TM - - MT - - _T {set new T_} - _U - - U? { - if {[file exists $path]} { - set new M_ - } else { - set new D_ - } - } - ?M {set new M_} - ?? {continue} - } - puts -nonewline $fd "[encoding convertto utf-8 $path]\0" - display_file $path $new - } - - $status_bar_operation update $update_index_cp $total_cnt -} - -proc checkout_index {msg path_list after capture_error} { - global update_index_cp - - if {![lock_index update]} return - - set update_index_cp 0 - set path_list [lsort $path_list] - set total_cnt [llength $path_list] - set batch [expr {int($total_cnt * .01) + 1}] - if {$batch > 25} {set batch 25} - - set status_bar_operation [$::main_status start $msg [mc "files"]] - set fd [git_write checkout-index \ - --index \ - --quiet \ - --force \ - -z \ - --stdin \ - ] - fconfigure $fd \ - -blocking 0 \ - -buffering full \ - -buffersize 512 \ - -encoding binary \ - -translation binary - fileevent $fd writable [list \ - write_checkout_index \ - $fd \ - $path_list \ - $total_cnt \ - $batch \ - $status_bar_operation \ - $after \ - $capture_error \ - ] -} - -proc write_checkout_index {fd path_list total_cnt batch status_bar_operation \ - after capture_error} { - global update_index_cp - global file_states current_diff_path - - if {$update_index_cp >= $total_cnt} { - $status_bar_operation stop - - # We do not unlock the index directly here because this - # operation expects to potentially run in parallel with file - # deletions scheduled by revert_helper. We're done with the - # update index, so we close it, but actually unlocking the index - # and dealing with potential errors is deferred to the chord - # body that runs when all async operations are completed. - # - # (See after_chord in revert_helper.) - - if {[catch {_close_updateindex $fd} err]} { - uplevel #0 $capture_error [list $err] - } - - uplevel #0 $after - - return - } - - for {set i $batch} \ - {$update_index_cp < $total_cnt && $i > 0} \ - {incr i -1} { - set path [lindex $path_list $update_index_cp] - incr update_index_cp - switch -glob -- [lindex $file_states($path) 0] { - U? {continue} - ?M - - ?T - - ?D { - puts -nonewline $fd "[encoding convertto utf-8 $path]\0" - display_file $path ?_ - } - } - } - - $status_bar_operation update $update_index_cp $total_cnt -} - -proc unstage_helper {txt paths} { - global file_states current_diff_path - - if {![lock_index begin-update]} return - - set path_list [list] - set after {} - foreach path $paths { - switch -glob -- [lindex $file_states($path) 0] { - A? - - M? - - T? - - D? { - lappend path_list $path - if {$path eq $current_diff_path} { - set after {reshow_diff;} - } - } - } - } - if {$path_list eq {}} { - unlock_index - } else { - update_indexinfo \ - $txt \ - $path_list \ - [concat $after {ui_ready;}] - } -} - -proc do_unstage_selection {} { - global current_diff_path selected_paths - - if {[array size selected_paths] > 0} { - unstage_helper \ - [mc "Unstaging selected files from commit"] \ - [array names selected_paths] - } elseif {$current_diff_path ne {}} { - unstage_helper \ - [mc "Unstaging %s from commit" [short_path $current_diff_path]] \ - [list $current_diff_path] - } -} - -proc add_helper {txt paths} { - global file_states current_diff_path - - if {![lock_index begin-update]} return - - set path_list [list] - set after {} - foreach path $paths { - switch -glob -- [lindex $file_states($path) 0] { - _U - - U? { - if {$path eq $current_diff_path} { - unlock_index - merge_stage_workdir $path - return - } - } - _O - - ?M - - ?D - - ?T { - lappend path_list $path - if {$path eq $current_diff_path} { - set after {reshow_diff;} - } - } - } - } - if {$path_list eq {}} { - unlock_index - } else { - update_index \ - $txt \ - $path_list \ - [concat $after {ui_status [mc "Ready to commit."];}] - } -} - -proc do_add_selection {} { - global current_diff_path selected_paths - - if {[array size selected_paths] > 0} { - add_helper \ - [mc "Adding selected files"] \ - [array names selected_paths] - } elseif {$current_diff_path ne {}} { - add_helper \ - [mc "Adding %s" [short_path $current_diff_path]] \ - [list $current_diff_path] - } -} - -proc do_add_all {} { - global file_states - - set paths [list] - set untracked_paths [list] - foreach path [array names file_states] { - switch -glob -- [lindex $file_states($path) 0] { - U? {continue} - ?M - - ?T - - ?D {lappend paths $path} - ?O {lappend untracked_paths $path} - } - } - if {[llength $untracked_paths]} { - set reply 0 - switch -- [get_config gui.stageuntracked] { - no { - set reply 0 - } - yes { - set reply 1 - } - ask - - default { - set reply [ask_popup [mc "Stage %d untracked files?" \ - [llength $untracked_paths]]] - } - } - if {$reply} { - set paths [concat $paths $untracked_paths] - } - } - add_helper [mc "Adding all changed files"] $paths -} - -# Copied from TclLib package "lambda". -proc lambda {arguments body args} { - return [list ::apply [list $arguments $body] {*}$args] -} - -proc revert_helper {txt paths} { - global file_states current_diff_path - - if {![lock_index begin-update]} return - - # Common "after" functionality that waits until multiple asynchronous - # operations are complete (by waiting for them to activate their notes - # on the chord). - # - # The asynchronous operations are each indicated below by a comment - # before the code block that starts the async operation. - set after_chord [SimpleChord::new { - if {[string trim $err] != ""} { - rescan_on_error $err - } else { - unlock_index - if {$should_reshow_diff} { reshow_diff } - ui_ready - } - }] - - $after_chord eval { set should_reshow_diff 0 } - - # This function captures an error for processing when after_chord is - # completed. (The chord is curried into the lambda function.) - set capture_error [lambda \ - {chord error} \ - { $chord eval [list set err $error] } \ - $after_chord] - - # We don't know how many notes we're going to create (it's dynamic based - # on conditional paths below), so create a common note that will delay - # the chord's completion until we activate it, and then activate it - # after all the other notes have been created. - set after_common_note [$after_chord add_note] - - set path_list [list] - set untracked_list [list] - - foreach path $paths { - switch -glob -- [lindex $file_states($path) 0] { - U? {continue} - ?O { - lappend untracked_list $path - } - ?M - - ?T - - ?D { - lappend path_list $path - if {$path eq $current_diff_path} { - $after_chord eval { set should_reshow_diff 1 } - } - } - } - } - - set path_cnt [llength $path_list] - set untracked_cnt [llength $untracked_list] - - # Asynchronous operation: revert changes by checking them out afresh - # from the index. - if {$path_cnt > 0} { - # Split question between singular and plural cases, because - # such distinction is needed in some languages. Previously, the - # code used "Revert changes in" for both, but that can't work - # in languages where 'in' must be combined with word from - # rest of string (in different way for both cases of course). - # - # FIXME: Unfortunately, even that isn't enough in some languages - # as they have quite complex plural-form rules. Unfortunately, - # msgcat doesn't seem to support that kind of string - # translation. - # - if {$path_cnt == 1} { - set query [mc \ - "Revert changes in file %s?" \ - [short_path [lindex $path_list]] \ - ] - } else { - set query [mc \ - "Revert changes in these %i files?" \ - $path_cnt] - } - - set reply [tk_dialog \ - .confirm_revert \ - "[appname] ([reponame])" \ - "$query - -[mc "Any unstaged changes will be permanently lost by the revert."]" \ - question \ - 1 \ - [mc "Do Nothing"] \ - [mc "Revert Changes"] \ - ] - - if {$reply == 1} { - set note [$after_chord add_note] - checkout_index \ - $txt \ - $path_list \ - [list $note activate] \ - $capture_error - } - } - - # Asynchronous operation: Deletion of untracked files. - if {$untracked_cnt > 0} { - # Split question between singular and plural cases, because - # such distinction is needed in some languages. - # - # FIXME: Unfortunately, even that isn't enough in some languages - # as they have quite complex plural-form rules. Unfortunately, - # msgcat doesn't seem to support that kind of string - # translation. - # - if {$untracked_cnt == 1} { - set query [mc \ - "Delete untracked file %s?" \ - [short_path [lindex $untracked_list]] \ - ] - } else { - set query [mc \ - "Delete these %i untracked files?" \ - $untracked_cnt \ - ] - } - - set reply [tk_dialog \ - .confirm_revert \ - "[appname] ([reponame])" \ - "$query - -[mc "Files will be permanently deleted."]" \ - question \ - 1 \ - [mc "Do Nothing"] \ - [mc "Delete Files"] \ - ] - - if {$reply == 1} { - $after_chord eval { set should_reshow_diff 1 } - - set note [$after_chord add_note] - delete_files $untracked_list [list $note activate] - } - } - - # Activate the common note. If no other notes were created, this - # completes the chord. If other notes were created, then this common - # note prevents a race condition where the chord might complete early. - $after_common_note activate -} - -# Delete all of the specified files, performing deletion in batches to allow the -# UI to remain responsive and updated. -proc delete_files {path_list after} { - # Enable progress bar status updates - set status_bar_operation [$::main_status \ - start \ - [mc "Deleting"] \ - [mc "files"]] - - set path_index 0 - set deletion_errors [list] - set batch_size 50 - - delete_helper \ - $path_list \ - $path_index \ - $deletion_errors \ - $batch_size \ - $status_bar_operation \ - $after -} - -# Helper function to delete a list of files in batches. Each call deletes one -# batch of files, and then schedules a call for the next batch after any UI -# messages have been processed. -proc delete_helper {path_list path_index deletion_errors batch_size \ - status_bar_operation after} { - global file_states - - set path_cnt [llength $path_list] - - set batch_remaining $batch_size - - while {$batch_remaining > 0} { - if {$path_index >= $path_cnt} { break } - - set path [lindex $path_list $path_index] - - set deletion_failed [catch {file delete -- $path} deletion_error] - - if {$deletion_failed} { - lappend deletion_errors [list "$deletion_error"] - } else { - remove_empty_directories [file dirname $path] - - # Don't assume the deletion worked. Remove the file from - # the UI, but only if it no longer exists. - if {![path_exists $path]} { - unset file_states($path) - display_file $path __ - } - } - - incr path_index 1 - incr batch_remaining -1 - } - - # Update the progress bar to indicate that this batch has been - # completed. The update will be visible when this procedure returns - # and allows the UI thread to process messages. - $status_bar_operation update $path_index $path_cnt - - if {$path_index < $path_cnt} { - # The Tcler's Wiki lists this as the best practice for keeping - # a UI active and processing messages during a long-running - # operation. - - after idle [list after 0 [list \ - delete_helper \ - $path_list \ - $path_index \ - $deletion_errors \ - $batch_size \ - $status_bar_operation \ - $after - ]] - } else { - # Finish the status bar operation. - $status_bar_operation stop - - # Report error, if any, based on how many deletions failed. - set deletion_error_cnt [llength $deletion_errors] - - if {($deletion_error_cnt > 0) - && ($deletion_error_cnt <= [MAX_VERBOSE_FILES_IN_DELETION_ERROR])} { - set error_text [mc "Encountered errors deleting files:\n"] - - foreach deletion_error $deletion_errors { - append error_text "* [lindex $deletion_error 0]\n" - } - - error_popup $error_text - } elseif {$deletion_error_cnt == $path_cnt} { - error_popup [mc \ - "None of the %d selected files could be deleted." \ - $path_cnt \ - ] - } elseif {$deletion_error_cnt > 1} { - error_popup [mc \ - "%d of the %d selected files could not be deleted." \ - $deletion_error_cnt \ - $path_cnt \ - ] - } - - uplevel #0 $after - } -} - -proc MAX_VERBOSE_FILES_IN_DELETION_ERROR {} { return 10; } - -# This function is from the TCL documentation: -# -# https://wiki.tcl-lang.org/page/file+exists -# -# [file exists] returns false if the path does exist but is a symlink to a path -# that doesn't exist. This proc returns true if the path exists, regardless of -# whether it is a symlink and whether it is broken. -proc path_exists {name} { - expr {![catch {file lstat $name finfo}]} -} - -# Remove as many empty directories as we can starting at the specified path, -# walking up the directory tree. If we encounter a directory that is not -# empty, or if a directory deletion fails, then we stop the operation and -# return to the caller. Even if this procedure fails to delete any -# directories at all, it does not report failure. -proc remove_empty_directories {directory_path} { - set parent_path [file dirname $directory_path] - - while {$parent_path != $directory_path} { - set contents [glob -nocomplain -dir $directory_path *] - - if {[llength $contents] > 0} { break } - if {[catch {file delete -- $directory_path}]} { break } - - set directory_path $parent_path - set parent_path [file dirname $directory_path] - } -} - -proc do_revert_selection {} { - global current_diff_path selected_paths - - if {[array size selected_paths] > 0} { - revert_helper \ - [mc "Reverting selected files"] \ - [array names selected_paths] - } elseif {$current_diff_path ne {}} { - revert_helper \ - [mc "Reverting %s" [short_path $current_diff_path]] \ - [list $current_diff_path] - } -} - -proc do_select_commit_type {} { - global commit_type commit_type_is_amend - - if {$commit_type_is_amend == 0 - && [string match amend* $commit_type]} { - create_new_commit - } elseif {$commit_type_is_amend == 1 - && ![string match amend* $commit_type]} { - load_last_commit - - # The amend request was rejected... - # - if {![string match amend* $commit_type]} { - set commit_type_is_amend 0 - } - } -} diff --git a/third_party/git/git-gui/lib/line.tcl b/third_party/git/git-gui/lib/line.tcl deleted file mode 100644 index a026de954c3d..000000000000 --- a/third_party/git/git-gui/lib/line.tcl +++ /dev/null @@ -1,81 +0,0 @@ -# goto line number -# based on code from gitk, Copyright (C) Paul Mackerras - -class linebar { - -field w -field ctext - -field linenum {} - -constructor new {i_w i_text args} { - global use_ttk NS - set w $i_w - set ctext $i_text - - ${NS}::frame $w - ${NS}::label $w.l -text [mc "Goto Line:"] - tentry $w.ent \ - -textvariable ${__this}::linenum \ - -background lightgreen \ - -validate key \ - -validatecommand [cb _validate %P] - ${NS}::button $w.bn -text [mc Go] -command [cb _goto] - - pack $w.l -side left - pack $w.bn -side right - pack $w.ent -side left -expand 1 -fill x - - eval grid conf $w -sticky we $args - grid remove $w - - trace add variable linenum write [cb _goto_cb] - bind $w.ent <Return> [cb _goto] - bind $w.ent <Escape> [cb hide] - - bind $w <Destroy> [list delete_this $this] - return $this -} - -method show {} { - if {![visible $this]} { - grid $w - } - focus -force $w.ent -} - -method hide {} { - if {[visible $this]} { - $w.ent delete 0 end - focus $ctext - grid remove $w - } -} - -method visible {} { - return [winfo ismapped $w] -} - -method editor {} { - return $w.ent -} - -method _validate {P} { - # only accept numbers as input - string is integer $P -} - -method _goto_cb {name ix op} { - after idle [cb _goto 1] -} - -method _goto {{nohide {0}}} { - if {$linenum ne {}} { - $ctext see $linenum.0 - if {!$nohide} { - hide $this - } - } -} - -} diff --git a/third_party/git/git-gui/lib/logo.tcl b/third_party/git/git-gui/lib/logo.tcl deleted file mode 100644 index 5ff76692f5ee..000000000000 --- a/third_party/git/git-gui/lib/logo.tcl +++ /dev/null @@ -1,43 +0,0 @@ -# git-gui Git Gui logo -# Copyright (C) 2007 Shawn Pearce - -# Henrik Nyh's alternative Git logo, from his blog post -# http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon -# -image create photo ::git_logo_data -data { -R0lGODdhYQC8AIQbAGZmZtg4LW9vb3l5eYKCgoyMjEC/TOJpYZWVlZ+fn2/PeKmpqbKysry8vMXF -xZ/fpc/Pz7fnvPXNytnZ2eLi4s/v0vja1+zs7Of36fX19f3z8v///////////////////ywAAAAA -YQC8AAAF/uAmjmRpnmiqrmzrvq4hz3RtGw+s7zx5/7dcb0hUAY8zYXHJRCKVzGjPeYRKry8q0Irt -GrVBr3gFDo/PprKNix6ra+y2902Ly7H05L2dl9n3UX04gGeCf4RFhohiiotdjY5XkJGBfYeUOpOY -iZablXmXURgPpKWmp6ipqYIKqq6vqREjFYK1trUKs7e7vFq5IrS9wsM0vxvBxMm8xsjKzqy6z9J5 -zNPWatXX2k7Z29433d/iMuHj3+Xm2+jp1+vs0+7vz/HyyvT1xPf4wvr7y9H+pBkbBasgLFYGE8ba -o8nTlE4OOYGKKJFOKIopGmLMAnHjDo0eWYAM+WUiSRgj/k+eSKmyBMuWI17C3CATZs2WN1XmPLmT -ZM+QPz0G3VihqNGjSJNWwDCzqdOnUKPu0SChqtWrWLNq3cq1q9evYCVYGCEhgNmzaNOqXcu2rdu3 -cOMGOEBWrt27ePPCpSuirN6/gAO35bvBr+DDiPMSNpy4sWO2ix9Lnmw2MuXLiS1j3gxYM+fPdz2D -Hv1WNOnTak2jXj23LuvXlV3DZq16Nujatjnjzo15N2/Kvn9LDi7cMfHimaUqX868ufPn0KPPpOCA -AQMWCQBo3869u/fv4MNrd3DlQoMC3QlkSJFdvPv38LVDWJLBAYHwE1LE38+/+/UhGTAggHv5odDf -gfv9/seDgPAVeAKCELqnIAwU3BefgyZEqOF3E7rAQH8YlrDhiNt1uEIG6IGoH4kjmpjCBRaqaCCL -G7p4AgUDIhgiCTTW2AKOEe44Qo8a2khCBgNoKKQIREZopAgZxAjhkhs0CeGTG7Sn5IpW9vekAyRS -2eWBRl6Q44ZijhlfAQlQmeKIaarpHZsMTHABCxDQGKec3JH3QpIs7snndn6yAKaeXA7aZwuABppo -fAws0GiEhaKQJ40F3DkjfwVC8CaCAlCgAgIkJjDfCgdiOMGn/Q2w3gkZtPgqC6ma0ECECaBwa4QE -aOpCrSYAqeMJpEKYqw7ABnsmfwQ8aCwPySqLYKUb/kwAYbPQyoiCtQcOUMKHBwrgK7LaogBuuaxC -OkS0KEwa37EiLBufALPuwO4Jh/InwAixkknEvSe4C9+p3PY3rr3lpnDufguIcCmzRQAc7IHYLhxf -w/8mnILA74lg8cARa4xCsZxusMCBomZccgsfv0deuh2HvLKh/sLs3hJSvieuCwUzvIHN4tGXc3ih -vtDzmj8fSNLR8BWQdH9LH+g00OFF3d/UBx4cUcvuOc21eFRiouV+Xvvr0dDvlX21R/2uzTR89TqU -L3+5UoBgAxtRHd5/CHpLkd13i4D2e3hHRLKMY+9Hr0Nvx/fq3Pw57cng7/m9wQVObnIyhAiQwHF8 -/tQS8nDgI2wOYeh3CAvhuIBHiDEgqvdtwudkaz3GBPKaTcKuGgqAJRMZmK6h1hnk3ncDcUvhgPFS -o5B476ZKQcECzCN4qgmYN4lAncmzcAEEkhJp+QlfkyhAAdtbN8H67FvHQAF6b4g6v9UryqfkKkBu -v/0prxD//kR63YnqB8AeqcdoBRxU/1zAuwRaaX4reJ4DSSRAHUhwgrgqwgUx2B94EWGDHISPBzUY -QgSNcAn6K6F4fscDCtBOhdoRwPW6kIHDwZA7vWoDBF44Qd/tIUAEBCACbIeG4AXxfmFrQ4B4OCYE -JBEQELChmgbAACJioj4JOCKCCLCABZ6EAg1IHwDlyLYAB1gRJhSYgHUQAD9WnQ9+CWBAA+wknTpC -JwQAOw== -} - -proc git_logo {w} { - label $w \ - -borderwidth 1 \ - -relief sunken \ - -background white \ - -image ::git_logo_data - return $w -} diff --git a/third_party/git/git-gui/lib/merge.tcl b/third_party/git/git-gui/lib/merge.tcl deleted file mode 100644 index 664803cf3fd1..000000000000 --- a/third_party/git/git-gui/lib/merge.tcl +++ /dev/null @@ -1,285 +0,0 @@ -# git-gui branch merge support -# Copyright (C) 2006, 2007 Shawn Pearce - -class merge { - -field w ; # top level window -field w_rev ; # mega-widget to pick the revision to merge - -method _can_merge {} { - global HEAD commit_type file_states - - if {[string match amend* $commit_type]} { - info_popup [mc "Cannot merge while amending. - -You must finish amending this commit before starting any type of merge. -"] - return 0 - } - - if {[committer_ident] eq {}} {return 0} - if {![lock_index merge]} {return 0} - - # -- Our in memory state should match the repository. - # - repository_state curType curHEAD curMERGE_HEAD - if {$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 a merge can be performed. - -The rescan will be automatically started now. -"] - unlock_index - rescan ui_ready - return 0 - } - - foreach path [array names file_states] { - switch -glob -- [lindex $file_states($path) 0] { - _O { - continue; # and pray it works! - } - _U - - U? { - error_popup [mc "You are in the middle of a conflicted merge. - -File %s has merge conflicts. - -You must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge. -" [short_path $path]] - unlock_index - return 0 - } - ?? { - error_popup [mc "You are in the middle of a change. - -File %s is modified. - -You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise. -" [short_path $path]] - unlock_index - return 0 - } - } - } - - return 1 -} - -method _rev {} { - if {[catch {$w_rev commit_or_die}]} { - return {} - } - return [$w_rev get] -} - -method _visualize {} { - set rev [_rev $this] - if {$rev ne {}} { - do_gitk [list $rev --not HEAD] - } -} - -method _start {} { - global HEAD current_branch remote_url - global _last_merged_branch - - set name [_rev $this] - if {$name eq {}} { - return - } - - set spec [$w_rev get_tracking_branch] - set cmit [$w_rev get_commit] - - set fh [open [gitdir FETCH_HEAD] w] - fconfigure $fh -translation lf - if {$spec eq {}} { - set remote . - set branch $name - set stitle $branch - } else { - set remote $remote_url([lindex $spec 1]) - if {[regexp {^[^:@]*@[^:]*:/} $remote]} { - regsub {^[^:@]*@} $remote {} remote - } - set branch [lindex $spec 2] - set stitle [mc "%s of %s" $branch $remote] - } - regsub ^refs/heads/ $branch {} branch - puts $fh "$cmit\t\tbranch '$branch' of $remote" - close $fh - set _last_merged_branch $branch - - if {[git-version >= "2.5.0"]} { - set cmd [list git merge --strategy=recursive FETCH_HEAD] - } else { - set cmd [list git] - lappend cmd merge - lappend cmd --strategy=recursive - lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]] - lappend cmd HEAD - lappend cmd $name - } - - ui_status [mc "Merging %s and %s..." $current_branch $stitle] - set cons [console::new [mc "Merge"] "merge $stitle"] - console::exec $cons $cmd [cb _finish $cons] - - wm protocol $w WM_DELETE_WINDOW {} - destroy $w -} - -method _finish {cons ok} { - console::done $cons $ok - if {$ok} { - set msg [mc "Merge completed successfully."] - } else { - set msg [mc "Merge failed. Conflict resolution is required."] - } - unlock_index - rescan [list ui_status $msg] - delete_this -} - -constructor dialog {} { - global current_branch - global M1B use_ttk NS - - if {![_can_merge $this]} { - delete_this - return - } - - make_dialog top w - wm title $top [mc "%s (%s): Merge" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - } - - set _start [cb _start] - - ${NS}::label $w.header \ - -text [mc "Merge Into %s" $current_branch] \ - -font font_uibold - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.visualize \ - -text [mc Visualize] \ - -command [cb _visualize] - pack $w.buttons.visualize -side left - ${NS}::button $w.buttons.merge \ - -text [mc Merge] \ - -command $_start - pack $w.buttons.merge -side right - ${NS}::button $w.buttons.cancel \ - -text [mc "Cancel"] \ - -command [cb _cancel] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - set w_rev [::choose_rev::new_unmerged $w.rev [mc "Revision To Merge"]] - pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 - - bind $w <$M1B-Key-Return> $_start - bind $w <Key-Return> $_start - bind $w <Key-Escape> [cb _cancel] - wm protocol $w WM_DELETE_WINDOW [cb _cancel] - - bind $w.buttons.merge <Visibility> [cb _visible] - tkwait window $w -} - -method _visible {} { - grab $w - if {[is_config_true gui.matchtrackingbranch]} { - $w_rev pick_tracking_branch - } - $w_rev focus_filter -} - -method _cancel {} { - wm protocol $w WM_DELETE_WINDOW {} - unlock_index - destroy $w - delete_this -} - -} - -namespace eval merge { - -proc reset_hard {} { - global HEAD commit_type file_states - - if {[string match amend* $commit_type]} { - info_popup [mc "Cannot abort while amending. - -You must finish amending this commit. -"] - return - } - - if {![lock_index abort]} return - - if {[string match *merge* $commit_type]} { - set op_question [mc "Abort merge? - -Aborting the current merge will cause *ALL* uncommitted changes to be lost. - -Continue with aborting the current merge?"] - } else { - set op_question [mc "Reset changes? - -Resetting the changes will cause *ALL* uncommitted changes to be lost. - -Continue with resetting the current changes?"] - } - - if {[ask_popup $op_question] eq {yes}} { - set fd [git_read --stderr read-tree --reset -u -v HEAD] - fconfigure $fd -blocking 0 -translation binary - set status_bar_operation [$::main_status \ - start \ - [mc "Aborting"] \ - [mc "files reset"]] - fileevent $fd readable [namespace code [list \ - _reset_wait $fd $status_bar_operation]] - } else { - unlock_index - } -} - -proc _reset_wait {fd status_bar_operation} { - global ui_comm - - $status_bar_operation update_meter [read $fd] - - fconfigure $fd -blocking 1 - if {[eof $fd]} { - set fail [catch {close $fd} err] - unlock_index - $status_bar_operation stop - - $ui_comm delete 0.0 end - $ui_comm edit modified false - - catch {file delete [gitdir MERGE_HEAD]} - catch {file delete [gitdir rr-cache MERGE_RR]} - catch {file delete [gitdir MERGE_RR]} - catch {file delete [gitdir SQUASH_MSG]} - catch {file delete [gitdir MERGE_MSG]} - catch {file delete [gitdir GITGUI_MSG]} - - if {$fail} { - warn_popup "[mc "Abort failed."]\n\n$err" - } - rescan {ui_status [mc "Abort completed. Ready."]} - } else { - fconfigure $fd -blocking 0 - } -} - -} diff --git a/third_party/git/git-gui/lib/mergetool.tcl b/third_party/git/git-gui/lib/mergetool.tcl deleted file mode 100644 index e688b016ef6c..000000000000 --- a/third_party/git/git-gui/lib/mergetool.tcl +++ /dev/null @@ -1,400 +0,0 @@ -# git-gui merge conflict resolution -# parts based on git-mergetool (c) 2006 Theodore Y. Ts'o - -proc merge_resolve_one {stage} { - global current_diff_path - - switch -- $stage { - 1 { set targetquestion [mc "Force resolution to the base version?"] } - 2 { set targetquestion [mc "Force resolution to this branch?"] } - 3 { set targetquestion [mc "Force resolution to the other branch?"] } - } - - set op_question [strcat $targetquestion "\n" \ -[mc "Note that the diff shows only conflicting changes. - -%s will be overwritten. - -This operation can be undone only by restarting the merge." \ - [short_path $current_diff_path]]] - - if {[ask_popup $op_question] eq {yes}} { - merge_load_stages $current_diff_path [list merge_force_stage $stage] - } -} - -proc merge_stage_workdir {path {lno {}}} { - global current_diff_path diff_active - global current_diff_side ui_workdir - - if {$diff_active} return - - if {$path ne $current_diff_path || $ui_workdir ne $current_diff_side} { - show_diff $path $ui_workdir $lno {} [list do_merge_stage_workdir $path] - } else { - do_merge_stage_workdir $path - } -} - -proc do_merge_stage_workdir {path} { - global current_diff_path is_conflict_diff - - if {$path ne $current_diff_path} return; - - if {$is_conflict_diff} { - if {[ask_popup [mc "File %s seems to have unresolved conflicts, still stage?" \ - [short_path $path]]] ne {yes}} { - return - } - } - - merge_add_resolution $path -} - -proc merge_add_resolution {path} { - global current_diff_path ui_workdir - - set after [next_diff_after_action $ui_workdir $path {} {^_?U}] - - update_index \ - [mc "Adding resolution for %s" [short_path $path]] \ - [list $path] \ - [concat $after {ui_ready;}] -} - -proc merge_force_stage {stage} { - global current_diff_path merge_stages - - if {$merge_stages($stage) ne {}} { - git checkout-index -f --stage=$stage -- $current_diff_path - } else { - file delete -- $current_diff_path - } - - merge_add_resolution $current_diff_path -} - -proc merge_load_stages {path cont} { - global merge_stages_fd merge_stages merge_stages_buf - - if {[info exists merge_stages_fd]} { - catch { kill_file_process $merge_stages_fd } - catch { close $merge_stages_fd } - } - - set merge_stages(0) {} - set merge_stages(1) {} - set merge_stages(2) {} - set merge_stages(3) {} - set merge_stages_buf {} - - set merge_stages_fd [eval git_read ls-files -u -z -- {$path}] - - fconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary - fileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont] -} - -proc read_merge_stages {fd cont} { - global merge_stages_buf merge_stages_fd merge_stages - - append merge_stages_buf [read $fd] - set pck [split $merge_stages_buf "\0"] - set merge_stages_buf [lindex $pck end] - - if {[eof $fd] && $merge_stages_buf ne {}} { - lappend pck {} - set merge_stages_buf {} - } - - foreach p [lrange $pck 0 end-1] { - set fcols [split $p "\t"] - set cols [split [lindex $fcols 0] " "] - set stage [lindex $cols 2] - - set merge_stages($stage) [lrange $cols 0 1] - } - - if {[eof $fd]} { - close $fd - unset merge_stages_fd - eval $cont - } -} - -proc merge_resolve_tool {} { - global current_diff_path - - merge_load_stages $current_diff_path [list merge_resolve_tool2] -} - -proc merge_resolve_tool2 {} { - global current_diff_path merge_stages - - # Validate the stages - if {$merge_stages(2) eq {} || - [lindex $merge_stages(2) 0] eq {120000} || - [lindex $merge_stages(2) 0] eq {160000} || - $merge_stages(3) eq {} || - [lindex $merge_stages(3) 0] eq {120000} || - [lindex $merge_stages(3) 0] eq {160000} - } { - error_popup [mc "Cannot resolve deletion or link conflicts using a tool"] - return - } - - if {![file exists $current_diff_path]} { - error_popup [mc "Conflict file does not exist"] - return - } - - # Determine the tool to use - set tool [get_config merge.tool] - if {$tool eq {}} { set tool meld } - - set merge_tool_path [get_config "mergetool.$tool.path"] - if {$merge_tool_path eq {}} { - switch -- $tool { - emerge { set merge_tool_path "emacs" } - araxis { set merge_tool_path "compare" } - default { set merge_tool_path $tool } - } - } - - # Make file names - set filebase [file rootname $current_diff_path] - set fileext [file extension $current_diff_path] - set basename [lindex [file split $current_diff_path] end] - - set MERGED $current_diff_path - set BASE "./$MERGED.BASE$fileext" - set LOCAL "./$MERGED.LOCAL$fileext" - set REMOTE "./$MERGED.REMOTE$fileext" - set BACKUP "./$MERGED.BACKUP$fileext" - - set base_stage $merge_stages(1) - - # Build the command line - switch -- $tool { - araxis { - if {$base_stage ne {}} { - set cmdline [list "$merge_tool_path" -wait -merge -3 -a1 \ - -title1:"'$MERGED (Base)'" -title2:"'$MERGED (Local)'" \ - -title3:"'$MERGED (Remote)'" \ - "$BASE" "$LOCAL" "$REMOTE" "$MERGED"] - } else { - set cmdline [list "$merge_tool_path" -wait -2 \ - -title1:"'$MERGED (Local)'" -title2:"'$MERGED (Remote)'" \ - "$LOCAL" "$REMOTE" "$MERGED"] - } - } - bc3 { - if {$base_stage ne {}} { - set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" "-mergeoutput=$MERGED"] - } else { - set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "-mergeoutput=$MERGED"] - } - } - ecmerge { - if {$base_stage ne {}} { - set cmdline [list "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"] - } else { - set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" --default --mode=merge2 --to="$MERGED"] - } - } - emerge { - if {$base_stage ne {}} { - set cmdline [list "$merge_tool_path" -f emerge-files-with-ancestor-command \ - "$LOCAL" "$REMOTE" "$BASE" "$basename"] - } else { - set cmdline [list "$merge_tool_path" -f emerge-files-command \ - "$LOCAL" "$REMOTE" "$basename"] - } - } - gvimdiff { - set cmdline [list "$merge_tool_path" -f "$LOCAL" "$MERGED" "$REMOTE"] - } - kdiff3 { - if {$base_stage ne {}} { - set cmdline [list "$merge_tool_path" --auto --L1 "$MERGED (Base)" \ - --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE"] - } else { - set cmdline [list "$merge_tool_path" --auto --L1 "$MERGED (Local)" \ - --L2 "$MERGED (Remote)" -o "$MERGED" "$LOCAL" "$REMOTE"] - } - } - meld { - set cmdline [list "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"] - } - opendiff { - if {$base_stage ne {}} { - set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED"] - } else { - set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -merge "$MERGED"] - } - } - p4merge { - set cmdline [list "$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"] - } - tkdiff { - if {$base_stage ne {}} { - set cmdline [list "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"] - } else { - set cmdline [list "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"] - } - } - vimdiff { - error_popup [mc "Not a GUI merge tool: '%s'" $tool] - return - } - winmerge { - if {$base_stage ne {}} { - # This tool does not support 3-way merges. - # Use the 'conflict file' resolution feature instead. - set cmdline [list "$merge_tool_path" -e -ub "$MERGED"] - } else { - set cmdline [list "$merge_tool_path" -e -ub -wl \ - -dl "Theirs File" -dr "Mine File" "$REMOTE" "$LOCAL" "$MERGED"] - } - } - xxdiff { - if {$base_stage ne {}} { - set cmdline [list "$merge_tool_path" -X --show-merged-pane \ - -R {Accel.SaveAsMerged: "Ctrl-S"} \ - -R {Accel.Search: "Ctrl+F"} \ - -R {Accel.SearchForward: "Ctrl-G"} \ - --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"] - } else { - set cmdline [list "$merge_tool_path" -X --show-merged-pane \ - -R {Accel.SaveAsMerged: "Ctrl-S"} \ - -R {Accel.Search: "Ctrl+F"} \ - -R {Accel.SearchForward: "Ctrl-G"} \ - --merged-file "$MERGED" "$LOCAL" "$REMOTE"] - } - } - default { - error_popup [mc "Unsupported merge tool '%s'" $tool] - return - } - } - - merge_tool_start $cmdline $MERGED $BACKUP [list $BASE $LOCAL $REMOTE] -} - -proc delete_temp_files {files} { - foreach fname $files { - file delete $fname - } -} - -proc merge_tool_get_stages {target stages} { - global merge_stages - - set i 1 - foreach fname $stages { - if {$merge_stages($i) eq {}} { - file delete $fname - catch { close [open $fname w] } - } else { - # A hack to support autocrlf properly - git checkout-index -f --stage=$i -- $target - file rename -force -- $target $fname - } - incr i - } -} - -proc merge_tool_start {cmdline target backup stages} { - global merge_stages mtool_target mtool_tmpfiles mtool_fd mtool_mtime - - if {[info exists mtool_fd]} { - if {[ask_popup [mc "Merge tool is already running, terminate it?"]] eq {yes}} { - catch { kill_file_process $mtool_fd } - catch { close $mtool_fd } - unset mtool_fd - - set old_backup [lindex $mtool_tmpfiles end] - file rename -force -- $old_backup $mtool_target - delete_temp_files $mtool_tmpfiles - } else { - return - } - } - - # Save the original file - file rename -force -- $target $backup - - # Get the blobs; it destroys $target - if {[catch {merge_tool_get_stages $target $stages} err]} { - file rename -force -- $backup $target - delete_temp_files $stages - error_popup [mc "Error retrieving versions:\n%s" $err] - return - } - - # Restore the conflict file - file copy -force -- $backup $target - - # Initialize global state - set mtool_target $target - set mtool_mtime [file mtime $target] - set mtool_tmpfiles $stages - - lappend mtool_tmpfiles $backup - - # Force redirection to avoid interpreting output on stderr - # as an error, and launch the tool - lappend cmdline {2>@1} - - if {[catch { set mtool_fd [_open_stdout_stderr $cmdline] } err]} { - delete_temp_files $mtool_tmpfiles - error_popup [mc "Could not start the merge tool:\n\n%s" $err] - return - } - - ui_status [mc "Running merge tool..."] - - fconfigure $mtool_fd -blocking 0 -translation binary -encoding binary - fileevent $mtool_fd readable [list read_mtool_output $mtool_fd] -} - -proc read_mtool_output {fd} { - global mtool_fd mtool_tmpfiles - - read $fd - if {[eof $fd]} { - unset mtool_fd - - fconfigure $fd -blocking 1 - merge_tool_finish $fd - } -} - -proc merge_tool_finish {fd} { - global mtool_tmpfiles mtool_target mtool_mtime - - set backup [lindex $mtool_tmpfiles end] - set failed 0 - - # Check the return code - if {[catch {close $fd} err]} { - set failed 1 - if {$err ne {child process exited abnormally}} { - error_popup [strcat [mc "Merge tool failed."] "\n\n$err"] - } - } - - # Finish - if {$failed} { - file rename -force -- $backup $mtool_target - delete_temp_files $mtool_tmpfiles - ui_status [mc "Merge tool failed."] - } else { - if {[is_config_true mergetool.keepbackup]} { - file rename -force -- $backup "$mtool_target.orig" - } - - delete_temp_files $mtool_tmpfiles - - reshow_diff - } -} diff --git a/third_party/git/git-gui/lib/option.tcl b/third_party/git/git-gui/lib/option.tcl deleted file mode 100644 index e43971bfa3e0..000000000000 --- a/third_party/git/git-gui/lib/option.tcl +++ /dev/null @@ -1,349 +0,0 @@ -# git-gui options editor -# Copyright (C) 2006, 2007 Shawn Pearce - -proc config_check_encodings {} { - global repo_config_new global_config_new - - set enc $global_config_new(gui.encoding) - if {$enc eq {}} { - set global_config_new(gui.encoding) [encoding system] - } elseif {[tcl_encoding $enc] eq {}} { - error_popup [mc "Invalid global encoding '%s'" $enc] - return 0 - } - - set enc $repo_config_new(gui.encoding) - if {$enc eq {}} { - set repo_config_new(gui.encoding) [encoding system] - } elseif {[tcl_encoding $enc] eq {}} { - error_popup [mc "Invalid repo encoding '%s'" $enc] - return 0 - } - - return 1 -} - -proc save_config {} { - global default_config font_descs - global repo_config global_config system_config - global repo_config_new global_config_new - global ui_comm_spell - - foreach option $font_descs { - set name [lindex $option 0] - set font [lindex $option 1] - font configure $font \ - -family $global_config_new(gui.$font^^family) \ - -size $global_config_new(gui.$font^^size) - font configure ${font}bold \ - -family $global_config_new(gui.$font^^family) \ - -size $global_config_new(gui.$font^^size) - font configure ${font}italic \ - -family $global_config_new(gui.$font^^family) \ - -size $global_config_new(gui.$font^^size) - set global_config_new(gui.$name) [font configure $font] - unset global_config_new(gui.$font^^family) - unset global_config_new(gui.$font^^size) - } - - foreach name [array names default_config] { - set value $global_config_new($name) - if {$value ne $global_config($name)} { - if {$value eq $system_config($name)} { - catch {git config --global --unset $name} - } else { - regsub -all "\[{}\]" $value {"} value - git config --global $name $value - } - set global_config($name) $value - if {$value eq $repo_config($name)} { - catch {git config --unset $name} - set repo_config($name) $value - } - } - } - - foreach name [array names default_config] { - set value $repo_config_new($name) - if {$value ne $repo_config($name)} { - if {$value eq $global_config($name)} { - catch {git config --unset $name} - } else { - regsub -all "\[{}\]" $value {"} value - git config $name $value - } - set repo_config($name) $value - } - } - - if {[info exists repo_config(gui.spellingdictionary)]} { - set value $repo_config(gui.spellingdictionary) - if {$value eq {none}} { - if {[info exists ui_comm_spell]} { - $ui_comm_spell stop - } - } elseif {[info exists ui_comm_spell]} { - $ui_comm_spell lang $value - } - } -} - -proc do_options {} { - global repo_config global_config font_descs - global repo_config_new global_config_new - global ui_comm_spell use_ttk NS - - array unset repo_config_new - array unset global_config_new - foreach name [array names repo_config] { - set repo_config_new($name) $repo_config($name) - } - load_config 1 - foreach name [array names repo_config] { - switch -- $name { - gui.diffcontext {continue} - } - set repo_config_new($name) $repo_config($name) - } - foreach name [array names global_config] { - set global_config_new($name) $global_config($name) - } - - set w .options_editor - Dialog $w - wm withdraw $w - wm transient $w [winfo parent $w] - wm geometry $w "+[winfo rootx .]+[winfo rooty .]" - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.restore -text [mc "Restore Defaults"] \ - -default normal \ - -command do_restore_defaults - pack $w.buttons.restore -side left - ${NS}::button $w.buttons.save -text [mc Save] \ - -default active \ - -command [list do_save_config $w] - pack $w.buttons.save -side right - ${NS}::button $w.buttons.cancel -text [mc "Cancel"] \ - -default normal \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::labelframe $w.repo -text [mc "%s Repository" [reponame]] - ${NS}::labelframe $w.global -text [mc "Global (All Repositories)"] - pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5 - pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5 - - set optid 0 - foreach option { - {t user.name {mc "User Name"}} - {t user.email {mc "Email Address"}} - - {b merge.summary {mc "Summarize Merge Commits"}} - {i-1..5 merge.verbosity {mc "Merge Verbosity"}} - {b merge.diffstat {mc "Show Diffstat After Merge"}} - {t merge.tool {mc "Use Merge Tool"}} - - {b gui.trustmtime {mc "Trust File Modification Timestamps"}} - {b gui.pruneduringfetch {mc "Prune Tracking Branches During Fetch"}} - {b gui.matchtrackingbranch {mc "Match Tracking Branches"}} - {b gui.textconv {mc "Use Textconv For Diffs and Blames"}} - {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}} - {i-0..100 gui.maxrecentrepo {mc "Maximum Length of Recent Repositories List"}} - {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}} - {i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}} - {i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}} - {t gui.diffopts {mc "Additional Diff Parameters"}} - {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}} - {t gui.newbranchtemplate {mc "New Branch Name Template"}} - {c gui.encoding {mc "Default File Contents Encoding"}} - {b gui.warndetachedcommit {mc "Warn before committing to a detached head"}} - {s gui.stageuntracked {mc "Staging of untracked files"} {list "yes" "no" "ask"}} - {b gui.displayuntracked {mc "Show untracked files"}} - {i-1..99 gui.tabsize {mc "Tab spacing"}} - } { - set type [lindex $option 0] - set name [lindex $option 1] - set text [eval [lindex $option 2]] - incr optid - foreach f {repo global} { - switch -glob -- $type { - b { - ${NS}::checkbutton $w.$f.$optid -text $text \ - -variable ${f}_config_new($name) \ - -onvalue true \ - -offvalue false - pack $w.$f.$optid -side top -anchor w - } - i-* { - regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max - ${NS}::frame $w.$f.$optid - ${NS}::label $w.$f.$optid.l -text [mc "%s:" $text] - pack $w.$f.$optid.l -side left -anchor w -fill x - tspinbox $w.$f.$optid.v \ - -textvariable ${f}_config_new($name) \ - -from $min \ - -to $max \ - -increment 1 \ - -width [expr {1 + [string length $max]}] - bind $w.$f.$optid.v <FocusIn> {%W selection range 0 end} - pack $w.$f.$optid.v -side right -anchor e -padx 5 - pack $w.$f.$optid -side top -anchor w -fill x - } - c - - t { - ${NS}::frame $w.$f.$optid - ${NS}::label $w.$f.$optid.l -text [mc "%s:" $text] - ${NS}::entry $w.$f.$optid.v \ - -width 20 \ - -textvariable ${f}_config_new($name) - pack $w.$f.$optid.l -side left -anchor w - pack $w.$f.$optid.v -side left -anchor w \ - -fill x -expand 1 \ - -padx 5 - if {$type eq {c}} { - menu $w.$f.$optid.m - build_encoding_menu $w.$f.$optid.m \ - [list set ${f}_config_new($name)] 1 - ${NS}::button $w.$f.$optid.b \ - -text [mc "Change"] \ - -command [list popup_btn_menu \ - $w.$f.$optid.m $w.$f.$optid.b] - pack $w.$f.$optid.b -side left -anchor w - } - pack $w.$f.$optid -side top -anchor w -fill x - } - s { - set opts [eval [lindex $option 3]] - ${NS}::frame $w.$f.$optid - ${NS}::label $w.$f.$optid.l -text [mc "%s:" $text] - if {$use_ttk} { - ttk::combobox $w.$f.$optid.v \ - -textvariable ${f}_config_new($name) \ - -values $opts -state readonly - } else { - eval tk_optionMenu $w.$f.$optid.v \ - ${f}_config_new($name) \ - $opts - } - pack $w.$f.$optid.l -side left -anchor w -fill x - pack $w.$f.$optid.v -side right -anchor e -padx 5 - pack $w.$f.$optid -side top -anchor w -fill x - } - } - } - } - - set all_dicts [linsert \ - [spellcheck::available_langs] \ - 0 \ - none] - incr optid - foreach f {repo global} { - if {![info exists ${f}_config_new(gui.spellingdictionary)]} { - if {[info exists ui_comm_spell]} { - set value [$ui_comm_spell lang] - } else { - set value none - } - set ${f}_config_new(gui.spellingdictionary) $value - } - - ${NS}::frame $w.$f.$optid - ${NS}::label $w.$f.$optid.l -text [mc "Spelling Dictionary:"] - if {$use_ttk} { - ttk::combobox $w.$f.$optid.v \ - -textvariable ${f}_config_new(gui.spellingdictionary) \ - -values $all_dicts -state readonly - } else { - eval tk_optionMenu $w.$f.$optid.v \ - ${f}_config_new(gui.spellingdictionary) \ - $all_dicts - } - pack $w.$f.$optid.l -side left -anchor w -fill x - pack $w.$f.$optid.v -side right -anchor e -padx 5 - pack $w.$f.$optid -side top -anchor w -fill x - } - unset all_dicts - - set all_fonts [lsort [font families]] - foreach option $font_descs { - set name [lindex $option 0] - set font [lindex $option 1] - set text [eval [lindex $option 2]] - - set global_config_new(gui.$font^^family) \ - [font configure $font -family] - set global_config_new(gui.$font^^size) \ - [font configure $font -size] - - ${NS}::frame $w.global.$name - ${NS}::label $w.global.$name.l -text [mc "%s:" $text] - ${NS}::button $w.global.$name.b \ - -text [mc "Change Font"] \ - -command [list \ - tchoosefont \ - $w \ - [mc "Choose %s" $text] \ - global_config_new(gui.$font^^family) \ - global_config_new(gui.$font^^size) \ - ] - ${NS}::label $w.global.$name.f -textvariable global_config_new(gui.$font^^family) - ${NS}::label $w.global.$name.s -textvariable global_config_new(gui.$font^^size) - ${NS}::label $w.global.$name.pt -text [mc "pt."] - pack $w.global.$name.l -side left -anchor w - pack $w.global.$name.b -side right -anchor e - pack $w.global.$name.pt -side right -anchor w - pack $w.global.$name.s -side right -anchor w - pack $w.global.$name.f -side right -anchor w - pack $w.global.$name -side top -anchor w -fill x - } - - bind $w <Visibility> "grab $w; focus $w.buttons.save" - bind $w <Key-Escape> "destroy $w" - bind $w <Key-Return> [list do_save_config $w] - - if {[is_MacOSX]} { - set t [mc "Preferences"] - } else { - set t [mc "Options"] - } - wm title $w "[appname] ([reponame]): $t" - wm deiconify $w - tkwait window $w -} - -proc do_restore_defaults {} { - global font_descs default_config repo_config system_config - global repo_config_new global_config_new - - foreach name [array names default_config] { - set repo_config_new($name) $system_config($name) - set global_config_new($name) $system_config($name) - } - - foreach option $font_descs { - set name [lindex $option 0] - set repo_config(gui.$name) $system_config(gui.$name) - } - apply_config - - foreach option $font_descs { - set name [lindex $option 0] - set font [lindex $option 1] - set global_config_new(gui.$font^^family) \ - [font configure $font -family] - set global_config_new(gui.$font^^size) \ - [font configure $font -size] - } -} - -proc do_save_config {w} { - if {![config_check_encodings]} return - if {[catch {save_config} err]} { - error_popup [strcat [mc "Failed to completely save options:"] "\n\n$err"] - } - reshow_diff - destroy $w -} diff --git a/third_party/git/git-gui/lib/remote.tcl b/third_party/git/git-gui/lib/remote.tcl deleted file mode 100644 index ef77ed7399c5..000000000000 --- a/third_party/git/git-gui/lib/remote.tcl +++ /dev/null @@ -1,333 +0,0 @@ -# git-gui remote management -# Copyright (C) 2006, 2007 Shawn Pearce - -set some_heads_tracking 0; # assume not - -proc is_tracking_branch {name} { - global tracking_branches - foreach spec $tracking_branches { - set t [lindex $spec 0] - if {$t eq $name || [string match $t $name]} { - return 1 - } - } - return 0 -} - -proc all_tracking_branches {} { - global tracking_branches - - set all [list] - set pat [list] - set cmd [list] - - foreach spec $tracking_branches { - set dst [lindex $spec 0] - if {[string range $dst end-1 end] eq {/*}} { - lappend pat $spec - lappend cmd [string range $dst 0 end-2] - } else { - lappend all $spec - } - } - - if {$pat ne {}} { - set fd [eval git_read for-each-ref --format=%(refname) $cmd] - while {[gets $fd n] > 0} { - foreach spec $pat { - set dst [string range [lindex $spec 0] 0 end-2] - set len [string length $dst] - if {[string equal -length $len $dst $n]} { - set src [string range [lindex $spec 2] 0 end-2] - set spec [list \ - $n \ - [lindex $spec 1] \ - $src[string range $n $len end] \ - ] - lappend all $spec - } - } - } - close $fd - } - - return [lsort -index 0 -unique $all] -} - -proc load_all_remotes {} { - global repo_config - global all_remotes tracking_branches some_heads_tracking - global remote_url - - set some_heads_tracking 0 - set all_remotes [list] - set trck [list] - - set rh_str refs/heads/ - set rh_len [string length $rh_str] - set rm_dir [gitdir remotes] - if {[file isdirectory $rm_dir]} { - set all_remotes [glob \ - -types f \ - -tails \ - -nocomplain \ - -directory $rm_dir *] - - foreach name $all_remotes { - catch { - set fd [open [file join $rm_dir $name] r] - while {[gets $fd line] >= 0} { - if {[regexp {^URL:[ ]*(.+)$} $line line url]} { - set remote_url($name) $url - continue - } - if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \ - $line line src dst]} continue - if {[string index $src 0] eq {+}} { - set src [string range $src 1 end] - } - if {![string equal -length 5 refs/ $src]} { - set src $rh_str$src - } - if {![string equal -length 5 refs/ $dst]} { - set dst $rh_str$dst - } - if {[string equal -length $rh_len $rh_str $dst]} { - set some_heads_tracking 1 - } - lappend trck [list $dst $name $src] - } - close $fd - } - } - } - - foreach line [array names repo_config remote.*.url] { - if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue - lappend all_remotes $name - set remote_url($name) $repo_config(remote.$name.url) - - if {[catch {set fl $repo_config(remote.$name.fetch)}]} { - set fl {} - } - foreach line $fl { - if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue - if {[string index $src 0] eq {+}} { - set src [string range $src 1 end] - } - if {![string equal -length 5 refs/ $src]} { - set src $rh_str$src - } - if {![string equal -length 5 refs/ $dst]} { - set dst $rh_str$dst - } - if {[string equal -length $rh_len $rh_str $dst]} { - set some_heads_tracking 1 - } - lappend trck [list $dst $name $src] - } - } - - set tracking_branches [lsort -index 0 -unique $trck] - set all_remotes [lsort -unique $all_remotes] -} - -proc add_fetch_entry {r} { - global repo_config - set remote_m .mbar.remote - set fetch_m $remote_m.fetch - set prune_m $remote_m.prune - set remove_m $remote_m.remove - set enable 0 - if {![catch {set a $repo_config(remote.$r.url)}]} { - if {![catch {set a $repo_config(remote.$r.fetch)}]} { - set enable 1 - } - } else { - catch { - set fd [open [gitdir remotes $r] r] - while {[gets $fd n] >= 0} { - if {[regexp {^Pull:[ \t]*([^:]+):} $n]} { - set enable 1 - break - } - } - close $fd - } - } - - if {$enable} { - make_sure_remote_submenues_exist $remote_m - - $fetch_m add command \ - -label $r \ - -command [list fetch_from $r] - $prune_m add command \ - -label $r \ - -command [list prune_from $r] - $remove_m add command \ - -label $r \ - -command [list remove_remote $r] - } -} - -proc add_push_entry {r} { - global repo_config - set remote_m .mbar.remote - set push_m $remote_m.push - set enable 0 - if {![catch {set a $repo_config(remote.$r.url)}]} { - if {![catch {set a $repo_config(remote.$r.push)}]} { - set enable 1 - } - } else { - catch { - set fd [open [gitdir remotes $r] r] - while {[gets $fd n] >= 0} { - if {[regexp {^Push:[ \t]*([^:]+):} $n]} { - set enable 1 - break - } - } - close $fd - } - } - - if {$enable} { - if {![winfo exists $push_m]} { - menu $push_m - $remote_m insert 0 cascade \ - -label [mc "Push to"] \ - -menu $push_m - } - - $push_m add command \ - -label $r \ - -command [list push_to $r] - } -} - -proc make_sure_remote_submenues_exist {remote_m} { - set fetch_m $remote_m.fetch - set prune_m $remote_m.prune - set remove_m $remote_m.remove - - if {![winfo exists $fetch_m]} { - menu $remove_m - $remote_m insert 0 cascade \ - -label [mc "Remove Remote"] \ - -menu $remove_m - - menu $prune_m - $remote_m insert 0 cascade \ - -label [mc "Prune from"] \ - -menu $prune_m - - menu $fetch_m - $remote_m insert 0 cascade \ - -label [mc "Fetch from"] \ - -menu $fetch_m - } -} - -proc update_all_remotes_menu_entry {} { - global all_remotes - - if {[git-version < 1.6.6]} { return } - - set have_remote 0 - foreach r $all_remotes { - incr have_remote - } - - set remote_m .mbar.remote - set fetch_m $remote_m.fetch - set prune_m $remote_m.prune - if {$have_remote > 1} { - make_sure_remote_submenues_exist $remote_m - if {[$fetch_m type end] eq "command" \ - && [$fetch_m entrycget end -label] ne [mc "All"]} { - - $fetch_m insert end separator - $fetch_m insert end command \ - -label [mc "All"] \ - -command fetch_from_all - - $prune_m insert end separator - $prune_m insert end command \ - -label [mc "All"] \ - -command prune_from_all - } - } else { - if {[winfo exists $fetch_m]} { - if {[$fetch_m type end] eq "command" \ - && [$fetch_m entrycget end -label] eq [mc "All"]} { - - delete_from_menu $fetch_m end - delete_from_menu $fetch_m end - - delete_from_menu $prune_m end - delete_from_menu $prune_m end - } - } - } -} - -proc populate_remotes_menu {} { - global all_remotes - - foreach r $all_remotes { - add_fetch_entry $r - add_push_entry $r - } - - update_all_remotes_menu_entry -} - -proc add_single_remote {name location} { - global all_remotes repo_config - lappend all_remotes $name - - git remote add $name $location - - # XXX: Better re-read the config so that we will never get out - # of sync with git remote implementation? - set repo_config(remote.$name.url) $location - set repo_config(remote.$name.fetch) "+refs/heads/*:refs/remotes/$name/*" - - add_fetch_entry $name - add_push_entry $name - - update_all_remotes_menu_entry -} - -proc delete_from_menu {menu name} { - if {[winfo exists $menu]} { - $menu delete $name - } -} - -proc remove_remote {name} { - global all_remotes repo_config - - git remote rm $name - - catch { - # Missing values are ok - unset repo_config(remote.$name.url) - unset repo_config(remote.$name.fetch) - unset repo_config(remote.$name.push) - } - - set i [lsearch -exact $all_remotes $name] - set all_remotes [lreplace $all_remotes $i $i] - - set remote_m .mbar.remote - delete_from_menu $remote_m.fetch $name - delete_from_menu $remote_m.prune $name - delete_from_menu $remote_m.remove $name - # Not all remotes are in the push menu - catch { delete_from_menu $remote_m.push $name } - - update_all_remotes_menu_entry -} diff --git a/third_party/git/git-gui/lib/remote_add.tcl b/third_party/git/git-gui/lib/remote_add.tcl deleted file mode 100644 index 480a6b30d0a9..000000000000 --- a/third_party/git/git-gui/lib/remote_add.tcl +++ /dev/null @@ -1,190 +0,0 @@ -# git-gui remote adding support -# Copyright (C) 2008 Petr Baudis - -class remote_add { - -field w ; # widget path -field w_name ; # new remote name widget -field w_loc ; # new remote location widget - -field name {}; # name of the remote the user has chosen -field location {}; # location of the remote the user has chosen - -field opt_action fetch; # action to do after registering the remote locally - -constructor dialog {} { - global repo_config use_ttk NS - - make_dialog top w - wm withdraw $top - wm title $top [mc "%s (%s): Add Remote" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - } - - ${NS}::label $w.header -text [mc "Add New Remote"] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.create -text [mc Add] \ - -default active \ - -command [cb _add] - pack $w.buttons.create -side right - ${NS}::button $w.buttons.cancel -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::labelframe $w.desc -text [mc "Remote Details"] - - ${NS}::label $w.desc.name_l -text [mc "Name:"] - set w_name $w.desc.name_t - ${NS}::entry $w_name \ - -width 40 \ - -textvariable @name \ - -validate key \ - -validatecommand [cb _validate_name %d %S] - grid $w.desc.name_l $w_name -sticky we -padx {0 5} - - ${NS}::label $w.desc.loc_l -text [mc "Location:"] - set w_loc $w.desc.loc_t - ${NS}::entry $w_loc \ - -width 40 \ - -textvariable @location - grid $w.desc.loc_l $w_loc -sticky we -padx {0 5} - - grid columnconfigure $w.desc 1 -weight 1 - pack $w.desc -anchor nw -fill x -pady 5 -padx 5 - - ${NS}::labelframe $w.action -text [mc "Further Action"] - - ${NS}::radiobutton $w.action.fetch \ - -text [mc "Fetch Immediately"] \ - -value fetch \ - -variable @opt_action - pack $w.action.fetch -anchor nw - - ${NS}::radiobutton $w.action.push \ - -text [mc "Initialize Remote Repository and Push"] \ - -value push \ - -variable @opt_action - pack $w.action.push -anchor nw - - ${NS}::radiobutton $w.action.none \ - -text [mc "Do Nothing Else Now"] \ - -value none \ - -variable @opt_action - pack $w.action.none -anchor nw - - grid columnconfigure $w.action 1 -weight 1 - pack $w.action -anchor nw -fill x -pady 5 -padx 5 - - bind $w <Visibility> [cb _visible] - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [cb _add]\;break - wm deiconify $top - tkwait window $w -} - -method _add {} { - global repo_config env - global M1B - - if {$name eq {}} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Please supply a remote name."] - focus $w_name - return - } - - # XXX: We abuse check-ref-format here, but - # that should be ok. - if {[catch {git check-ref-format "remotes/$name"}]} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "'%s' is not an acceptable remote name." $name] - focus $w_name - return - } - - if {[catch {add_single_remote $name $location}]} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Failed to add remote '%s' of location '%s'." $name $location] - focus $w_name - return - } - - switch -- $opt_action { - fetch { - set c [console::new \ - [mc "fetch %s" $name] \ - [mc "Fetching the %s" $name]] - console::exec $c [list git fetch $name] - } - push { - set cmds [list] - - # Parse the location - if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path] - || [regexp {([^:][^:]+):(.+)} $location xx host path]} { - set ssh ssh - if {[info exists env(GIT_SSH)]} { - set ssh $env(GIT_SSH) - } - lappend cmds [list exec $ssh $host mkdir -p $location && git --git-dir=$path init --bare] - } elseif { ! [regexp {://} $location xx] } { - lappend cmds [list exec mkdir -p $location] - lappend cmds [list exec git --git-dir=$location init --bare] - } else { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Do not know how to initialize repository at location '%s'." $location] - destroy $w - return - } - - set c [console::new \ - [mc "push %s" $name] \ - [mc "Setting up the %s (at %s)" $name $location]] - - lappend cmds [list exec git push -v --all $name] - console::chain $c $cmds - } - none { - } - } - - destroy $w -} - -method _validate_name {d S} { - if {$d == 1} { - if {[regexp {[~^:?*\[\0- ]} $S]} { - return 0 - } - } - return 1 -} - -method _visible {} { - grab $w - $w_name icursor end - focus $w_name -} - -} diff --git a/third_party/git/git-gui/lib/remote_branch_delete.tcl b/third_party/git/git-gui/lib/remote_branch_delete.tcl deleted file mode 100644 index 5ba9fcadd17f..000000000000 --- a/third_party/git/git-gui/lib/remote_branch_delete.tcl +++ /dev/null @@ -1,359 +0,0 @@ -# git-gui remote branch deleting support -# Copyright (C) 2007 Shawn Pearce - -class remote_branch_delete { - -field w -field head_m - -field urltype {url} -field remote {} -field url {} - -field checktype {head} -field check_head {} - -field status {} -field idle_id {} -field full_list {} -field head_list {} -field active_ls {} -field head_cache -field full_cache -field cached - -constructor dialog {} { - global all_remotes M1B use_ttk NS - - make_dialog top w - wm title $top [mc "%s (%s): Delete Branch Remotely" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - } - - ${NS}::label $w.header -text [mc "Delete Branch Remotely"] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.delete -text [mc Delete] \ - -default active \ - -command [cb _delete] - pack $w.buttons.delete -side right - ${NS}::button $w.buttons.cancel -text [mc "Cancel"] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::labelframe $w.dest -text [mc "From Repository"] - if {$all_remotes ne {}} { - ${NS}::radiobutton $w.dest.remote_r \ - -text [mc "Remote:"] \ - -value remote \ - -variable @urltype - if {$use_ttk} { - ttk::combobox $w.dest.remote_m -textvariable @remote \ - -values $all_remotes -state readonly - } else { - eval tk_optionMenu $w.dest.remote_m @remote $all_remotes - } - grid $w.dest.remote_r $w.dest.remote_m -sticky w - if {[lsearch -sorted -exact $all_remotes origin] != -1} { - set remote origin - } else { - set remote [lindex $all_remotes 0] - } - set urltype remote - trace add variable @remote write [cb _write_remote] - } else { - set urltype url - } - ${NS}::radiobutton $w.dest.url_r \ - -text [mc "Arbitrary Location:"] \ - -value url \ - -variable @urltype - ${NS}::entry $w.dest.url_t \ - -width 50 \ - -textvariable @url \ - -validate key \ - -validatecommand { - if {%d == 1 && [regexp {\s} %S]} {return 0} - return 1 - } - trace add variable @url write [cb _write_url] - grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5} - grid columnconfigure $w.dest 1 -weight 1 - pack $w.dest -anchor nw -fill x -pady 5 -padx 5 - - ${NS}::labelframe $w.heads -text [mc "Branches"] - slistbox $w.heads.l \ - -height 10 \ - -width 70 \ - -listvariable @head_list \ - -selectmode extended - - ${NS}::frame $w.heads.footer - ${NS}::label $w.heads.footer.status \ - -textvariable @status \ - -anchor w \ - -justify left - ${NS}::button $w.heads.footer.rescan \ - -text [mc "Rescan"] \ - -command [cb _rescan] - pack $w.heads.footer.status -side left -fill x - pack $w.heads.footer.rescan -side right - - pack $w.heads.footer -side bottom -fill x - pack $w.heads.l -side left -fill both -expand 1 - pack $w.heads -fill both -expand 1 -pady 5 -padx 5 - - ${NS}::labelframe $w.validate -text [mc "Delete Only If"] - ${NS}::radiobutton $w.validate.head_r \ - -text [mc "Merged Into:"] \ - -value head \ - -variable @checktype - set head_m [tk_optionMenu $w.validate.head_m @check_head {}] - trace add variable @head_list write [cb _write_head_list] - trace add variable @check_head write [cb _write_check_head] - grid $w.validate.head_r $w.validate.head_m -sticky w - ${NS}::radiobutton $w.validate.always_r \ - -text [mc "Always (Do not perform merge checks)"] \ - -value always \ - -variable @checktype - grid $w.validate.always_r -columnspan 2 -sticky w - grid columnconfigure $w.validate 1 -weight 1 - pack $w.validate -anchor nw -fill x -pady 5 -padx 5 - - trace add variable @urltype write [cb _write_urltype] - _rescan $this - - bind $w <Key-F5> [cb _rescan] - bind $w <$M1B-Key-r> [cb _rescan] - bind $w <$M1B-Key-R> [cb _rescan] - bind $w <Key-Return> [cb _delete] - bind $w <Key-Escape> [list destroy $w] - return $w -} - -method _delete {} { - switch $urltype { - remote {set uri $remote} - url {set uri $url} - } - - set cache $urltype:$uri - set crev {} - if {$checktype eq {head}} { - if {$check_head eq {}} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "A branch is required for 'Merged Into'."] - return - } - set crev $full_cache("$cache\nrefs/heads/$check_head") - } - - set not_merged [list] - set need_fetch 0 - set have_selection 0 - set push_cmd [list git push] - lappend push_cmd -v - lappend push_cmd $uri - - foreach i [$w.heads.l curselection] { - set ref [lindex $full_list $i] - if {$crev ne {}} { - set obj $full_cache("$cache\n$ref") - if {[catch {set m [git merge-base $obj $crev]}]} { - set need_fetch 1 - set m {} - } - if {$obj ne $m} { - lappend not_merged [lindex $head_list $i] - continue - } - } - - lappend push_cmd :$ref - set have_selection 1 - } - - if {$not_merged ne {}} { - set msg [mc "The following branches are not completely merged into %s: - - - %s" $check_head [join $not_merged "\n - "]] - - if {$need_fetch} { - append msg "\n\n" [mc "One or more of the merge tests failed because you have not fetched the necessary commits. Try fetching from %s first." $uri] - } - - tk_messageBox \ - -icon info \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message $msg - if {!$have_selection} return - } - - if {!$have_selection} { - tk_messageBox \ - -icon error \ - -type ok \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Please select one or more branches to delete."] - return - } - - if {$checktype ne {head}} { - if {[tk_messageBox \ - -icon warning \ - -type yesno \ - -title [wm title $w] \ - -parent $w \ - -message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} { - return - } - } - - destroy $w - - set cons [console::new \ - "push $uri" \ - [mc "Deleting branches from %s" $uri]] - console::exec $cons $push_cmd -} - -method _rescan {{force 1}} { - switch $urltype { - remote {set uri $remote} - url {set uri $url} - } - - if {$force} { - unset -nocomplain cached($urltype:$uri) - } - - if {$idle_id ne {}} { - after cancel $idle_id - set idle_id {} - } - - _load $this $urltype:$uri $uri -} - -method _write_remote {args} { set urltype remote } -method _write_url {args} { set urltype url } -method _write_check_head {args} { set checktype head } - -method _write_head_list {args} { - global current_branch _last_merged_branch - - $head_m delete 0 end - foreach abr $head_list { - $head_m insert end radiobutton \ - -label $abr \ - -value $abr \ - -variable @check_head - } - if {[lsearch -exact -sorted $head_list $check_head] < 0} { - if {[lsearch -exact -sorted $head_list $current_branch] < 0} { - set check_head {} - } else { - set check_head $current_branch - } - } - set lmb [lsearch -exact -sorted $head_list $_last_merged_branch] - if {$lmb >= 0} { - $w.heads.l conf -state normal - $w.heads.l select set $lmb - $w.heads.l yview $lmb - $w.heads.l conf -state disabled - } -} - -method _write_urltype {args} { - if {$urltype eq {url}} { - if {$idle_id ne {}} { - after cancel $idle_id - } - _load $this none: {} - set idle_id [after 1000 [cb _rescan 0]] - } else { - _rescan $this 0 - } -} - -method _load {cache uri} { - if {$active_ls ne {}} { - catch {close $active_ls} - } - - if {$uri eq {}} { - $w.heads.l conf -state disabled - set head_list [list] - set full_list [list] - set status [mc "No repository selected."] - return - } - - if {[catch {set x $cached($cache)}]} { - set status [mc "Scanning %s..." $uri] - $w.heads.l conf -state disabled - set head_list [list] - set full_list [list] - set head_cache($cache) [list] - set full_cache($cache) [list] - set active_ls [git_read ls-remote $uri] - fconfigure $active_ls \ - -blocking 0 \ - -translation lf \ - -encoding utf-8 - fileevent $active_ls readable [cb _read $cache $active_ls] - } else { - set status {} - set full_list $full_cache($cache) - set head_list $head_cache($cache) - $w.heads.l conf -state normal - } -} - -method _read {cache fd} { - if {$fd ne $active_ls} { - catch {close $fd} - return - } - - while {[gets $fd line] >= 0} { - if {[string match {*^{}} $line]} continue - if {[regexp {^([0-9a-f]{40}) (.*)$} $line _junk obj ref]} { - if {[regsub ^refs/heads/ $ref {} abr]} { - lappend head_list $abr - lappend head_cache($cache) $abr - lappend full_list $ref - lappend full_cache($cache) $ref - set full_cache("$cache\n$ref") $obj - } - } - } - - if {[eof $fd]} { - if {[catch {close $fd} err]} { - set status $err - set head_list [list] - set full_list [list] - } else { - set status {} - set cached($cache) 1 - $w.heads.l conf -state normal - } - } -} ifdeleted { - catch {close $fd} -} - -} diff --git a/third_party/git/git-gui/lib/search.tcl b/third_party/git/git-gui/lib/search.tcl deleted file mode 100644 index ef1e55521d7c..000000000000 --- a/third_party/git/git-gui/lib/search.tcl +++ /dev/null @@ -1,300 +0,0 @@ -# incremental search panel -# based on code from gitk, Copyright (C) Paul Mackerras - -class searchbar { - -field w -field ctext - -field searchstring {} -field regexpsearch -field default_regexpsearch -field casesensitive -field default_casesensitive -field smartcase -field searchdirn -forwards - -field history -field history_index - -field smarktop -field smarkbot - -constructor new {i_w i_text args} { - global use_ttk NS - set w $i_w - set ctext $i_text - - set default_regexpsearch [is_config_true gui.search.regexp] - switch -- [get_config gui.search.case] { - no { - set default_casesensitive 0 - set smartcase 0 - } - smart { - set default_casesensitive 0 - set smartcase 1 - } - yes - - default { - set default_casesensitive 1 - set smartcase 0 - } - } - - set history [list] - - ${NS}::frame $w - ${NS}::label $w.l -text [mc Find:] - tentry $w.ent -textvariable ${__this}::searchstring -background lightgreen - ${NS}::button $w.bn -text [mc Next] -command [cb find_next] - ${NS}::button $w.bp -text [mc Prev] -command [cb find_prev] - ${NS}::checkbutton $w.re -text [mc RegExp] \ - -variable ${__this}::regexpsearch -command [cb _incrsearch] - ${NS}::checkbutton $w.cs -text [mc Case] \ - -variable ${__this}::casesensitive -command [cb _incrsearch] - pack $w.l -side left - pack $w.cs -side right - pack $w.re -side right - pack $w.bp -side right - pack $w.bn -side right - pack $w.ent -side left -expand 1 -fill x - - eval grid conf $w -sticky we $args - grid remove $w - - trace add variable searchstring write [cb _incrsearch_cb] - bind $w.ent <Return> [cb find_next] - bind $w.ent <Shift-Return> [cb find_prev] - bind $w.ent <Key-Up> [cb _prev_search] - bind $w.ent <Key-Down> [cb _next_search] - - bind $w <Destroy> [list delete_this $this] - return $this -} - -method show {} { - if {![visible $this]} { - grid $w - $w.ent delete 0 end - set regexpsearch $default_regexpsearch - set casesensitive $default_casesensitive - set history_index [llength $history] - } - focus -force $w.ent -} - -method hide {} { - if {[visible $this]} { - focus $ctext - grid remove $w - _save_search $this - } -} - -method visible {} { - return [winfo ismapped $w] -} - -method editor {} { - return $w.ent -} - -method _get_new_anchor {} { - # use start of selection if it is visible, - # or the bounds of the visible area - set top [$ctext index @0,0] - set bottom [$ctext index @0,[winfo height $ctext]] - set sel [$ctext tag ranges sel] - if {$sel ne {}} { - set spos [lindex $sel 0] - if {[lindex $spos 0] >= [lindex $top 0] && - [lindex $spos 0] <= [lindex $bottom 0]} { - return $spos - } - } - if {$searchdirn eq "-forwards"} { - return $top - } else { - return $bottom - } -} - -method _get_wrap_anchor {dir} { - if {$dir eq "-forwards"} { - return 1.0 - } else { - return end - } -} - -method _do_search {start {mlenvar {}} {dir {}} {endbound {}}} { - set cmd [list $ctext search] - if {$mlenvar ne {}} { - upvar $mlenvar mlen - lappend cmd -count mlen - } - if {$regexpsearch} { - lappend cmd -regexp - } - if {!$casesensitive} { - lappend cmd -nocase - } - if {$dir eq {}} { - set dir $searchdirn - } - lappend cmd $dir -- $searchstring - if {[catch { - if {$endbound ne {}} { - set here [eval $cmd [list $start] [list $endbound]] - } else { - set here [eval $cmd [list $start]] - if {$here eq {}} { - set here [eval $cmd [_get_wrap_anchor $this $dir]] - } - } - } err]} { set here {} } - return $here -} - -method _incrsearch_cb {name ix op} { - after idle [cb _incrsearch] -} - -method _incrsearch {} { - $ctext tag remove found 1.0 end - if {[catch {$ctext index anchor}]} { - $ctext mark set anchor [_get_new_anchor $this] - } - if {$searchstring ne {}} { - if {$smartcase && [regexp {[[:upper:]]} $searchstring]} { - set casesensitive 1 - } - set here [_do_search $this anchor mlen] - if {$here ne {}} { - $ctext see $here - $ctext tag remove sel 1.0 end - $ctext tag add sel $here "$here + $mlen c" - #$w.ent configure -background lightgreen - $w.ent state !pressed - _set_marks $this 1 - } else { - #$w.ent configure -background lightpink - $w.ent state pressed - } - } elseif {$smartcase} { - # clearing the field resets the smart case detection - set casesensitive 0 - } -} - -method _save_search {} { - if {$searchstring eq {}} { - return - } - if {[llength $history] > 0} { - foreach {s_regexp s_case s_expr} [lindex $history end] break - } else { - set s_regexp $regexpsearch - set s_case $casesensitive - set s_expr "" - } - if {$searchstring eq $s_expr} { - # update modes - set history [lreplace $history end end \ - [list $regexpsearch $casesensitive $searchstring]] - } else { - lappend history [list $regexpsearch $casesensitive $searchstring] - } - set history_index [llength $history] -} - -method _prev_search {} { - if {$history_index > 0} { - incr history_index -1 - foreach {s_regexp s_case s_expr} [lindex $history $history_index] break - $w.ent delete 0 end - $w.ent insert 0 $s_expr - set regexpsearch $s_regexp - set casesensitive $s_case - } -} - -method _next_search {} { - if {$history_index < [llength $history]} { - incr history_index - } - if {$history_index < [llength $history]} { - foreach {s_regexp s_case s_expr} [lindex $history $history_index] break - } else { - set s_regexp $default_regexpsearch - set s_case $default_casesensitive - set s_expr "" - } - $w.ent delete 0 end - $w.ent insert 0 $s_expr - set regexpsearch $s_regexp - set casesensitive $s_case -} - -method find_prev {} { - find_next $this -backwards -} - -method find_next {{dir -forwards}} { - focus $w.ent - $w.ent icursor end - set searchdirn $dir - $ctext mark unset anchor - if {$searchstring ne {}} { - _save_search $this - set start [_get_new_anchor $this] - if {$dir eq "-forwards"} { - set start "$start + 1c" - } - set match [_do_search $this $start mlen] - $ctext tag remove sel 1.0 end - if {$match ne {}} { - $ctext see $match - $ctext tag add sel $match "$match + $mlen c" - } - } -} - -method _mark_range {first last} { - set mend $first.0 - while {1} { - set match [_do_search $this $mend mlen -forwards $last.end] - if {$match eq {}} break - set mend "$match + $mlen c" - $ctext tag add found $match $mend - } -} - -method _set_marks {doall} { - set topline [lindex [split [$ctext index @0,0] .] 0] - set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0] - if {$doall || $botline < $smarktop || $topline > $smarkbot} { - # no overlap with previous - _mark_range $this $topline $botline - set smarktop $topline - set smarkbot $botline - } else { - if {$topline < $smarktop} { - _mark_range $this $topline [expr {$smarktop-1}] - set smarktop $topline - } - if {$botline > $smarkbot} { - _mark_range $this [expr {$smarkbot+1}] $botline - set smarkbot $botline - } - } -} - -method scrolled {} { - if {$searchstring ne {}} { - after idle [cb _set_marks 0] - } -} - -} diff --git a/third_party/git/git-gui/lib/shortcut.tcl b/third_party/git/git-gui/lib/shortcut.tcl deleted file mode 100644 index 97d1d7aa0268..000000000000 --- a/third_party/git/git-gui/lib/shortcut.tcl +++ /dev/null @@ -1,143 +0,0 @@ -# git-gui desktop icon creators -# Copyright (C) 2006, 2007 Shawn Pearce - -proc do_windows_shortcut {} { - global _gitworktree - set fn [tk_getSaveFile \ - -parent . \ - -title [mc "%s (%s): Create Desktop Icon" [appname] [reponame]] \ - -initialfile "Git [reponame].lnk"] - if {$fn != {}} { - if {[file extension $fn] ne {.lnk}} { - set fn ${fn}.lnk - } - # Use git-gui.exe if available (ie: git-for-windows) - set cmdLine [auto_execok git-gui.exe] - if {$cmdLine eq {}} { - set cmdLine [list [info nameofexecutable] \ - [file normalize $::argv0]] - } - if {[catch { - win32_create_lnk $fn $cmdLine \ - [file normalize $_gitworktree] - } err]} { - error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"] - } - } -} - -proc do_cygwin_shortcut {} { - global argv0 _gitworktree - - if {[catch { - set desktop [exec cygpath \ - --windows \ - --absolute \ - --long-name \ - --desktop] - }]} { - set desktop . - } - set fn [tk_getSaveFile \ - -parent . \ - -title [mc "%s (%s): Create Desktop Icon" [appname] [reponame]] \ - -initialdir $desktop \ - -initialfile "Git [reponame].lnk"] - if {$fn != {}} { - if {[file extension $fn] ne {.lnk}} { - set fn ${fn}.lnk - } - if {[catch { - set sh [exec cygpath \ - --windows \ - --absolute \ - /bin/sh.exe] - set me [exec cygpath \ - --unix \ - --absolute \ - $argv0] - win32_create_lnk $fn [list \ - $sh -c \ - "CHERE_INVOKING=1 source /etc/profile;[sq $me] &" \ - ] \ - [file normalize $_gitworktree] - } err]} { - error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"] - } - } -} - -proc do_macosx_app {} { - global argv0 env - - set fn [tk_getSaveFile \ - -parent . \ - -title [mc "%s (%s): Create Desktop Icon" [appname] [reponame]] \ - -initialdir [file join $env(HOME) Desktop] \ - -initialfile "Git [reponame].app"] - if {$fn != {}} { - if {[file extension $fn] ne {.app}} { - set fn ${fn}.app - } - if {[catch { - set Contents [file join $fn Contents] - set MacOS [file join $Contents MacOS] - set exe [file join $MacOS git-gui] - - file mkdir $MacOS - - set fd [open [file join $Contents Info.plist] w] - puts $fd {<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>git-gui</string> - <key>CFBundleIdentifier</key> - <string>org.spearce.git-gui</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> - <key>NSPrincipalClass</key> - <string>NSApplication</string> -</dict> -</plist>} - close $fd - - set fd [open $exe w] - puts $fd "#!/bin/sh" - foreach name [lsort [array names env]] { - set value $env($name) - switch -- $name { - GIT_DIR { set value [file normalize [gitdir]] } - } - - switch -glob -- $name { - SSH_* - - GIT_* { - puts $fd "if test \"z\$$name\" = z; then" - puts $fd " export $name=[sq $value]" - puts $fd "fi &&" - } - } - } - puts $fd "export PATH=[sq [file dirname $::_git]]:\$PATH &&" - puts $fd "cd [sq [file normalize [pwd]]] &&" - puts $fd "exec \\" - puts $fd " [sq [info nameofexecutable]] \\" - puts $fd " [sq [file normalize $argv0]]" - close $fd - - file attributes $exe -permissions u+x,g+x,o+x - } err]} { - error_popup [strcat [mc "Cannot write icon:"] "\n\n$err"] - } - } -} diff --git a/third_party/git/git-gui/lib/spellcheck.tcl b/third_party/git/git-gui/lib/spellcheck.tcl deleted file mode 100644 index 538d61c792de..000000000000 --- a/third_party/git/git-gui/lib/spellcheck.tcl +++ /dev/null @@ -1,415 +0,0 @@ -# git-gui spellchecking support through ispell/aspell -# Copyright (C) 2008 Shawn Pearce - -class spellcheck { - -field s_fd {} ; # pipe to ispell/aspell -field s_version {} ; # ispell/aspell version string -field s_lang {} ; # current language code -field s_prog aspell; # are we actually old ispell? -field s_failed 0 ; # is $s_prog bogus and not working? - -field w_text ; # text widget we are spelling -field w_menu ; # context menu for the widget -field s_menuidx 0 ; # last index of insertion into $w_menu - -field s_i {} ; # timer registration for _run callbacks -field s_clear 0 ; # did we erase misspelled tags yet? -field s_seen [list] ; # lines last seen from $w_text in _run -field s_checked [list] ; # lines already checked -field s_pending [list] ; # [$line $data] sent to ispell/aspell -field s_suggest ; # array, list of suggestions, keyed by misspelling - -constructor init {pipe_fd ui_text ui_menu} { - set w_text $ui_text - set w_menu $ui_menu - array unset s_suggest - - bind_button3 $w_text [cb _popup_suggest %X %Y @%x,%y] - _connect $this $pipe_fd - return $this -} - -method _connect {pipe_fd} { - fconfigure $pipe_fd \ - -encoding utf-8 \ - -eofchar {} \ - -translation lf - - if {[gets $pipe_fd s_version] <= 0} { - if {[catch {close $pipe_fd} err]} { - - # Eh? Is this actually ispell choking on aspell options? - # - if {$s_prog eq {aspell} - && [regexp -nocase {^Usage: } $err] - && ![catch { - set pipe_fd [open [list | $s_prog -v] r] - gets $pipe_fd s_version - close $pipe_fd - }] - && $s_version ne {}} { - if {{@(#) } eq [string range $s_version 0 4]} { - set s_version [string range $s_version 5 end] - } - set s_failed 1 - error_popup [strcat \ - [mc "Unsupported spell checker"] \ - ":\n\n$s_version"] - set s_version {} - return - } - - regsub -nocase {^Error: } $err {} err - if {$s_fd eq {}} { - error_popup [strcat [mc "Spell checking is unavailable"] ":\n\n$err"] - } else { - error_popup [strcat \ - [mc "Invalid spell checking configuration"] \ - ":\n\n$err\n\n" \ - [mc "Reverting dictionary to %s." $s_lang]] - } - } else { - error_popup [mc "Spell checker silently failed on startup"] - } - return - } - - if {{@(#) } ne [string range $s_version 0 4]} { - catch {close $pipe_fd} - error_popup [strcat [mc "Unrecognized spell checker"] ":\n\n$s_version"] - return - } - set s_version [string range [string trim $s_version] 5 end] - regexp \ - {International Ispell Version .* \(but really (Aspell .*?)\)$} \ - $s_version _junk s_version - regexp {^Aspell (\d)+\.(\d+)} $s_version _junk major minor - - puts $pipe_fd ! ; # enable terse mode - - # fetch the language - if {$major > 0 || ($major == 0 && $minor >= 60)} { - puts $pipe_fd {$$cr master} - flush $pipe_fd - gets $pipe_fd s_lang - regexp {[/\\]([^/\\]+)\.[^\.]+$} $s_lang _ s_lang - } else { - set s_lang {} - } - - if {$::default_config(gui.spellingdictionary) eq {} - && [get_config gui.spellingdictionary] eq {}} { - set ::default_config(gui.spellingdictionary) $s_lang - } - - if {$s_fd ne {}} { - catch {close $s_fd} - } - set s_fd $pipe_fd - - fconfigure $s_fd -blocking 0 - fileevent $s_fd readable [cb _read] - - $w_text tag conf misspelled \ - -foreground red \ - -underline 1 - - array unset s_suggest - set s_seen [list] - set s_checked [list] - set s_pending [list] - _run $this -} - -method lang {{n {}}} { - if {$n ne {} && $s_lang ne $n && !$s_failed} { - set spell_cmd [list |] - lappend spell_cmd aspell - lappend spell_cmd --master=$n - lappend spell_cmd --mode=none - lappend spell_cmd --encoding=UTF-8 - lappend spell_cmd pipe - _connect $this [open $spell_cmd r+] - } - return $s_lang -} - -method version {} { - if {$s_version ne {}} { - return "$s_version, $s_lang" - } - return {} -} - -method stop {} { - while {$s_menuidx > 0} { - $w_menu delete 0 - incr s_menuidx -1 - } - $w_text tag delete misspelled - - catch {close $s_fd} - catch {after cancel $s_i} - set s_fd {} - set s_i {} - set s_lang {} -} - -method _popup_suggest {X Y pos} { - while {$s_menuidx > 0} { - $w_menu delete 0 - incr s_menuidx -1 - } - - set b_loc [$w_text index "$pos wordstart"] - set e_loc [_wordend $this $b_loc] - set orig [$w_text get $b_loc $e_loc] - set tags [$w_text tag names $b_loc] - - if {[lsearch -exact $tags misspelled] >= 0} { - if {[info exists s_suggest($orig)]} { - set cnt 0 - foreach s $s_suggest($orig) { - if {$cnt < 5} { - $w_menu insert $s_menuidx command \ - -label $s \ - -command [cb _replace $b_loc $e_loc $s] - incr s_menuidx - incr cnt - } else { - break - } - } - } else { - $w_menu insert $s_menuidx command \ - -label [mc "No Suggestions"] \ - -state disabled - incr s_menuidx - } - $w_menu insert $s_menuidx separator - incr s_menuidx - } - - $w_text mark set saved-insert insert - tk_popup $w_menu $X $Y -} - -method _replace {b_loc e_loc word} { - $w_text configure -autoseparators 0 - $w_text edit separator - - $w_text delete $b_loc $e_loc - $w_text insert $b_loc $word - - $w_text edit separator - $w_text configure -autoseparators 1 - $w_text mark set insert saved-insert -} - -method _restart_timer {} { - set s_i [after 300 [cb _run]] -} - -proc _match_length {max_line arr_name} { - upvar $arr_name a - - if {[llength $a] > $max_line} { - set a [lrange $a 0 $max_line] - } - while {[llength $a] <= $max_line} { - lappend a {} - } -} - -method _wordend {pos} { - set pos [$w_text index "$pos wordend"] - set tags [$w_text tag names $pos] - while {[lsearch -exact $tags misspelled] >= 0} { - set pos [$w_text index "$pos +1c"] - set tags [$w_text tag names $pos] - } - return $pos -} - -method _run {} { - set cur_pos [$w_text index {insert -1c}] - set cur_line [lindex [split $cur_pos .] 0] - set max_line [lindex [split [$w_text index end] .] 0] - _match_length $max_line s_seen - _match_length $max_line s_checked - - # Nothing in the message buffer? Nothing to spellcheck. - # - if {$cur_line == 1 - && $max_line == 2 - && [$w_text get 1.0 end] eq "\n"} { - array unset s_suggest - _restart_timer $this - return - } - - set active 0 - for {set n 1} {$n <= $max_line} {incr n} { - set s [$w_text get "$n.0" "$n.end"] - - # Don't spellcheck the current line unless we are at - # a word boundary. The user might be typing on it. - # - if {$n == $cur_line - && ![regexp {^\W$} [$w_text get $cur_pos insert]]} { - - # If the current word is misspelled remove the tag - # but force a spellcheck later. - # - set tags [$w_text tag names $cur_pos] - if {[lsearch -exact $tags misspelled] >= 0} { - $w_text tag remove misspelled \ - "$cur_pos wordstart" \ - [_wordend $this $cur_pos] - lset s_seen $n $s - lset s_checked $n {} - } - - continue - } - - if {[lindex $s_seen $n] eq $s - && [lindex $s_checked $n] ne $s} { - # Don't send empty lines to Aspell it doesn't check them. - # - if {$s eq {}} { - lset s_checked $n $s - continue - } - - # Don't send typical s-b-o lines as the emails are - # almost always misspelled according to Aspell. - # - if {[regexp -nocase {^[a-z-]+-by:.*<.*@.*>$} $s]} { - $w_text tag remove misspelled "$n.0" "$n.end" - lset s_checked $n $s - continue - } - - puts $s_fd ^$s - lappend s_pending [list $n $s] - set active 1 - } else { - # Delay until another idle loop to make sure we don't - # spellcheck lines the user is actively changing. - # - lset s_seen $n $s - } - } - - if {$active} { - set s_clear 1 - flush $s_fd - } else { - _restart_timer $this - } -} - -method _read {} { - while {[gets $s_fd line] >= 0} { - set lineno [lindex $s_pending 0 0] - set line [string trim $line] - - if {$s_clear} { - $w_text tag remove misspelled "$lineno.0" "$lineno.end" - set s_clear 0 - } - - if {$line eq {}} { - lset s_checked $lineno [lindex $s_pending 0 1] - set s_pending [lrange $s_pending 1 end] - set s_clear 1 - continue - } - - set sugg [list] - switch -- [string range $line 0 1] { - {& } { - set line [split [string range $line 2 end] :] - set info [split [lindex $line 0] { }] - set orig [lindex $info 0] - set offs [lindex $info 2] - foreach s [split [lindex $line 1] ,] { - lappend sugg [string range $s 1 end] - } - } - {# } { - set info [split [string range $line 2 end] { }] - set orig [lindex $info 0] - set offs [lindex $info 1] - } - default { - puts stderr "<spell> $line" - continue - } - } - - incr offs -1 - set b_loc "$lineno.$offs" - set e_loc [$w_text index "$lineno.$offs wordend"] - set curr [$w_text get $b_loc $e_loc] - - # At least for English curr = "bob", orig = "bob's" - # so Tk didn't include the 's but Aspell did. We - # try to round out the word. - # - while {$curr ne $orig - && [string equal -length [string length $curr] $curr $orig]} { - set n_loc [$w_text index "$e_loc +1c"] - set n_curr [$w_text get $b_loc $n_loc] - if {$n_curr eq $curr} { - break - } - set curr $n_curr - set e_loc $n_loc - } - - if {$curr eq $orig} { - $w_text tag add misspelled $b_loc $e_loc - if {[llength $sugg] > 0} { - set s_suggest($orig) $sugg - } else { - unset -nocomplain s_suggest($orig) - } - } else { - unset -nocomplain s_suggest($orig) - } - } - - fconfigure $s_fd -block 1 - if {[eof $s_fd]} { - if {![catch {close $s_fd} err]} { - set err [mc "Unexpected EOF from spell checker"] - } - catch {after cancel $s_i} - $w_text tag remove misspelled 1.0 end - error_popup [strcat [mc "Spell Checker Failed"] "\n\n" $err] - return - } - fconfigure $s_fd -block 0 - - if {[llength $s_pending] == 0} { - _restart_timer $this - } -} - -proc available_langs {} { - set langs [list] - catch { - set fd [open [list | aspell dump dicts] r] - while {[gets $fd line] >= 0} { - if {$line eq {}} continue - lappend langs $line - } - close $fd - } - return $langs -} - -} diff --git a/third_party/git/git-gui/lib/sshkey.tcl b/third_party/git/git-gui/lib/sshkey.tcl deleted file mode 100644 index 589ff8f78aba..000000000000 --- a/third_party/git/git-gui/lib/sshkey.tcl +++ /dev/null @@ -1,131 +0,0 @@ -# git-gui about git-gui dialog -# Copyright (C) 2006, 2007 Shawn Pearce - -proc find_ssh_key {} { - foreach name { - ~/.ssh/id_dsa.pub ~/.ssh/id_ecdsa.pub ~/.ssh/id_ed25519.pub - ~/.ssh/id_rsa.pub ~/.ssh/identity.pub - } { - if {[file exists $name]} { - set fh [open $name r] - set cont [read $fh] - close $fh - return [list $name $cont] - } - } - - return {} -} - -proc do_ssh_key {} { - global sshkey_title have_tk85 sshkey_fd use_ttk NS - - set w .sshkey_dialog - if {[winfo exists $w]} { - raise $w - return - } - - Dialog $w - wm transient $w . - - set finfo [find_ssh_key] - if {$finfo eq {}} { - set sshkey_title [mc "No keys found."] - set gen_state normal - } else { - set sshkey_title [mc "Found a public key in: %s" [lindex $finfo 0]] - set gen_state disabled - } - - ${NS}::frame $w.header - ${NS}::label $w.header.lbl -textvariable sshkey_title -anchor w - ${NS}::button $w.header.gen -text [mc "Generate Key"] \ - -command [list make_ssh_key $w] -state $gen_state - pack $w.header.lbl -side left -expand 1 -fill x - pack $w.header.gen -side right - pack $w.header -fill x -pady 5 -padx 5 - - text $w.contents -width 60 -height 10 -wrap char -relief sunken - pack $w.contents -fill both -expand 1 - if {$have_tk85} { - set clr darkblue - if {$use_ttk} { set clr [ttk::style lookup . -selectbackground] } - $w.contents configure -inactiveselectbackground $clr - } - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.close -text [mc Close] \ - -default active -command [list destroy $w] - pack $w.buttons.close -side right - ${NS}::button $w.buttons.copy -text [mc "Copy To Clipboard"] \ - -command [list tk_textCopy $w.contents] - pack $w.buttons.copy -side left - pack $w.buttons -side bottom -fill x -pady 5 -padx 5 - - if {$finfo ne {}} { - $w.contents insert end [lindex $finfo 1] sel - } - $w.contents configure -state disabled - - bind $w <Visibility> "grab $w; focus $w.buttons.close" - bind $w <Key-Escape> "destroy $w" - bind $w <Key-Return> "destroy $w" - bind $w <Destroy> kill_sshkey - wm title $w [mc "Your OpenSSH Public Key"] - tk::PlaceWindow $w widget . - tkwait window $w -} - -proc make_ssh_key {w} { - global sshkey_title sshkey_output sshkey_fd - - set sshkey_title [mc "Generating..."] - $w.header.gen configure -state disabled - - set cmdline [list sh -c {echo | ssh-keygen -q -t rsa -f ~/.ssh/id_rsa 2>&1}] - - if {[catch { set sshkey_fd [_open_stdout_stderr $cmdline] } err]} { - error_popup [mc "Could not start ssh-keygen:\n\n%s" $err] - return - } - - set sshkey_output {} - fconfigure $sshkey_fd -blocking 0 - fileevent $sshkey_fd readable [list read_sshkey_output $sshkey_fd $w] -} - -proc kill_sshkey {} { - global sshkey_fd - if {![info exists sshkey_fd]} return - catch { kill_file_process $sshkey_fd } - catch { close $sshkey_fd } -} - -proc read_sshkey_output {fd w} { - global sshkey_fd sshkey_output sshkey_title - - set sshkey_output "$sshkey_output[read $fd]" - if {![eof $fd]} return - - fconfigure $fd -blocking 1 - unset sshkey_fd - - $w.contents configure -state normal - if {[catch {close $fd} err]} { - set sshkey_title [mc "Generation failed."] - $w.contents insert end $err - $w.contents insert end "\n" - $w.contents insert end $sshkey_output - } else { - set finfo [find_ssh_key] - if {$finfo eq {}} { - set sshkey_title [mc "Generation succeeded, but no keys found."] - $w.contents insert end $sshkey_output - } else { - set sshkey_title [mc "Your key is in: %s" [lindex $finfo 0]] - $w.contents insert end [lindex $finfo 1] sel - } - } - $w.contents configure -state disable -} diff --git a/third_party/git/git-gui/lib/status_bar.tcl b/third_party/git/git-gui/lib/status_bar.tcl deleted file mode 100644 index d32b14142ff8..000000000000 --- a/third_party/git/git-gui/lib/status_bar.tcl +++ /dev/null @@ -1,312 +0,0 @@ -# git-gui status bar mega-widget -# Copyright (C) 2007 Shawn Pearce - -# The status_bar class manages the entire status bar. It is possible for -# multiple overlapping asynchronous operations to want to display status -# simultaneously. Each one receives a status_bar_operation when it calls the -# start method, and the status bar combines all active operations into the -# line of text it displays. Most of the time, there will be at most one -# ongoing operation. -# -# Note that the entire status bar can be either in single-line or two-line -# mode, depending on the constructor. Multiple active operations are only -# supported for single-line status bars. - -class status_bar { - -field allow_multiple ; # configured at construction - -field w ; # our own window path -field w_l ; # text widget we draw messages into -field w_c ; # canvas we draw a progress bar into -field c_pack ; # script to pack the canvas with - -field baseline_text ; # text to show if there are no operations -field status_bar_text ; # combined text for all operations - -field operations ; # list of current ongoing operations - -# The status bar can display a progress bar, updated when consumers call the -# update method on their status_bar_operation. When there are multiple -# operations, the status bar shows the combined status of all operations. -# -# When an overlapping operation completes, the progress bar is going to -# abruptly have one fewer operation in the calculation, causing a discontinuity. -# Therefore, whenever an operation completes, if it is not the last operation, -# this counter is increased, and the progress bar is calculated as though there -# were still another operation at 100%. When the last operation completes, this -# is reset to 0. -field completed_operation_count - -constructor new {path} { - global use_ttk NS - set w $path - set w_l $w.l - set w_c $w.c - - # Standard single-line status bar: Permit overlapping operations - set allow_multiple 1 - - set baseline_text "" - set operations [list] - set completed_operation_count 0 - - ${NS}::frame $w - if {!$use_ttk} { - $w configure -borderwidth 1 -relief sunken - } - ${NS}::label $w_l \ - -textvariable @status_bar_text \ - -anchor w \ - -justify left - pack $w_l -side left - set c_pack [cb _oneline_pack] - - bind $w <Destroy> [cb _delete %W] - return $this -} - -method _oneline_pack {} { - $w_c conf -width 100 - pack $w_c -side right -} - -constructor two_line {path} { - global NS - set w $path - set w_l $w.l - set w_c $w.c - - # Two-line status bar: Only one ongoing operation permitted. - set allow_multiple 0 - - set baseline_text "" - set operations [list] - set completed_operation_count 0 - - ${NS}::frame $w - ${NS}::label $w_l \ - -textvariable @status_bar_text \ - -anchor w \ - -justify left - pack $w_l -anchor w -fill x - set c_pack [list pack $w_c -fill x] - - bind $w <Destroy> [cb _delete %W] - return $this -} - -method ensure_canvas {} { - if {[winfo exists $w_c]} { - $w_c coords bar 0 0 0 20 - } else { - canvas $w_c \ - -height [expr {int([winfo reqheight $w_l] * 0.6)}] \ - -borderwidth 1 \ - -relief groove \ - -highlightt 0 - $w_c create rectangle 0 0 0 20 -tags bar -fill navy - eval $c_pack - } -} - -method show {msg} { - $this ensure_canvas - set baseline_text $msg - $this refresh -} - -method start {msg {uds {}}} { - set baseline_text "" - - if {!$allow_multiple && [llength $operations]} { - return [lindex $operations 0] - } - - $this ensure_canvas - - set operation [status_bar_operation::new $this $msg $uds] - - lappend operations $operation - - $this refresh - - return $operation -} - -method refresh {} { - set new_text "" - - set total [expr $completed_operation_count * 100] - set have $total - - foreach operation $operations { - if {$new_text != ""} { - append new_text " / " - } - - append new_text [$operation get_status] - - set total [expr $total + 100] - set have [expr $have + [$operation get_progress]] - } - - if {$new_text == ""} { - set new_text $baseline_text - } - - set status_bar_text $new_text - - if {[winfo exists $w_c]} { - set pixel_width 0 - if {$have > 0} { - set pixel_width [expr {[winfo width $w_c] * $have / $total}] - } - - $w_c coords bar 0 0 $pixel_width 20 - } -} - -method stop {operation stop_msg} { - set idx [lsearch $operations $operation] - - if {$idx >= 0} { - set operations [lreplace $operations $idx $idx] - set completed_operation_count [expr \ - $completed_operation_count + 1] - - if {[llength $operations] == 0} { - set completed_operation_count 0 - - destroy $w_c - if {$stop_msg ne {}} { - set baseline_text $stop_msg - } - } - - $this refresh - } -} - -method stop_all {{stop_msg {}}} { - # This makes the operation's call to stop a no-op. - set operations_copy $operations - set operations [list] - - foreach operation $operations_copy { - $operation stop - } - - if {$stop_msg ne {}} { - set baseline_text $stop_msg - } - - $this refresh -} - -method _delete {current} { - if {$current eq $w} { - delete_this - } -} - -} - -# The status_bar_operation class tracks a single consumer's ongoing status bar -# activity, with the context that there are a few situations where multiple -# overlapping asynchronous operations might want to display status information -# simultaneously. Instances of status_bar_operation are created by calling -# start on the status_bar, and when the caller is done with its stauts bar -# operation, it calls stop on the operation. - -class status_bar_operation { - -field status_bar; # reference back to the status_bar that owns this object - -field is_active; - -field status {}; # single line of text we show -field progress {}; # current progress (0 to 100) -field prefix {}; # text we format into status -field units {}; # unit of progress -field meter {}; # current core git progress meter (if active) - -constructor new {owner msg uds} { - set status_bar $owner - - set status $msg - set progress 0 - set prefix $msg - set units $uds - set meter {} - - set is_active 1 - - return $this -} - -method get_is_active {} { return $is_active } -method get_status {} { return $status } -method get_progress {} { return $progress } - -method update {have total} { - if {!$is_active} { return } - - set progress 0 - - if {$total > 0} { - set progress [expr {100 * $have / $total}] - } - - set prec [string length [format %i $total]] - - set status [mc "%s ... %*i of %*i %s (%3i%%)" \ - $prefix \ - $prec $have \ - $prec $total \ - $units $progress] - - $status_bar refresh -} - -method update_meter {buf} { - if {!$is_active} { return } - - append meter $buf - set r [string last "\r" $meter] - if {$r == -1} { - return - } - - set prior [string range $meter 0 $r] - set meter [string range $meter [expr {$r + 1}] end] - set p "\\((\\d+)/(\\d+)\\)" - if {[regexp ":\\s*\\d+% $p\(?:, done.\\s*\n|\\s*\r)\$" $prior _j a b]} { - update $this $a $b - } elseif {[regexp "$p\\s+done\r\$" $prior _j a b]} { - update $this $a $b - } -} - -method stop {{stop_msg {}}} { - if {$is_active} { - set is_active 0 - $status_bar stop $this $stop_msg - } -} - -method restart {msg} { - if {!$is_active} { return } - - set status $msg - set prefix $msg - set meter {} - $status_bar refresh -} - -method _delete {} { - stop - delete_this -} - -} diff --git a/third_party/git/git-gui/lib/themed.tcl b/third_party/git/git-gui/lib/themed.tcl deleted file mode 100644 index 83e3ac795f38..000000000000 --- a/third_party/git/git-gui/lib/themed.tcl +++ /dev/null @@ -1,393 +0,0 @@ -# Functions for supporting the use of themed Tk widgets in git-gui. -# Copyright (C) 2009 Pat Thoyts <patthoyts@users.sourceforge.net> - - -namespace eval color { - # Variable colors - # Preffered way to set widget colors is using add_option. - # In some cases, like with tags in_diff/in_sel, we use these colors. - variable select_bg lightgray - variable select_fg black - - proc sync_with_theme {} { - set base_bg [ttk::style lookup . -background] - set base_fg [ttk::style lookup . -foreground] - set text_bg [ttk::style lookup Treeview -background] - set text_fg [ttk::style lookup Treeview -foreground] - set select_bg [ttk::style lookup Default -selectbackground] - set select_fg [ttk::style lookup Default -selectforeground] - - set color::select_bg $select_bg - set color::select_fg $select_fg - - proc add_option {key val} { - option add $key $val widgetDefault - } - # Add options for plain Tk widgets - # Using `option add` instead of tk_setPalette to avoid unintended - # consequences. - if {![is_MacOSX]} { - add_option *Menu.Background $base_bg - add_option *Menu.Foreground $base_fg - add_option *Menu.activeBackground $select_bg - add_option *Menu.activeForeground $select_fg - } - add_option *Text.Background $text_bg - add_option *Text.Foreground $text_fg - add_option *Text.HighlightBackground $base_bg - add_option *Text.HighlightColor $select_bg - } -} - -proc ttk_get_current_theme {} { - # Handle either current Tk or older versions of 8.5 - if {[catch {set theme [ttk::style theme use]}]} { - set theme $::ttk::currentTheme - } - return $theme -} - -proc InitTheme {} { - # Create a color label style (bg can be overridden by widget option) - ttk::style layout Color.TLabel { - Color.Label.border -sticky news -children { - Color.label.fill -sticky news -children { - Color.Label.padding -sticky news -children { - Color.Label.label -sticky news}}}} - eval [linsert [ttk::style configure TLabel] 0 \ - ttk::style configure Color.TLabel] - ttk::style configure Color.TLabel \ - -borderwidth 0 -relief flat -padding 2 - ttk::style map Color.TLabel -background {{} gold} - # We also need a padded label. - ttk::style configure Padded.TLabel \ - -padding {5 5} -borderwidth 1 -relief solid - # We need a gold frame. - ttk::style layout Gold.TFrame { - Gold.Frame.border -sticky nswe -children { - Gold.Frame.fill -sticky nswe}} - ttk::style configure Gold.TFrame -background gold -relief flat - # listboxes should have a theme border so embed in ttk::frame - ttk::style layout SListbox.TFrame { - SListbox.Frame.Entry.field -sticky news -border true -children { - SListbox.Frame.padding -sticky news - } - } - - set theme [ttk_get_current_theme] - - if {[lsearch -exact {default alt classic clam} $theme] != -1} { - # Simple override of standard ttk::entry to change the field - # packground according to a state flag. We should use 'user1' - # but not all versions of 8.5 support that so make use of 'pressed' - # which is not normally in use for entry widgets. - ttk::style layout Edged.Entry [ttk::style layout TEntry] - ttk::style map Edged.Entry {*}[ttk::style map TEntry] - ttk::style configure Edged.Entry {*}[ttk::style configure TEntry] \ - -fieldbackground lightgreen - ttk::style map Edged.Entry -fieldbackground { - {pressed !disabled} lightpink - } - } else { - # For fancier themes, in particular the Windows ones, the field - # element may not support changing the background color. So instead - # override the fill using the default fill element. If we overrode - # the vista theme field element we would loose the themed border - # of the widget. - catch { - ttk::style element create color.fill from default - } - - ttk::style layout Edged.Entry { - Edged.Entry.field -sticky nswe -border 0 -children { - Edged.Entry.border -sticky nswe -border 1 -children { - Edged.Entry.padding -sticky nswe -children { - Edged.Entry.color.fill -sticky nswe -children { - Edged.Entry.textarea -sticky nswe - } - } - } - } - } - - ttk::style configure Edged.Entry {*}[ttk::style configure TEntry] \ - -background lightgreen -padding 0 -borderwidth 0 - ttk::style map Edged.Entry {*}[ttk::style map TEntry] \ - -background {{pressed !disabled} lightpink} - } - - if {[lsearch [bind . <<ThemeChanged>>] InitTheme] == -1} { - bind . <<ThemeChanged>> +[namespace code [list InitTheme]] - } -} - -# Define a style used for the surround of text widgets. -proc InitEntryFrame {} { - ttk::style theme settings default { - ttk::style layout EntryFrame { - EntryFrame.field -sticky nswe -border 0 -children { - EntryFrame.fill -sticky nswe -children { - EntryFrame.padding -sticky nswe - } - } - } - ttk::style configure EntryFrame -padding 1 -relief sunken - ttk::style map EntryFrame -background {} - } - ttk::style theme settings classic { - ttk::style configure EntryFrame -padding 2 -relief sunken - ttk::style map EntryFrame -background {} - } - ttk::style theme settings alt { - ttk::style configure EntryFrame -padding 2 - ttk::style map EntryFrame -background {} - } - ttk::style theme settings clam { - ttk::style configure EntryFrame -padding 2 - ttk::style map EntryFrame -background {} - } - - # Ignore errors for missing native themes - catch { - ttk::style theme settings winnative { - ttk::style configure EntryFrame -padding 2 - } - ttk::style theme settings xpnative { - ttk::style configure EntryFrame -padding 1 - ttk::style element create EntryFrame.field vsapi \ - EDIT 1 {disabled 4 focus 3 active 2 {} 1} -padding 1 - } - ttk::style theme settings vista { - ttk::style configure EntryFrame -padding 2 - ttk::style element create EntryFrame.field vsapi \ - EDIT 6 {disabled 4 focus 3 active 2 {} 1} -padding 2 - } - } - - bind EntryFrame <Enter> {%W instate !disabled {%W state active}} - bind EntryFrame <Leave> {%W state !active} - bind EntryFrame <<ThemeChanged>> { - set pad [ttk::style lookup EntryFrame -padding] - %W configure -padding [expr {$pad eq {} ? 1 : $pad}] - } -} - -proc gold_frame {w args} { - global use_ttk - if {$use_ttk} { - eval [linsert $args 0 ttk::frame $w -style Gold.TFrame] - } else { - eval [linsert $args 0 frame $w -background gold] - } -} - -proc tlabel {w args} { - global use_ttk - if {$use_ttk} { - set cmd [list ttk::label $w -style Color.TLabel] - foreach {k v} $args { - switch -glob -- $k { - -activebackground {} - default { lappend cmd $k $v } - } - } - eval $cmd - } else { - eval [linsert $args 0 label $w] - } -} - -# The padded label gets used in the about class. -proc paddedlabel {w args} { - global use_ttk - if {$use_ttk} { - eval [linsert $args 0 ttk::label $w -style Padded.TLabel] - } else { - eval [linsert $args 0 label $w \ - -padx 5 -pady 5 \ - -justify left \ - -anchor w \ - -borderwidth 1 \ - -relief solid] - } -} - -# Create a toplevel for use as a dialog. -# If available, sets the EWMH dialog hint and if ttk is enabled -# place a themed frame over the surface. -proc Dialog {w args} { - eval [linsert $args 0 toplevel $w -class Dialog] - catch {wm attributes $w -type dialog} - pave_toplevel $w - return $w -} - -# Tk toplevels are not themed - so pave it over with a themed frame to get -# the base color correct per theme. -proc pave_toplevel {w} { - global use_ttk - if {$use_ttk && ![winfo exists $w.!paving]} { - set paving [ttk::frame $w.!paving] - place $paving -x 0 -y 0 -relwidth 1 -relheight 1 - lower $paving - } -} - -# Create a scrolled listbox with appropriate border for the current theme. -# On many themes the border for a scrolled listbox needs to go around the -# listbox and the scrollbar. -proc slistbox {w args} { - global use_ttk NS - if {$use_ttk} { - set f [ttk::frame $w -style SListbox.TFrame -padding 2] - } else { - set f [frame $w -relief flat] - } - if {[catch { - if {$use_ttk} { - eval [linsert $args 0 listbox $f.list -relief flat \ - -highlightthickness 0 -borderwidth 0] - } else { - eval [linsert $args 0 listbox $f.list] - } - ${NS}::scrollbar $f.vs -command [list $f.list yview] - $f.list configure -yscrollcommand [list $f.vs set] - grid $f.list $f.vs -sticky news - grid rowconfigure $f 0 -weight 1 - grid columnconfigure $f 0 -weight 1 - bind $f.list <<ListboxSelect>> \ - [list event generate $w <<ListboxSelect>>] - interp hide {} $w - interp alias {} $w {} $f.list - } err]} { - destroy $f - return -code error $err - } - return $w -} - -# fetch the background color from a widget. -proc get_bg_color {w} { - global use_ttk - if {$use_ttk} { - set bg [ttk::style lookup [winfo class $w] -background] - } else { - set bg [$w cget -background] - } - return $bg -} - -# ttk::spinbox didn't get added until 8.6 -proc tspinbox {w args} { - global use_ttk - if {$use_ttk && [llength [info commands ttk::spinbox]] > 0} { - eval [linsert $args 0 ttk::spinbox $w] - } else { - eval [linsert $args 0 spinbox $w] - } -} - -# Create a text widget with any theme specific properties. -proc ttext {w args} { - global use_ttk - if {$use_ttk} { - switch -- [ttk_get_current_theme] { - "vista" - "xpnative" { - lappend args -highlightthickness 0 -borderwidth 0 - } - } - } - set w [eval [linsert $args 0 text $w]] - if {$use_ttk} { - if {[winfo class [winfo parent $w]] eq "EntryFrame"} { - bind $w <FocusIn> {[winfo parent %W] state focus} - bind $w <FocusOut> {[winfo parent %W] state !focus} - } - } - return $w -} - -# themed frame suitable for surrounding a text field. -proc textframe {w args} { - global use_ttk - if {$use_ttk} { - if {[catch {ttk::style layout EntryFrame}]} { - InitEntryFrame - } - eval [linsert $args 0 ttk::frame $w -class EntryFrame -style EntryFrame] - } else { - eval [linsert $args 0 frame $w] - } - return $w -} - -proc tentry {w args} { - global use_ttk - if {$use_ttk} { - InitTheme - ttk::entry $w -style Edged.Entry - } else { - entry $w - } - - rename $w _$w - interp alias {} $w {} tentry_widgetproc $w - eval [linsert $args 0 tentry_widgetproc $w configure] - return $w -} -proc tentry_widgetproc {w cmd args} { - global use_ttk - switch -- $cmd { - state { - if {$use_ttk} { - return [uplevel 1 [list _$w $cmd] $args] - } else { - if {[lsearch -exact $args pressed] != -1} { - _$w configure -background lightpink - } else { - _$w configure -background lightgreen - } - } - } - configure { - if {$use_ttk} { - if {[set n [lsearch -exact $args -background]] != -1} { - set args [lreplace $args $n [incr n]] - if {[llength $args] == 0} {return} - } - } - return [uplevel 1 [list _$w $cmd] $args] - } - default { return [uplevel 1 [list _$w $cmd] $args] } - } -} - -# Tk 8.6 provides a standard font selection dialog. This uses the native -# dialogs on Windows and MacOSX or a standard Tk dialog on X11. -proc tchoosefont {w title familyvar sizevar} { - if {[package vsatisfies [package provide Tk] 8.6]} { - upvar #0 $familyvar family - upvar #0 $sizevar size - tk fontchooser configure -parent $w -title $title \ - -font [list $family $size] \ - -command [list on_choosefont $familyvar $sizevar] - tk fontchooser show - } else { - choose_font::pick $w $title $familyvar $sizevar - } -} - -# Called when the Tk 8.6 fontchooser selects a font. -proc on_choosefont {familyvar sizevar font} { - upvar #0 $familyvar family - upvar #0 $sizevar size - set font [font actual $font] - set family [dict get $font -family] - set size [dict get $font -size] -} - -# Local variables: -# mode: tcl -# indent-tabs-mode: t -# tab-width: 4 -# End: diff --git a/third_party/git/git-gui/lib/tools.tcl b/third_party/git/git-gui/lib/tools.tcl deleted file mode 100644 index 413f1a170079..000000000000 --- a/third_party/git/git-gui/lib/tools.tcl +++ /dev/null @@ -1,168 +0,0 @@ -# git-gui Tools menu implementation - -proc tools_list {} { - global repo_config - - set names {} - foreach item [array names repo_config guitool.*.cmd] { - lappend names [string range $item 8 end-4] - } - return [lsort $names] -} - -proc tools_populate_all {} { - global tools_menubar tools_menutbl - global tools_tailcnt - - set mbar_end [$tools_menubar index end] - set mbar_base [expr {$mbar_end - $tools_tailcnt}] - if {$mbar_base >= 0} { - $tools_menubar delete 0 $mbar_base - } - - array unset tools_menutbl - - foreach fullname [tools_list] { - tools_populate_one $fullname - } -} - -proc tools_create_item {parent args} { - global tools_menubar tools_tailcnt - if {$parent eq $tools_menubar} { - set pos [expr {[$parent index end]-$tools_tailcnt+1}] - eval [list $parent insert $pos] $args - } else { - eval [list $parent add] $args - } -} - -proc tools_populate_one {fullname} { - global tools_menubar tools_menutbl tools_id - - if {![info exists tools_id]} { - set tools_id 0 - } - - set names [split $fullname '/'] - set parent $tools_menubar - for {set i 0} {$i < [llength $names]-1} {incr i} { - set subname [join [lrange $names 0 $i] '/'] - if {[info exists tools_menutbl($subname)]} { - set parent $tools_menutbl($subname) - } else { - set subid $parent.t$tools_id - tools_create_item $parent cascade \ - -label [lindex $names $i] -menu $subid - menu $subid - set tools_menutbl($subname) $subid - set parent $subid - incr tools_id - } - } - - tools_create_item $parent command \ - -label [lindex $names end] \ - -command [list tools_exec $fullname] -} - -proc tools_exec {fullname} { - global repo_config env current_diff_path - global current_branch is_detached - global selected_paths - - if {[is_config_true "guitool.$fullname.needsfile"]} { - if {$current_diff_path eq {}} { - error_popup [mc "Running %s requires a selected file." $fullname] - return - } - } - - catch { unset env(ARGS) } - catch { unset env(REVISION) } - - if {[get_config "guitool.$fullname.revprompt"] ne {} || - [get_config "guitool.$fullname.argprompt"] ne {}} { - set dlg [tools_askdlg::dialog $fullname] - if {![tools_askdlg::execute $dlg]} { - return - } - } elseif {[is_config_true "guitool.$fullname.confirm"]} { - if {[is_config_true "guitool.$fullname.needsfile"]} { - if {[ask_popup [mc "Are you sure you want to run %1\$s on file \"%2\$s\"?" $fullname $current_diff_path]] ne {yes}} { - return - } - } else { - if {[ask_popup [mc "Are you sure you want to run %s?" $fullname]] ne {yes}} { - return - } - } - } - - set env(GIT_GUITOOL) $fullname - set env(FILENAME) $current_diff_path - set env(FILENAMES) [join [array names selected_paths] \n] - if {$is_detached} { - set env(CUR_BRANCH) "" - } else { - set env(CUR_BRANCH) $current_branch - } - - set cmdline $repo_config(guitool.$fullname.cmd) - if {[is_config_true "guitool.$fullname.noconsole"]} { - tools_run_silent [list sh -c $cmdline] \ - [list tools_complete $fullname {}] - } else { - regsub {/} $fullname { / } title - set w [console::new \ - [mc "Tool: %s" $title] \ - [mc "Running: %s" $cmdline]] - console::exec $w [list sh -c $cmdline] \ - [list tools_complete $fullname $w] - } - - unset env(GIT_GUITOOL) - unset env(FILENAME) - unset env(FILENAMES) - unset env(CUR_BRANCH) - catch { unset env(ARGS) } - catch { unset env(REVISION) } -} - -proc tools_run_silent {cmd after} { - lappend cmd 2>@1 - set fd [_open_stdout_stderr $cmd] - - fconfigure $fd -blocking 0 -translation binary - fileevent $fd readable [list tools_consume_input $fd $after] -} - -proc tools_consume_input {fd after} { - read $fd - if {[eof $fd]} { - fconfigure $fd -blocking 1 - if {[catch {close $fd}]} { - uplevel #0 $after 0 - } else { - uplevel #0 $after 1 - } - } -} - -proc tools_complete {fullname w {ok 1}} { - if {$w ne {}} { - console::done $w $ok - } - - if {$ok} { - set msg [mc "Tool completed successfully: %s" $fullname] - } else { - set msg [mc "Tool failed: %s" $fullname] - } - - if {[is_config_true "guitool.$fullname.norescan"]} { - ui_status $msg - } else { - rescan [list ui_status $msg] - } -} diff --git a/third_party/git/git-gui/lib/tools_dlg.tcl b/third_party/git/git-gui/lib/tools_dlg.tcl deleted file mode 100644 index c05413ce432d..000000000000 --- a/third_party/git/git-gui/lib/tools_dlg.tcl +++ /dev/null @@ -1,414 +0,0 @@ -# git-gui Tools menu dialogs - -class tools_add { - -field w ; # widget path -field w_name ; # new remote name widget -field w_cmd ; # new remote location widget - -field name {}; # name of the tool -field command {}; # command to execute -field add_global 0; # add to the --global config -field no_console 0; # disable using the console -field needs_file 0; # ensure filename is set -field confirm 0; # ask for confirmation -field ask_branch 0; # ask for a revision -field ask_args 0; # ask for additional args - -constructor dialog {} { - global repo_config use_ttk NS - - make_dialog top w - wm title $top [mc "%s (%s): Add Tool" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - wm transient $top . - } - - ${NS}::label $w.header -text [mc "Add New Tool Command"] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::checkbutton $w.buttons.global \ - -text [mc "Add globally"] \ - -variable @add_global - pack $w.buttons.global -side left -padx 5 - ${NS}::button $w.buttons.create -text [mc Add] \ - -default active \ - -command [cb _add] - pack $w.buttons.create -side right - ${NS}::button $w.buttons.cancel -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::labelframe $w.desc -text [mc "Tool Details"] - - ${NS}::label $w.desc.name_cmnt -anchor w\ - -text [mc "Use '/' separators to create a submenu tree:"] - grid x $w.desc.name_cmnt -sticky we -padx {0 5} -pady {0 2} - ${NS}::label $w.desc.name_l -text [mc "Name:"] - set w_name $w.desc.name_t - ${NS}::entry $w_name \ - -width 40 \ - -textvariable @name \ - -validate key \ - -validatecommand [cb _validate_name %d %S] - grid $w.desc.name_l $w_name -sticky we -padx {0 5} - - ${NS}::label $w.desc.cmd_l -text [mc "Command:"] - set w_cmd $w.desc.cmd_t - ${NS}::entry $w_cmd \ - -width 40 \ - -textvariable @command - grid $w.desc.cmd_l $w_cmd -sticky we -padx {0 5} -pady {0 3} - - grid columnconfigure $w.desc 1 -weight 1 - pack $w.desc -anchor nw -fill x -pady 5 -padx 5 - - ${NS}::checkbutton $w.confirm \ - -text [mc "Show a dialog before running"] \ - -variable @confirm -command [cb _check_enable_dlg] - - ${NS}::labelframe $w.dlg -labelwidget $w.confirm - - ${NS}::checkbutton $w.dlg.askbranch \ - -text [mc "Ask the user to select a revision (sets \$REVISION)"] \ - -variable @ask_branch -state disabled - pack $w.dlg.askbranch -anchor w -padx 15 - - ${NS}::checkbutton $w.dlg.askargs \ - -text [mc "Ask the user for additional arguments (sets \$ARGS)"] \ - -variable @ask_args -state disabled - pack $w.dlg.askargs -anchor w -padx 15 - - pack $w.dlg -anchor nw -fill x -pady {0 8} -padx 5 - - ${NS}::checkbutton $w.noconsole \ - -text [mc "Don't show the command output window"] \ - -variable @no_console - pack $w.noconsole -anchor w -padx 5 - - ${NS}::checkbutton $w.needsfile \ - -text [mc "Run only if a diff is selected (\$FILENAME not empty)"] \ - -variable @needs_file - pack $w.needsfile -anchor w -padx 5 - - bind $w <Visibility> [cb _visible] - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [cb _add]\;break - tkwait window $w -} - -method _check_enable_dlg {} { - if {$confirm} { - $w.dlg.askbranch configure -state normal - $w.dlg.askargs configure -state normal - } else { - $w.dlg.askbranch configure -state disabled - $w.dlg.askargs configure -state disabled - } -} - -method _add {} { - global repo_config - - if {$name eq {}} { - error_popup [mc "Please supply a name for the tool."] - focus $w_name - return - } - - set item "guitool.$name.cmd" - - if {[info exists repo_config($item)]} { - error_popup [mc "Tool '%s' already exists." $name] - focus $w_name - return - } - - set cmd [list git config] - if {$add_global} { lappend cmd --global } - set items {} - if {$no_console} { lappend items "guitool.$name.noconsole" } - if {$needs_file} { lappend items "guitool.$name.needsfile" } - if {$confirm} { - if {$ask_args} { lappend items "guitool.$name.argprompt" } - if {$ask_branch} { lappend items "guitool.$name.revprompt" } - if {!$ask_args && !$ask_branch} { - lappend items "guitool.$name.confirm" - } - } - - if {[catch { - eval $cmd [list $item $command] - foreach citem $items { eval $cmd [list $citem yes] } - } err]} { - error_popup [mc "Could not add tool:\n%s" $err] - } else { - set repo_config($item) $command - foreach citem $items { set repo_config($citem) yes } - - tools_populate_all - } - - destroy $w -} - -method _validate_name {d S} { - if {$d == 1} { - if {[regexp {[~?*&\[\0\"\\\{]} $S]} { - return 0 - } - } - return 1 -} - -method _visible {} { - grab $w - $w_name icursor end - focus $w_name -} - -} - -class tools_remove { - -field w ; # widget path -field w_names ; # name list - -constructor dialog {} { - global repo_config global_config system_config use_ttk NS - - load_config 1 - - make_dialog top w - wm title $top [mc "%s (%s): Remove Tool" [appname] [reponame]] - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - wm transient $top . - } - - ${NS}::label $w.header -text [mc "Remove Tool Commands"] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.create -text [mc Remove] \ - -default active \ - -command [cb _remove] - pack $w.buttons.create -side right - ${NS}::button $w.buttons.cancel -text [mc Cancel] \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::frame $w.list - set w_names $w.list.l - slistbox $w_names \ - -height 10 \ - -width 30 \ - -selectmode extended \ - -exportselection false - pack $w.list.l -side left -fill both -expand 1 - pack $w.list -fill both -expand 1 -pady 5 -padx 5 - - set local_cnt 0 - foreach fullname [tools_list] { - # Cannot delete system tools - if {[info exists system_config(guitool.$fullname.cmd)]} continue - - $w_names insert end $fullname - if {![info exists global_config(guitool.$fullname.cmd)]} { - $w_names itemconfigure end -foreground blue - incr local_cnt - } - } - - if {$local_cnt > 0} { - ${NS}::label $w.colorlbl -foreground blue \ - -text [mc "(Blue denotes repository-local tools)"] - pack $w.colorlbl -fill x -pady 5 -padx 5 - } - - bind $w <Visibility> [cb _visible] - bind $w <Key-Escape> [list destroy $w] - bind $w <Key-Return> [cb _remove]\;break - tkwait window $w -} - -method _remove {} { - foreach i [$w_names curselection] { - set name [$w_names get $i] - - catch { git config --remove-section guitool.$name } - catch { git config --global --remove-section guitool.$name } - } - - load_config 0 - tools_populate_all - - destroy $w -} - -method _visible {} { - grab $w - focus $w_names -} - -} - -class tools_askdlg { - -field w ; # widget path -field w_rev {}; # revision browser -field w_args {}; # arguments - -field is_ask_args 0; # has arguments field -field is_ask_revs 0; # has revision browser - -field is_ok 0; # ok to start -field argstr {}; # arguments - -constructor dialog {fullname} { - global M1B use_ttk NS - - set title [get_config "guitool.$fullname.title"] - if {$title eq {}} { - regsub {/} $fullname { / } title - } - - make_dialog top w -autodelete 0 - wm title $top "[mc "%s (%s):" [appname] [reponame]] $title" - if {$top ne {.}} { - wm geometry $top "+[winfo rootx .]+[winfo rooty .]" - wm transient $top . - } - - set prompt [get_config "guitool.$fullname.prompt"] - if {$prompt eq {}} { - set command [get_config "guitool.$fullname.cmd"] - set prompt [mc "Run Command: %s" $command] - } - - ${NS}::label $w.header -text $prompt -font font_uibold -anchor center - pack $w.header -side top -fill x - - set argprompt [get_config "guitool.$fullname.argprompt"] - set revprompt [get_config "guitool.$fullname.revprompt"] - - set is_ask_args [expr {$argprompt ne {}}] - set is_ask_revs [expr {$revprompt ne {}}] - - if {$is_ask_args} { - if {$argprompt eq {yes} || $argprompt eq {true} || $argprompt eq {1}} { - set argprompt [mc "Arguments"] - } - - ${NS}::labelframe $w.arg -text $argprompt - - set w_args $w.arg.txt - ${NS}::entry $w_args \ - -width 40 \ - -textvariable @argstr - pack $w_args -padx 5 -pady 5 -fill both - pack $w.arg -anchor nw -fill both -pady 5 -padx 5 - } - - if {$is_ask_revs} { - if {$revprompt eq {yes} || $revprompt eq {true} || $revprompt eq {1}} { - set revprompt [mc "Revision"] - } - - if {[is_config_true "guitool.$fullname.revunmerged"]} { - set w_rev [::choose_rev::new_unmerged $w.rev $revprompt] - } else { - set w_rev [::choose_rev::new $w.rev $revprompt] - } - - pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 - } - - ${NS}::frame $w.buttons - if {$is_ask_revs} { - ${NS}::button $w.buttons.visualize \ - -text [mc Visualize] \ - -command [cb _visualize] - pack $w.buttons.visualize -side left - } - ${NS}::button $w.buttons.ok \ - -text [mc OK] \ - -command [cb _start] - pack $w.buttons.ok -side right - ${NS}::button $w.buttons.cancel \ - -text [mc "Cancel"] \ - -command [cb _cancel] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - bind $w <$M1B-Key-Return> [cb _start] - bind $w <Key-Return> [cb _start] - bind $w <Key-Escape> [cb _cancel] - wm protocol $w WM_DELETE_WINDOW [cb _cancel] - - bind $w <Visibility> [cb _visible] - return $this -} - -method execute {} { - tkwait window $w - set rv $is_ok - delete_this - return $rv -} - -method _visible {} { - grab $w - if {$is_ask_args} { - focus $w_args - } elseif {$is_ask_revs} { - $w_rev focus_filter - } -} - -method _cancel {} { - wm protocol $w WM_DELETE_WINDOW {} - destroy $w -} - -method _rev {} { - if {[catch {$w_rev commit_or_die}]} { - return {} - } - return [$w_rev get] -} - -method _visualize {} { - global current_branch - set rev [_rev $this] - if {$rev ne {}} { - do_gitk [list --left-right "$current_branch...$rev"] - } -} - -method _start {} { - global env - - if {$is_ask_revs} { - set name [_rev $this] - if {$name eq {}} { - return - } - set env(REVISION) $name - } - - if {$is_ask_args} { - set env(ARGS) $argstr - } - - set is_ok 1 - _cancel $this -} - -} diff --git a/third_party/git/git-gui/lib/transport.tcl b/third_party/git/git-gui/lib/transport.tcl deleted file mode 100644 index a1a424aab540..000000000000 --- a/third_party/git/git-gui/lib/transport.tcl +++ /dev/null @@ -1,232 +0,0 @@ -# git-gui transport (fetch/push) support -# Copyright (C) 2006, 2007 Shawn Pearce - -proc fetch_from {remote} { - set w [console::new \ - [mc "fetch %s" $remote] \ - [mc "Fetching new changes from %s" $remote]] - set cmds [list] - lappend cmds [list exec git fetch $remote] - if {[is_config_true gui.pruneduringfetch]} { - lappend cmds [list exec git remote prune $remote] - } - console::chain $w $cmds -} - -proc prune_from {remote} { - set w [console::new \ - [mc "remote prune %s" $remote] \ - [mc "Pruning tracking branches deleted from %s" $remote]] - console::exec $w [list git remote prune $remote] -} - -proc fetch_from_all {} { - set w [console::new \ - [mc "fetch all remotes"] \ - [mc "Fetching new changes from all remotes"]] - - set cmd [list git fetch --all] - if {[is_config_true gui.pruneduringfetch]} { - lappend cmd --prune - } - - console::exec $w $cmd -} - -proc prune_from_all {} { - global all_remotes - - set w [console::new \ - [mc "remote prune all remotes"] \ - [mc "Pruning tracking branches deleted from all remotes"]] - - set cmd [list git remote prune] - - foreach r $all_remotes { - lappend cmd $r - } - - console::exec $w $cmd -} - -proc push_to {remote} { - set w [console::new \ - [mc "push %s" $remote] \ - [mc "Pushing changes to %s" $remote]] - set cmd [list git push] - lappend cmd -v - lappend cmd $remote - console::exec $w $cmd -} - -proc start_push_anywhere_action {w} { - global push_urltype push_remote push_url push_thin push_tags - global push_force - global repo_config - - set is_mirror 0 - set r_url {} - switch -- $push_urltype { - remote { - set r_url $push_remote - catch {set is_mirror $repo_config(remote.$push_remote.mirror)} - } - url {set r_url $push_url} - } - if {$r_url eq {}} return - - set cmd [list git push] - lappend cmd -v - if {$push_thin} { - lappend cmd --thin - } - if {$push_force} { - lappend cmd --force - } - if {$push_tags} { - lappend cmd --tags - } - lappend cmd $r_url - if {$is_mirror} { - set cons [console::new \ - [mc "push %s" $r_url] \ - [mc "Mirroring to %s" $r_url]] - } else { - set cnt 0 - foreach i [$w.source.l curselection] { - set b [$w.source.l get $i] - lappend cmd "refs/heads/$b:refs/heads/$b" - incr cnt - } - if {$cnt == 0} { - return - } elseif {$cnt == 1} { - set unit branch - } else { - set unit branches - } - - set cons [console::new \ - [mc "push %s" $r_url] \ - [mc "Pushing %s %s to %s" $cnt $unit $r_url]] - } - console::exec $cons $cmd - destroy $w -} - -trace add variable push_remote write \ - [list radio_selector push_urltype remote] - -proc do_push_anywhere {} { - global all_remotes current_branch - global push_urltype push_remote push_url push_thin push_tags - global push_force use_ttk NS - - set w .push_setup - toplevel $w - catch {wm attributes $w -type dialog} - wm withdraw $w - wm geometry $w "+[winfo rootx .]+[winfo rooty .]" - pave_toplevel $w - - ${NS}::label $w.header -text [mc "Push Branches"] \ - -font font_uibold -anchor center - pack $w.header -side top -fill x - - ${NS}::frame $w.buttons - ${NS}::button $w.buttons.create -text [mc Push] \ - -default active \ - -command [list start_push_anywhere_action $w] - pack $w.buttons.create -side right - ${NS}::button $w.buttons.cancel -text [mc "Cancel"] \ - -default normal \ - -command [list destroy $w] - pack $w.buttons.cancel -side right -padx 5 - pack $w.buttons -side bottom -fill x -pady 10 -padx 10 - - ${NS}::labelframe $w.source -text [mc "Source Branches"] - slistbox $w.source.l \ - -height 10 \ - -width 70 \ - -selectmode extended - foreach h [load_all_heads] { - $w.source.l insert end $h - if {$h eq $current_branch} { - $w.source.l select set end - $w.source.l yview end - } - } - pack $w.source.l -side left -fill both -expand 1 - pack $w.source -fill both -expand 1 -pady 5 -padx 5 - - ${NS}::labelframe $w.dest -text [mc "Destination Repository"] - if {$all_remotes ne {}} { - ${NS}::radiobutton $w.dest.remote_r \ - -text [mc "Remote:"] \ - -value remote \ - -variable push_urltype - if {$use_ttk} { - ttk::combobox $w.dest.remote_m -state readonly \ - -exportselection false \ - -textvariable push_remote \ - -values $all_remotes - } else { - eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes - } - grid $w.dest.remote_r $w.dest.remote_m -sticky w - if {[lsearch -sorted -exact $all_remotes origin] != -1} { - set push_remote origin - } else { - set push_remote [lindex $all_remotes 0] - } - set push_urltype remote - } else { - set push_urltype url - } - ${NS}::radiobutton $w.dest.url_r \ - -text [mc "Arbitrary Location:"] \ - -value url \ - -variable push_urltype - ${NS}::entry $w.dest.url_t \ - -width 50 \ - -textvariable push_url \ - -validate key \ - -validatecommand { - if {%d == 1 && [regexp {\s} %S]} {return 0} - if {%d == 1 && [string length %S] > 0} { - set push_urltype url - } - return 1 - } - grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5} - grid columnconfigure $w.dest 1 -weight 1 - pack $w.dest -anchor nw -fill x -pady 5 -padx 5 - - ${NS}::labelframe $w.options -text [mc "Transfer Options"] - ${NS}::checkbutton $w.options.force \ - -text [mc "Force overwrite existing branch (may discard changes)"] \ - -variable push_force - grid $w.options.force -columnspan 2 -sticky w - ${NS}::checkbutton $w.options.thin \ - -text [mc "Use thin pack (for slow network connections)"] \ - -variable push_thin - grid $w.options.thin -columnspan 2 -sticky w - ${NS}::checkbutton $w.options.tags \ - -text [mc "Include tags"] \ - -variable push_tags - grid $w.options.tags -columnspan 2 -sticky w - grid columnconfigure $w.options 1 -weight 1 - pack $w.options -anchor nw -fill x -pady 5 -padx 5 - - set push_url {} - set push_force 0 - set push_thin 0 - set push_tags 0 - - bind $w <Visibility> "grab $w; focus $w.buttons.create" - bind $w <Key-Escape> "destroy $w" - bind $w <Key-Return> [list start_push_anywhere_action $w] - wm title $w [mc "%s (%s): Push" [appname] [reponame]] - wm deiconify $w - tkwait window $w -} diff --git a/third_party/git/git-gui/lib/win32.tcl b/third_party/git/git-gui/lib/win32.tcl deleted file mode 100644 index db91ab84a56d..000000000000 --- a/third_party/git/git-gui/lib/win32.tcl +++ /dev/null @@ -1,26 +0,0 @@ -# git-gui Misc. native Windows 32 support -# Copyright (C) 2007 Shawn Pearce - -proc win32_read_lnk {lnk_path} { - return [exec cscript.exe \ - /E:jscript \ - /nologo \ - [file join $::oguilib win32_shortcut.js] \ - $lnk_path] -} - -proc win32_create_lnk {lnk_path lnk_exec lnk_dir} { - global oguilib - - set lnk_args [lrange $lnk_exec 1 end] - set lnk_exec [lindex $lnk_exec 0] - - eval [list exec wscript.exe \ - /E:jscript \ - /nologo \ - [file nativename [file join $oguilib win32_shortcut.js]] \ - $lnk_path \ - [file nativename [file join $oguilib git-gui.ico]] \ - $lnk_dir \ - $lnk_exec] $lnk_args -} diff --git a/third_party/git/git-gui/lib/win32_shortcut.js b/third_party/git/git-gui/lib/win32_shortcut.js deleted file mode 100644 index 117923f8860b..000000000000 --- a/third_party/git/git-gui/lib/win32_shortcut.js +++ /dev/null @@ -1,34 +0,0 @@ -// git-gui Windows shortcut support -// Copyright (C) 2007 Shawn Pearce - -var WshShell = WScript.CreateObject("WScript.Shell"); -var argv = WScript.Arguments; -var argi = 0; -var lnk_path = argv.item(argi++); -var ico_path = argi < argv.length ? argv.item(argi++) : undefined; -var dir_path = argi < argv.length ? argv.item(argi++) : undefined; -var lnk_exec = argi < argv.length ? argv.item(argi++) : undefined; -var lnk_args = ''; -while (argi < argv.length) { - var s = argv.item(argi++); - if (lnk_args != '') - lnk_args += ' '; - if (s.indexOf(' ') >= 0) { - lnk_args += '"'; - lnk_args += s; - lnk_args += '"'; - } else { - lnk_args += s; - } -} - -var lnk = WshShell.CreateShortcut(lnk_path); -if (argv.length == 1) { - WScript.echo(lnk.TargetPath); -} else { - lnk.TargetPath = lnk_exec; - lnk.Arguments = lnk_args; - lnk.IconLocation = ico_path + ", 0"; - lnk.WorkingDirectory = dir_path; - lnk.Save(); -} diff --git a/third_party/git/git-gui/macosx/AppMain.tcl b/third_party/git/git-gui/macosx/AppMain.tcl deleted file mode 100644 index b6c6dc35003b..000000000000 --- a/third_party/git/git-gui/macosx/AppMain.tcl +++ /dev/null @@ -1,29 +0,0 @@ -set gitexecdir {@@gitexecdir@@} -if { [info exists ::env(GIT_GUI_LIB_DIR) ] } { - set gitguilib $::env(GIT_GUI_LIB_DIR) -} else { - set gitguilib {@@GITGUI_LIBDIR@@} -} - -set env(PATH) "$gitexecdir:$env(PATH)" - -if {[string first -psn [lindex $argv 0]] == 0} { - lset argv 0 [file join $gitexecdir git-gui] -} - -if {[file tail [lindex $argv 0]] eq {gitk}} { - set argv0 [lindex $argv 0] - set AppMain_source $argv0 -} else { - set argv0 [file join $gitexecdir [file tail [lindex $argv 0]]] - set AppMain_source [file join $gitguilib git-gui.tcl] - if {[info exists env(PWD)]} { - cd $env(PWD) - } elseif {[pwd] eq {/}} { - cd $env(HOME) - } -} - -unset gitexecdir gitguilib -set argv [lrange $argv 1 end] -source $AppMain_source diff --git a/third_party/git/git-gui/macosx/Info.plist b/third_party/git/git-gui/macosx/Info.plist deleted file mode 100644 index 1ade121c4cc5..000000000000 --- a/third_party/git/git-gui/macosx/Info.plist +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>@@GITGUI_TKEXECUTABLE@@</string> - <key>CFBundleGetInfoString</key> - <string>Git Gui @@GITGUI_VERSION@@ © 2006-2007 Shawn Pearce, et. al.</string> - <key>CFBundleIconFile</key> - <string>git-gui.icns</string> - <key>CFBundleIdentifier</key> - <string>cz.or.repo.git-gui</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>Git Gui</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>@@GITGUI_VERSION@@</string> - <key>CFBundleSignature</key> - <string>GITg</string> - <key>CFBundleVersion</key> - <string>@@GITGUI_VERSION@@</string> - <key>NSHighResolutionCapable</key> - <true/> -</dict> -</plist> diff --git a/third_party/git/git-gui/macosx/git-gui.icns b/third_party/git/git-gui/macosx/git-gui.icns deleted file mode 100644 index 77d88a77a766..000000000000 --- a/third_party/git/git-gui/macosx/git-gui.icns +++ /dev/null Binary files differdiff --git a/third_party/git/git-gui/po/.gitignore b/third_party/git/git-gui/po/.gitignore deleted file mode 100644 index a89cf4496990..000000000000 --- a/third_party/git/git-gui/po/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.msg -*~ diff --git a/third_party/git/git-gui/po/README b/third_party/git/git-gui/po/README deleted file mode 100644 index 2514bc22abf4..000000000000 --- a/third_party/git/git-gui/po/README +++ /dev/null @@ -1,251 +0,0 @@ -Localizing git-gui for your language -==================================== - -This short note is to help you, who reads and writes English and your -own language, help us getting git-gui localized for more languages. It -does not try to be a comprehensive manual of GNU gettext, which is the -i18n framework we use, but tries to help you get started by covering the -basics and how it is used in this project. - -1. Getting started. - -You would first need to have a working "git". Your distribution may -have it as "git-core" package (do not get "GNU Interactive Tools" -- -that is a different "git"). You would also need GNU gettext toolchain -to test the resulting translation out. Although you can work on message -translation files with a regular text editor, it is a good idea to have -specialized so-called "po file editors" (e.g. emacs po-mode, KBabel, -poedit, GTranslator --- any of them would work well). Please install -them. - -You would then need to clone the git-gui project repository and create -a feature branch to begin working: - - $ git clone git://repo.or.cz/git-gui.git - $ cd git-gui.git - $ git checkout -b my-translation - -The "git checkout" command creates a new branch to keep your work -isolated and to make it simple to post your patch series when -completed. You will be working on this branch. - - -2. Starting a new language. - -In the git-gui directory is a po/ subdirectory. It has a handful of -files whose names end with ".po". Is there a file that has messages -in your language? - -If you do not know what your language should be named, you need to find -it. This currently follows ISO 639-1 two letter codes: - - http://www.loc.gov/standards/iso639-2/php/code_list.php - -For example, if you are preparing a translation for Afrikaans, the -language code is "af". If there already is a translation for your -language, you do not have to perform any step in this section, but keep -reading, because we are covering the basics. - -If you did not find your language, you would need to start one yourself. -Copy po/git-gui.pot file to po/af.po (replace "af" with the code for -your language). Edit the first several lines to match existing *.po -files to make it clear this is a translation table for git-gui project, -and you are the primary translator. The result of your editing would -look something like this: - - # Translation of git-gui to Afrikaans - # Copyright (C) 2007 Shawn Pearce - # This file is distributed under the same license as the git-gui package. - # YOUR NAME <YOUR@E-MAIL.ADDRESS>, 2007. - # - #, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: git-gui\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-24 22:19+0300\n" - "PO-Revision-Date: 2007-07-25 18:00+0900\n" - "Last-Translator: YOUR NAME <YOUR@E-MAIL.ADDRESS>\n" - "Language-Team: Afrikaans\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - -You will find many pairs of a "msgid" line followed by a "msgstr" line. -These pairs define how messages in git-gui application are translated to -your language. Your primarily job is to fill in the empty double quote -pairs on msgstr lines with the translation of the strings on their -matching msgid lines. A few tips: - - - Control characters, such as newlines, are written in backslash - sequence similar to string literals in the C programming language. - When the string given on a msgid line has such a backslash sequence, - you would typically want to have corresponding ones in the string on - your msgstr line. - - - Some messages contain an optional context indicator at the end, - for example "@@noun" or "@@verb". This indicator allows the - software to select the correct translation depending upon the use. - The indicator is not actually part of the message and will not - be shown to the end-user. - - If your language does not require a different translation you - will still need to translate both messages. - - - Often the messages being translated are format strings given to - "printf()"-like functions. Make sure "%s", "%d", and "%%" in your - translated messages match the original. - - When you have to change the order of words, you can add "<number>$" - between '%' and the conversion ('s', 'd', etc.) to say "<number>-th - parameter to the format string is used at this point". For example, - if the original message is like this: - - "Length is %d, Weight is %d" - - and if for whatever reason your translation needs to say weight first - and then length, you can say something like: - - "WEIGHT IS %2$d, LENGTH IS %1$d" - - A format specification with a '*' (asterisk) refers to *two* arguments - instead of one, hence the succeeding argument number is two higher - instead of one. So, a message like this - - "%s ... %*i of %*i %s (%3i%%)" - - is equivalent to - - "%1$s ... %2$*i of %4$*i %6$s (%7$3i%%)" - - - A long message can be split across multiple lines by ending the - string with a double quote, and starting another string on the next - line with another double quote. They will be concatenated in the - result. For example: - - #: 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 "" - "HERE YOU WILL WRITE YOUR TRANSLATION OF THE ABOVE LONG " - "MESSAGE IN YOUR LANGUAGE." - -You can test your translation by running "make install", which would -create po/af.msg file and installs the result, and then running the -resulting git-gui under your locale: - - $ make install - $ LANG=af git-gui - -There is a trick to test your translation without first installing: - - $ make - $ LANG=af ./git-gui.sh - -When you are satisfied with your translation, commit your changes then submit -your patch series to the maintainer and the Git mailing list: - - $ edit po/af.po - ... be sure to update Last-Translator: and - ... PO-Revision-Date: lines. - $ git add po/af.po - $ git commit -s -m 'git-gui: added Afrikaans translation.' - $ git send-email --to 'git@vger.kernel.org' \ - --cc 'Pat Thoyts <patthoyts@users.sourceforge.net>' \ - --subject 'git-gui: Afrikaans translation' \ - master.. - - -3. Updating your translation. - -There may already be a translation for your language, and you may want -to contribute an update. This may be because you would want to improve -the translation of existing messages, or because the git-gui software -itself was updated and there are new messages that need translation. - -In any case, make sure you are up to date before starting your work: - - $ git checkout master - $ git pull - -In the former case, you will edit po/af.po (again, replace "af" with -your language code), and after testing and updating the Last-Translator: -and PO-Revision-Date: lines, "add/commit/push" as in the previous -section. - -By comparing "POT-Creation-Date:" line in po/git-gui.pot file and -po/af.po file, you can tell if there are new messages that need to be -translated. You would need the GNU gettext package to perform this -step. - - $ msgmerge -U po/af.po po/git-gui.pot - -This updates po/af.po (again, replace "af" with your language -code) so that it contains msgid lines (i.e. the original) that -your translation did not have before. There are a few things to -watch out for: - - - The original text in English of an older message you already - translated might have been changed. You will notice a comment line - that begins with "#, fuzzy" in front of such a message. msgmerge - tool made its best effort to match your old translation with the - message from the updated software, but you may find cases that it - matched your old translated message to a new msgid and the pairing - does not make any sense -- you would need to fix them, and then - remove the "#, fuzzy" line from the message (your fixed translation - of the message will not be used before you remove the marker). - - - New messages added to the software will have msgstr lines with empty - strings. You would need to translate them. - -The po/git-gui.pot file is updated by the internationalization -coordinator from time to time. You _could_ update it yourself, but -translators are discouraged from doing so because we would want all -language teams to be working off of the same version of git-gui.pot. - -**************************************************************** - -This section is a note to the internationalization coordinator, and -translators do not have to worry about it too much. - -The message template file po/git-gui.pot needs to be kept up to date -relative to the software the translations apply to, and it is the -responsibility of the internationalization coordinator. - -When updating po/git-gui.pot file, however, _never_ run "msgmerge -U -po/xx.po" for individual language translations, unless you are absolutely -sure that there is no outstanding work on translation for language xx. -Doing so will create unnecessary merge conflicts and force needless -re-translation on translators. The translator however may not have access -to the msgmerge tool, in which case the coordinator may run it for the -translator as a service. - -But mistakes do happen. Suppose a translation was based on an older -version X, the POT file was updated at version Y and then msgmerge was run -at version Z for the language, and the translator sent in a patch based on -version X: - - ? translated - / - ---X---Y---Z (master) - -The coordinator could recover from such a mistake by first applying the -patch to X, replace the translated file in Z, and then running msgmerge -again based on the updated POT file and commit the result. The sequence -would look like this: - - $ git checkout X - $ git am -s xx.patch - $ git checkout master - $ git checkout HEAD@{1} po/xx.po - $ msgmerge -U po/xx.po po/git-gui.pot - $ git commit -c HEAD@{1} po/xx.po - -State in the message that the translated messages are based on a slightly -older version, and msgmerge was run to incorporate changes to message -templates from the updated POT file. The result needs to be further -translated, but at least the messages that were updated by the patch that -were not changed by the POT update will survive the process and do not -need to be re-translated. diff --git a/third_party/git/git-gui/po/bg.po b/third_party/git/git-gui/po/bg.po deleted file mode 100644 index 5af78f15a86d..000000000000 --- a/third_party/git/git-gui/po/bg.po +++ /dev/null @@ -1,2807 +0,0 @@ -# Bulgarian translation of git-gui po-file. -# Copyright (C) 2012, 2013, 2014, 2015, 2016 Alexander Shopov <ash@kambanaria.org>. -# This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2012, 2013, 2014, 2015, 2016. -# -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 15:16+0300\n" -"PO-Revision-Date: 2016-10-13 15:16+0300\n" -"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" -"Language-Team: Bulgarian <dict@fsa-bg.org>\n" -"Language: bg\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:865 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Указан е неправилен шрифт в „%s“:" - -#: git-gui.sh:919 -msgid "Main Font" -msgstr "Основен шрифт" - -#: git-gui.sh:920 -msgid "Diff/Console Font" -msgstr "Шрифт за разликите/конзолата" - -#: git-gui.sh:935 git-gui.sh:949 git-gui.sh:962 git-gui.sh:1052 git-gui.sh:1071 -#: git-gui.sh:3147 -msgid "git-gui: fatal error" -msgstr "git-gui: фатална грешка" - -#: git-gui.sh:936 -msgid "Cannot find git in PATH." -msgstr "Командата git липсва в пътя (PATH)." - -#: git-gui.sh:963 -msgid "Cannot parse Git version string:" -msgstr "Низът с версията на Git не може да бъде интерпретиран:" - -#: git-gui.sh:988 -#, 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“ изисква Git, версия поне 1.5.0.\n" -"\n" -"Да се приеме ли, че „%s“ е версия „1.5.0“?\n" - -#: git-gui.sh:1285 -msgid "Git directory not found:" -msgstr "Директорията на Git не е открита:" - -#: git-gui.sh:1319 -msgid "Cannot move to top of working directory:" -msgstr "Не може да се премине към родителската директория." - -#: git-gui.sh:1327 -msgid "Cannot use bare repository:" -msgstr "Голо хранилище не може да се използва:" - -#: git-gui.sh:1335 -msgid "No working directory" -msgstr "Работната директория липсва" - -#: git-gui.sh:1507 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Обновяване на състоянието на файла…" - -#: git-gui.sh:1567 -msgid "Scanning for modified files ..." -msgstr "Проверка за променени файлове…" - -#: git-gui.sh:1645 -msgid "Calling prepare-commit-msg hook..." -msgstr "Куката „prepare-commit-msg“ се изпълнява в момента…" - -#: git-gui.sh:1662 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "Подаването е отхвърлено от куката „prepare-commit-msg“." - -#: git-gui.sh:1820 lib/browser.tcl:252 -msgid "Ready." -msgstr "Готово." - -#: git-gui.sh:1984 -#, tcl-format -msgid "" -"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." -msgstr "" -"Достигнат е максималният размер на списъка за извеждане(gui." -"maxfilesdisplayed = %s), съответно не са показани всички %s файла." - -#: git-gui.sh:2107 -msgid "Unmodified" -msgstr "Непроменен" - -#: git-gui.sh:2109 -msgid "Modified, not staged" -msgstr "Променен, но не е в индекса" - -#: git-gui.sh:2110 git-gui.sh:2122 -msgid "Staged for commit" -msgstr "В индекса за подаване" - -#: git-gui.sh:2111 git-gui.sh:2123 -msgid "Portions staged for commit" -msgstr "Части са в индекса за подаване" - -#: git-gui.sh:2112 git-gui.sh:2124 -msgid "Staged for commit, missing" -msgstr "В индекса за подаване, но липсва" - -#: git-gui.sh:2114 -msgid "File type changed, not staged" -msgstr "Видът на файла е сменен, но не е в индекса" - -#: git-gui.sh:2115 git-gui.sh:2116 -msgid "File type changed, old type staged for commit" -msgstr "Видът на файла е сменен, но новият вид не е в индекса" - -#: git-gui.sh:2117 -msgid "File type changed, staged" -msgstr "Видът на файла е сменен и е в индекса" - -#: git-gui.sh:2118 -msgid "File type change staged, modification not staged" -msgstr "Видът на файла е сменен в индекса, но не и съдържанието" - -#: git-gui.sh:2119 -msgid "File type change staged, file missing" -msgstr "Видът на файла е сменен в индекса, но файлът липсва" - -#: git-gui.sh:2121 -msgid "Untracked, not staged" -msgstr "Неследен" - -#: git-gui.sh:2126 -msgid "Missing" -msgstr "Липсващ" - -#: git-gui.sh:2127 -msgid "Staged for removal" -msgstr "В индекса за изтриване" - -#: git-gui.sh:2128 -msgid "Staged for removal, still present" -msgstr "В индекса за изтриване, но още го има" - -#: git-gui.sh:2130 git-gui.sh:2131 git-gui.sh:2132 git-gui.sh:2133 -#: git-gui.sh:2134 git-gui.sh:2135 -msgid "Requires merge resolution" -msgstr "Изисква коригиране при сливане" - -#: git-gui.sh:2170 -msgid "Starting gitk... please wait..." -msgstr "Стартиране на „gitk“…, изчакайте…" - -#: git-gui.sh:2182 -msgid "Couldn't find gitk in PATH" -msgstr "Командата „gitk“ липсва в пътищата, определени от променливата PATH." - -#: git-gui.sh:2241 -msgid "Couldn't find git gui in PATH" -msgstr "" -"Командата „git gui“ липсва в пътищата, определени от променливата PATH." - -#: git-gui.sh:2676 lib/choose_repository.tcl:41 -msgid "Repository" -msgstr "Хранилище" - -#: git-gui.sh:2677 -msgid "Edit" -msgstr "Редактиране" - -#: git-gui.sh:2679 lib/choose_rev.tcl:567 -msgid "Branch" -msgstr "Клон" - -#: git-gui.sh:2682 lib/choose_rev.tcl:554 -msgid "Commit@@noun" -msgstr "Подаване" - -#: git-gui.sh:2685 lib/merge.tcl:127 lib/merge.tcl:174 -msgid "Merge" -msgstr "Сливане" - -#: git-gui.sh:2686 lib/choose_rev.tcl:563 -msgid "Remote" -msgstr "Отдалечено хранилище" - -#: git-gui.sh:2689 -msgid "Tools" -msgstr "Команди" - -#: git-gui.sh:2698 -msgid "Explore Working Copy" -msgstr "Разглеждане на работното копие" - -#: git-gui.sh:2704 -msgid "Git Bash" -msgstr "Bash за Git" - -#: git-gui.sh:2714 -msgid "Browse Current Branch's Files" -msgstr "Разглеждане на файловете в текущия клон" - -#: git-gui.sh:2718 -msgid "Browse Branch Files..." -msgstr "Разглеждане на текущия клон…" - -#: git-gui.sh:2723 -msgid "Visualize Current Branch's History" -msgstr "Визуализация на историята на текущия клон" - -#: git-gui.sh:2727 -msgid "Visualize All Branch History" -msgstr "Визуализация на историята на всички клонове" - -#: git-gui.sh:2734 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Разглеждане на файловете в „%s“" - -#: git-gui.sh:2736 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Визуализация на историята на „%s“" - -#: git-gui.sh:2741 lib/database.tcl:40 -msgid "Database Statistics" -msgstr "Статистика на базата от данни" - -#: git-gui.sh:2744 lib/database.tcl:33 -msgid "Compress Database" -msgstr "Компресиране на базата от данни" - -#: git-gui.sh:2747 -msgid "Verify Database" -msgstr "Проверка на базата от данни" - -#: git-gui.sh:2754 git-gui.sh:2758 git-gui.sh:2762 -msgid "Create Desktop Icon" -msgstr "Добавяне на икона на работния плот" - -#: git-gui.sh:2770 lib/choose_repository.tcl:193 lib/choose_repository.tcl:201 -msgid "Quit" -msgstr "Спиране на програмата" - -#: git-gui.sh:2778 -msgid "Undo" -msgstr "Отмяна" - -#: git-gui.sh:2781 -msgid "Redo" -msgstr "Повторение" - -#: git-gui.sh:2785 git-gui.sh:3399 -msgid "Cut" -msgstr "Отрязване" - -#: git-gui.sh:2788 git-gui.sh:3402 git-gui.sh:3476 git-gui.sh:3562 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Копиране" - -#: git-gui.sh:2791 git-gui.sh:3405 -msgid "Paste" -msgstr "Поставяне" - -#: git-gui.sh:2794 git-gui.sh:3408 lib/branch_delete.tcl:28 -#: lib/remote_branch_delete.tcl:39 -msgid "Delete" -msgstr "Изтриване" - -#: git-gui.sh:2798 git-gui.sh:3412 git-gui.sh:3566 lib/console.tcl:71 -msgid "Select All" -msgstr "Избиране на всичко" - -#: git-gui.sh:2807 -msgid "Create..." -msgstr "Създаване…" - -#: git-gui.sh:2813 -msgid "Checkout..." -msgstr "Изтегляне…" - -#: git-gui.sh:2819 -msgid "Rename..." -msgstr "Преименуване…" - -#: git-gui.sh:2824 -msgid "Delete..." -msgstr "Изтриване…" - -#: git-gui.sh:2829 -msgid "Reset..." -msgstr "Отмяна на промените…" - -#: git-gui.sh:2839 -msgid "Done" -msgstr "Готово" - -#: git-gui.sh:2841 -msgid "Commit@@verb" -msgstr "Подаване" - -#: git-gui.sh:2850 git-gui.sh:3335 -msgid "New Commit" -msgstr "Ново подаване" - -#: git-gui.sh:2858 git-gui.sh:3342 -msgid "Amend Last Commit" -msgstr "Поправяне на последното подаване" - -#: git-gui.sh:2868 git-gui.sh:3296 lib/remote_branch_delete.tcl:101 -msgid "Rescan" -msgstr "Обновяване" - -#: git-gui.sh:2874 -msgid "Stage To Commit" -msgstr "Към индекса за подаване" - -#: git-gui.sh:2880 -msgid "Stage Changed Files To Commit" -msgstr "Всички променени файлове към индекса за подаване" - -#: git-gui.sh:2886 -msgid "Unstage From Commit" -msgstr "Изваждане от индекса за подаване" - -#: git-gui.sh:2892 lib/index.tcl:442 -msgid "Revert Changes" -msgstr "Връщане на оригинала" - -#: git-gui.sh:2900 git-gui.sh:3613 git-gui.sh:3644 -msgid "Show Less Context" -msgstr "По-малко контекст" - -#: git-gui.sh:2904 git-gui.sh:3617 git-gui.sh:3648 -msgid "Show More Context" -msgstr "Повече контекст" - -#: git-gui.sh:2911 git-gui.sh:3309 git-gui.sh:3423 -msgid "Sign Off" -msgstr "Подписване" - -#: git-gui.sh:2927 -msgid "Local Merge..." -msgstr "Локално сливане…" - -#: git-gui.sh:2932 -msgid "Abort Merge..." -msgstr "Преустановяване на сливане…" - -#: git-gui.sh:2944 git-gui.sh:2972 -msgid "Add..." -msgstr "Добавяне…" - -#: git-gui.sh:2948 -msgid "Push..." -msgstr "Изтласкване…" - -#: git-gui.sh:2952 -msgid "Delete Branch..." -msgstr "Изтриване на клон…" - -#: git-gui.sh:2962 git-gui.sh:3595 -msgid "Options..." -msgstr "Опции…" - -#: git-gui.sh:2973 -msgid "Remove..." -msgstr "Премахване…" - -#: git-gui.sh:2982 lib/choose_repository.tcl:55 -msgid "Help" -msgstr "Помощ" - -#: git-gui.sh:2986 git-gui.sh:2990 lib/about.tcl:14 -#: lib/choose_repository.tcl:49 lib/choose_repository.tcl:58 -#, tcl-format -msgid "About %s" -msgstr "Относно %s" - -#: git-gui.sh:3014 -msgid "Online Documentation" -msgstr "Документация в Интернет" - -#: git-gui.sh:3017 lib/choose_repository.tcl:52 lib/choose_repository.tcl:61 -msgid "Show SSH Key" -msgstr "Показване на ключа за SSH" - -#: git-gui.sh:3032 git-gui.sh:3164 -msgid "usage:" -msgstr "употреба:" - -#: git-gui.sh:3036 git-gui.sh:3168 -msgid "Usage" -msgstr "Употреба" - -#: git-gui.sh:3117 lib/blame.tcl:573 -msgid "Error" -msgstr "Грешка" - -#: git-gui.sh:3148 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"ФАТАЛНА ГРЕШКА: пътят %s не може да бъде открит: такъв файл или директория " -"няма" - -#: git-gui.sh:3181 -msgid "Current Branch:" -msgstr "Текущ клон:" - -#: git-gui.sh:3206 -msgid "Unstaged Changes" -msgstr "Промени извън индекса" - -#: git-gui.sh:3228 -msgid "Staged Changes (Will Commit)" -msgstr "Промени в индекса (за подаване)" - -#: git-gui.sh:3302 -msgid "Stage Changed" -msgstr "Индексът е променен" - -#: git-gui.sh:3321 lib/transport.tcl:137 -msgid "Push" -msgstr "Изтласкване" - -#: git-gui.sh:3356 -msgid "Initial Commit Message:" -msgstr "Първоначално съобщение при подаване:" - -#: git-gui.sh:3357 -msgid "Amended Commit Message:" -msgstr "Поправено съобщение при подаване:" - -#: git-gui.sh:3358 -msgid "Amended Initial Commit Message:" -msgstr "Поправено първоначално съобщение при подаване:" - -#: git-gui.sh:3359 -msgid "Amended Merge Commit Message:" -msgstr "Поправено съобщение при подаване със сливане:" - -#: git-gui.sh:3360 -msgid "Merge Commit Message:" -msgstr "Съобщение при подаване със сливане:" - -#: git-gui.sh:3361 -msgid "Commit Message:" -msgstr "Съобщение при подаване:" - -#: git-gui.sh:3415 git-gui.sh:3570 lib/console.tcl:73 -msgid "Copy All" -msgstr "Копиране на всичко" - -#: git-gui.sh:3439 lib/blame.tcl:105 -msgid "File:" -msgstr "Файл:" - -#: git-gui.sh:3558 -msgid "Refresh" -msgstr "Обновяване" - -#: git-gui.sh:3579 -msgid "Decrease Font Size" -msgstr "По-едър шрифт" - -#: git-gui.sh:3583 -msgid "Increase Font Size" -msgstr "По-дребен шрифт" - -#: git-gui.sh:3591 lib/blame.tcl:294 -msgid "Encoding" -msgstr "Кодиране" - -#: git-gui.sh:3602 -msgid "Apply/Reverse Hunk" -msgstr "Прилагане/връщане на парче" - -#: git-gui.sh:3607 -msgid "Apply/Reverse Line" -msgstr "Прилагане/връщане на ред" - -#: git-gui.sh:3626 -msgid "Run Merge Tool" -msgstr "Изпълнение на програмата за сливане" - -#: git-gui.sh:3631 -msgid "Use Remote Version" -msgstr "Версия от отдалеченото хранилище" - -#: git-gui.sh:3635 -msgid "Use Local Version" -msgstr "Локална версия" - -#: git-gui.sh:3639 -msgid "Revert To Base" -msgstr "Връщане към родителската версия" - -#: git-gui.sh:3657 -msgid "Visualize These Changes In The Submodule" -msgstr "Визуализиране на промените в подмодула" - -#: git-gui.sh:3661 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Визуализация на историята на текущия клон в историята за подмодула" - -#: git-gui.sh:3665 -msgid "Visualize All Branch History In The Submodule" -msgstr "Визуализация на историята на всички клони в историята за подмодула" - -#: git-gui.sh:3670 -msgid "Start git gui In The Submodule" -msgstr "Стартиране на „git gui“ за подмодула" - -#: git-gui.sh:3705 -msgid "Unstage Hunk From Commit" -msgstr "Изваждане на парчето от подаването" - -#: git-gui.sh:3707 -msgid "Unstage Lines From Commit" -msgstr "Изваждане на редовете от подаването" - -#: git-gui.sh:3709 -msgid "Unstage Line From Commit" -msgstr "Изваждане на реда от подаването" - -#: git-gui.sh:3712 -msgid "Stage Hunk For Commit" -msgstr "Добавяне на парчето за подаване" - -#: git-gui.sh:3714 -msgid "Stage Lines For Commit" -msgstr "Добавяне на редовете за подаване" - -#: git-gui.sh:3716 -msgid "Stage Line For Commit" -msgstr "Добавяне на реда за подаване" - -#: git-gui.sh:3741 -msgid "Initializing..." -msgstr "Инициализиране…" - -#: git-gui.sh:3886 -#, 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" -"Най-вероятно следните променливи няма да бъдат\n" -"взети под внимание от подпроцесите на Git\n" -"от %s:\n" -"\n" - -#: git-gui.sh:3915 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Това е познат проблем и се дължи на\n" -"версията на Tcl включена в Cygwin." - -#: git-gui.sh:3920 -#, 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" -"Добър заместител на „%s“\n" -"е да поставите настройките „user.name“ и\n" -"„user.email“ в личния си файл „~/.gitconfig“.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui — графичен интерфейс за Git." - -#: lib/blame.tcl:73 -#, tcl-format -msgid "%s (%s): File Viewer" -msgstr "%s (%s): Преглед на файлове" - -#: lib/blame.tcl:79 -msgid "Commit:" -msgstr "Подаване:" - -#: lib/blame.tcl:280 -msgid "Copy Commit" -msgstr "Копиране на подаване" - -#: lib/blame.tcl:284 -msgid "Find Text..." -msgstr "Търсене на текст…" - -#: lib/blame.tcl:288 -msgid "Goto Line..." -msgstr "Към ред…" - -#: lib/blame.tcl:297 -msgid "Do Full Copy Detection" -msgstr "Пълно търсене на копиране" - -#: lib/blame.tcl:301 -msgid "Show History Context" -msgstr "Показване на контекста от историята" - -#: lib/blame.tcl:304 -msgid "Blame Parent Commit" -msgstr "Анотиране на родителското подаване" - -#: lib/blame.tcl:466 -#, tcl-format -msgid "Reading %s..." -msgstr "Чете се „%s“…" - -#: lib/blame.tcl:594 -msgid "Loading copy/move tracking annotations..." -msgstr "Зареждане на анотациите за проследяване на копирането/преместването…" - -#: lib/blame.tcl:614 -msgid "lines annotated" -msgstr "реда анотирани" - -#: lib/blame.tcl:806 -msgid "Loading original location annotations..." -msgstr "Зареждане на анотациите за първоначалното местоположение…" - -#: lib/blame.tcl:809 -msgid "Annotation complete." -msgstr "Анотирането завърши." - -#: lib/blame.tcl:839 -msgid "Busy" -msgstr "Операцията не е завършила" - -#: lib/blame.tcl:840 -msgid "Annotation process is already running." -msgstr "В момента тече процес на анотиране." - -#: lib/blame.tcl:879 -msgid "Running thorough copy detection..." -msgstr "Изпълнява се цялостен процес на откриване на копиране…" - -#: lib/blame.tcl:947 -msgid "Loading annotation..." -msgstr "Зареждане на анотации…" - -#: lib/blame.tcl:1000 -msgid "Author:" -msgstr "Автор:" - -#: lib/blame.tcl:1004 -msgid "Committer:" -msgstr "Подал:" - -#: lib/blame.tcl:1009 -msgid "Original File:" -msgstr "Първоначален файл:" - -#: lib/blame.tcl:1057 -msgid "Cannot find HEAD commit:" -msgstr "Подаването за връх „HEAD“ не може да се открие:" - -#: lib/blame.tcl:1112 -msgid "Cannot find parent commit:" -msgstr "Родителското подаване не може да бъде открито" - -#: lib/blame.tcl:1127 -msgid "Unable to display parent" -msgstr "Родителят не може да бъде показан" - -#: lib/blame.tcl:1128 lib/diff.tcl:358 -msgid "Error loading diff:" -msgstr "Грешка при зареждане на разлика:" - -#: lib/blame.tcl:1269 -msgid "Originally By:" -msgstr "Първоначално от:" - -#: lib/blame.tcl:1275 -msgid "In File:" -msgstr "Във файл:" - -#: lib/blame.tcl:1280 -msgid "Copied Or Moved Here By:" -msgstr "Копирано или преместено тук от:" - -#: lib/branch_checkout.tcl:16 -#, tcl-format -msgid "%s (%s): Checkout Branch" -msgstr "%s (%s): Клон за изтегляне" - -#: lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "Клон за изтегляне" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "Изтегляне" - -#: lib/branch_checkout.tcl:30 lib/branch_create.tcl:37 lib/branch_delete.tcl:34 -#: lib/branch_rename.tcl:32 lib/browser.tcl:292 lib/checkout_op.tcl:579 -#: lib/choose_font.tcl:45 lib/merge.tcl:178 lib/option.tcl:127 -#: lib/remote_add.tcl:34 lib/remote_branch_delete.tcl:43 lib/tools_dlg.tcl:41 -#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/transport.tcl:141 -msgid "Cancel" -msgstr "Отказване" - -#: lib/branch_checkout.tcl:35 lib/browser.tcl:297 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "Версия" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:69 lib/option.tcl:310 -msgid "Options" -msgstr "Опции" - -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Изтегляне на промените от следения клон" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "Изтриване от локалния клон" - -#: lib/branch_create.tcl:23 -#, tcl-format -msgid "%s (%s): Create Branch" -msgstr "%s (%s): Създаване на клон" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "Създаване на нов клон" - -#: lib/branch_create.tcl:33 lib/choose_repository.tcl:407 -msgid "Create" -msgstr "Създаване" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "Име на клона" - -#: lib/branch_create.tcl:44 lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 -msgid "Name:" -msgstr "Име:" - -#: lib/branch_create.tcl:57 -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:571 -msgid "Reset" -msgstr "Отначало" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Преминаване към клона след създаването му" - -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "Изберете клон за следени." - -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Следящият клон — „%s“, не съществува в отдалеченото хранилище." - -#: lib/branch_create.tcl:154 lib/branch_rename.tcl:92 -msgid "Please supply a branch name." -msgstr "Дайте име на клона." - -#: lib/branch_create.tcl:165 lib/branch_rename.tcl:112 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "„%s“ не може да се използва за име на клон." - -#: lib/branch_delete.tcl:16 -#, tcl-format -msgid "%s (%s): Delete Branch" -msgstr "%s (%s): Изтриване на клон" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "Изтриване на локален клон" - -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "Локални клони" - -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "Изтриване, само ако промените са слети и другаде" - -#: lib/branch_delete.tcl:53 lib/remote_branch_delete.tcl:120 -msgid "Always (Do not perform merge checks)" -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 lib/remote_branch_delete.tcl:218 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Възстановяването на изтрити клони може да е трудно.\n" -"\n" -"Сигурни ли сте, че искате да триете?" - -#: lib/branch_delete.tcl:131 -#, tcl-format -msgid " - %s:" -msgstr " — „%s:“" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Неуспешно триене на клони:\n" -"%s" - -#: lib/branch_rename.tcl:15 -#, tcl-format -msgid "%s (%s): Rename Branch" -msgstr "%s (%s): Преименуване на клон" - -#: lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "Преименуване на клон" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "Преименуване" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "Клон:" - -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "Ново име:" - -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "Изберете клон за преименуване." - -#: lib/branch_rename.tcl:102 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Клонът „%s“ вече съществува." - -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Неуспешно преименуване на „%s“." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Стартиране…" - -#: lib/browser.tcl:27 -#, tcl-format -msgid "%s (%s): File Browser" -msgstr "%s (%s): Файлов браузър" - -#: lib/browser.tcl:132 lib/browser.tcl:149 -#, tcl-format -msgid "Loading %s..." -msgstr "Зареждане на „%s“…" - -#: lib/browser.tcl:193 -msgid "[Up To Parent]" -msgstr "[Към родителя]" - -#: lib/browser.tcl:275 -#, tcl-format -msgid "%s (%s): Browse Branch Files" -msgstr "%s (%s): Разглеждане на файловете в клона" - -#: lib/browser.tcl:282 -msgid "Browse Branch Files" -msgstr "Разглеждане на файловете в клона" - -#: lib/browser.tcl:288 lib/choose_repository.tcl:422 -#: lib/choose_repository.tcl:509 lib/choose_repository.tcl:518 -#: lib/choose_repository.tcl:1074 -msgid "Browse" -msgstr "Разглеждане" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Доставяне на „%s“ от „%s“" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "фатална грешка: „%s“ не може да се открие" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:30 -#: lib/sshkey.tcl:55 -msgid "Close" -msgstr "Затваряне" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Клонът „%s“ не съществува." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Неуспешно настройване на опростен git-pull за „%s“." - -#: lib/checkout_op.tcl:229 -#, 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:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Стратегия за сливане „%s“ не се поддържа." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Неуспешно обновяване на „%s“." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "Индексът вече е заключен." - -#: lib/checkout_op.tcl:289 -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:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Работната директория се привежда към „%s“…" - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "файла са изтеглени" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "" -"Преустановяване на изтеглянето на „%s“ (необходимо е пофайлово сливане)." - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Необходимо е пофайлово сливане." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Оставане върху клона „%s“." - -#: lib/checkout_op.tcl:452 -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:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "„%s“ е изтеглен." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "" -"Зануляването на „%s“ към „%s“ ще доведе до загубването на следните подавания:" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Възстановяването на загубените подавания може да е трудно." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Зануляване на „%s“?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:170 lib/tools_dlg.tcl:336 -msgid "Visualize" -msgstr "Визуализация" - -#: lib/checkout_op.tcl:635 -#, 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" -"\n" -"Това състояние е аварийно и не трябва да се случва. Програмата „%s“ ще " -"преустанови работа." - -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "Избор" - -#: lib/choose_font.tcl:55 -msgid "Font Family" -msgstr "Шрифт" - -#: lib/choose_font.tcl:76 -msgid "Font Size" -msgstr "Размер" - -#: lib/choose_font.tcl:93 -msgid "Font Example" -msgstr "Мостра" - -#: lib/choose_font.tcl:105 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Това е примерен текст.\n" -"Ако ви харесва как изглежда, изберете шрифта." - -#: lib/choose_repository.tcl:33 -msgid "Git Gui" -msgstr "ГПИ на Git" - -#: lib/choose_repository.tcl:92 lib/choose_repository.tcl:412 -msgid "Create New Repository" -msgstr "Създаване на ново хранилище" - -#: lib/choose_repository.tcl:98 -msgid "New..." -msgstr "Ново…" - -#: lib/choose_repository.tcl:105 lib/choose_repository.tcl:496 -msgid "Clone Existing Repository" -msgstr "Клониране на съществуващо хранилище" - -#: lib/choose_repository.tcl:116 -msgid "Clone..." -msgstr "Клониране…" - -#: lib/choose_repository.tcl:123 lib/choose_repository.tcl:1064 -msgid "Open Existing Repository" -msgstr "Отваряне на съществуващо хранилище" - -#: lib/choose_repository.tcl:129 -msgid "Open..." -msgstr "Отваряне…" - -#: lib/choose_repository.tcl:142 -msgid "Recent Repositories" -msgstr "Скоро ползвани" - -#: lib/choose_repository.tcl:148 -msgid "Open Recent Repository:" -msgstr "Отваряне на хранилище ползвано наскоро:" - -#: lib/choose_repository.tcl:316 lib/choose_repository.tcl:323 -#: lib/choose_repository.tcl:330 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Неуспешно създаване на хранилището „%s“:" - -#: lib/choose_repository.tcl:417 -msgid "Directory:" -msgstr "Директория:" - -#: lib/choose_repository.tcl:447 lib/choose_repository.tcl:573 -#: lib/choose_repository.tcl:1098 -msgid "Git Repository" -msgstr "Хранилище на Git" - -#: lib/choose_repository.tcl:472 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Вече съществува директория „%s“." - -#: lib/choose_repository.tcl:476 -#, tcl-format -msgid "File %s already exists." -msgstr "Вече съществува файл „%s“." - -#: lib/choose_repository.tcl:491 -msgid "Clone" -msgstr "Клониране" - -#: lib/choose_repository.tcl:504 -msgid "Source Location:" -msgstr "Адрес на източника:" - -#: lib/choose_repository.tcl:513 -msgid "Target Directory:" -msgstr "Целева директория:" - -#: lib/choose_repository.tcl:523 -msgid "Clone Type:" -msgstr "Вид клониране:" - -#: lib/choose_repository.tcl:528 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Стандартно (бързо, частично споделяне на файлове, твърди връзки)" - -#: lib/choose_repository.tcl:533 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Пълно (бавно, пълноценно резервно копие)" - -#: lib/choose_repository.tcl:538 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Споделено (най-бързо, не се препоръчва, не прави резервно копие)" - -#: lib/choose_repository.tcl:545 -msgid "Recursively clone submodules too" -msgstr "Рекурсивно клониране и на подмодулите" - -#: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626 -#: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842 -#: lib/choose_repository.tcl:1104 lib/choose_repository.tcl:1112 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Това не е хранилище на Git: %s" - -#: lib/choose_repository.tcl:615 -msgid "Standard only available for local repository." -msgstr "Само локални хранилища могат да се клонират стандартно" - -#: lib/choose_repository.tcl:619 -msgid "Shared only available for local repository." -msgstr "Само локални хранилища могат да се клонират споделено" - -#: lib/choose_repository.tcl:640 -#, tcl-format -msgid "Location %s already exists." -msgstr "Местоположението „%s“ вече съществува." - -#: lib/choose_repository.tcl:651 -msgid "Failed to configure origin" -msgstr "Неуспешно настройване на хранилището-източник" - -#: lib/choose_repository.tcl:663 -msgid "Counting objects" -msgstr "Преброяване на обекти" - -#: lib/choose_repository.tcl:664 -msgid "buckets" -msgstr "клетки" - -#: lib/choose_repository.tcl:688 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Обектите/информацията/синонимите не могат да бъдат копирани: %s" - -#: lib/choose_repository.tcl:724 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Няма какво да се клонира от „%s“." - -#: lib/choose_repository.tcl:726 lib/choose_repository.tcl:940 -#: lib/choose_repository.tcl:952 -msgid "The 'master' branch has not been initialized." -msgstr "Основният клон — „master“ не е инициализиран." - -#: lib/choose_repository.tcl:739 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Не се поддържат твърди връзки. Преминава се към копиране." - -#: lib/choose_repository.tcl:751 -#, tcl-format -msgid "Cloning from %s" -msgstr "Клониране на „%s“" - -#: lib/choose_repository.tcl:782 -msgid "Copying objects" -msgstr "Копиране на обекти" - -#: lib/choose_repository.tcl:783 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:807 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Неуспешно копиране на обект: %s" - -#: lib/choose_repository.tcl:817 -msgid "Linking objects" -msgstr "Създаване на връзки към обектите" - -#: lib/choose_repository.tcl:818 -msgid "objects" -msgstr "обекти" - -#: lib/choose_repository.tcl:826 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Неуспешно създаване на твърда връзка към обект: %s" - -#: lib/choose_repository.tcl:881 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Клоните и обектите не могат да бъдат изтеглени. За повече информация " -"погледнете изхода на конзолата." - -#: lib/choose_repository.tcl:892 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Етикетите не могат да бъдат изтеглени. За повече информация погледнете " -"изхода на конзолата." - -#: lib/choose_repository.tcl:916 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Върхът „HEAD“ не може да бъде определен. За повече информация погледнете " -"изхода на конзолата." - -#: lib/choose_repository.tcl:925 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "„%s“ не може да се зачисти" - -#: lib/choose_repository.tcl:931 -msgid "Clone failed." -msgstr "Неуспешно клониране." - -#: lib/choose_repository.tcl:938 -msgid "No default branch obtained." -msgstr "Не е получен клон по подразбиране." - -#: lib/choose_repository.tcl:949 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Няма подаване отговарящо на „%s“." - -#: lib/choose_repository.tcl:961 -msgid "Creating working directory" -msgstr "Създаване на работната директория" - -#: lib/choose_repository.tcl:962 lib/index.tcl:70 lib/index.tcl:136 -#: lib/index.tcl:207 -msgid "files" -msgstr "файлове" - -#: lib/choose_repository.tcl:981 -msgid "Cannot clone submodules." -msgstr "Подмодулите не могат да се клонират." - -#: lib/choose_repository.tcl:990 -msgid "Cloning submodules" -msgstr "Клониране на подмодули" - -#: lib/choose_repository.tcl:1015 -msgid "Initial file checkout failed." -msgstr "Неуспешно първоначално изтегляне." - -#: lib/choose_repository.tcl:1059 -msgid "Open" -msgstr "Отваряне" - -#: lib/choose_repository.tcl:1069 -msgid "Repository:" -msgstr "Хранилище:" - -#: lib/choose_repository.tcl:1118 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Неуспешно отваряне на хранилището „%s“:" - -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" -msgstr "Това несвързано изтегляне" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Израз за версия:" - -#: lib/choose_rev.tcl:72 -msgid "Local Branch" -msgstr "Локален клон" - -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" -msgstr "Следящ клон" - -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 -msgid "Tag" -msgstr "Етикет" - -#: lib/choose_rev.tcl:321 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Неправилна версия: %s" - -#: lib/choose_rev.tcl:342 -msgid "No revision selected." -msgstr "Не е избрана версия." - -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." -msgstr "Изразът за версия е празен." - -#: lib/choose_rev.tcl:537 -msgid "Updated" -msgstr "Обновен" - -#: lib/choose_rev.tcl:565 -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 "" -"Няма какво да се поправи.\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:48 -msgid "Error loading commit data for amend:" -msgstr "Грешка при зареждане на данните от подаване, които да се поправят:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Идентификацията ви не може да бъде определена:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Неправилно поле „GIT_COMMITTER_IDENT“:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "предупреждение: Tcl не поддържа кодирането „%s“." - -#: lib/commit.tcl:149 -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:173 -#, 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:181 -#, 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:189 -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:204 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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:235 -msgid "Calling pre-commit hook..." -msgstr "Изпълняване на куката преди подаване…" - -#: lib/commit.tcl:250 -msgid "Commit declined by pre-commit hook." -msgstr "Подаването е отхвърлено от куката преди подаване." - -#: lib/commit.tcl:269 -msgid "" -"You are about to commit on a detached head. This is a potentially dangerous " -"thing to do because if you switch to another branch you will lose your " -"changes and it can be difficult to retrieve them later from the reflog. You " -"should probably cancel this commit and create a new branch to continue.\n" -" \n" -" Do you really want to proceed with your Commit?" -msgstr "" -"Ще подадете към несвързан, отделѐн указател „HEAD“. Това е опасно, защото " -"при преминаването към клон ще загубите промените си, като единственият начин " -"да ги върнете ще е чрез журнала на указателите (reflog). Най-вероятно трябва " -"да не правите това подаване, а да създадете нов клон, преди да продължите.\n" -" \n" -"Сигурни ли сте, че искате да извършите текущото подаване?" - -#: lib/commit.tcl:290 -msgid "Calling commit-msg hook..." -msgstr "Изпълняване на куката за съобщението при подаване…" - -#: lib/commit.tcl:305 -msgid "Commit declined by commit-msg hook." -msgstr "Подаването е отхвърлено от куката за съобщението при подаване." - -#: lib/commit.tcl:318 -msgid "Committing changes..." -msgstr "Подаване на промените…" - -#: lib/commit.tcl:334 -msgid "write-tree failed:" -msgstr "неуспешно запазване на дървото (write-tree):" - -#: lib/commit.tcl:335 lib/commit.tcl:382 lib/commit.tcl:403 -msgid "Commit failed." -msgstr "Неуспешно подаване." - -#: lib/commit.tcl:352 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Подаването „%s“ изглежда повредено" - -#: lib/commit.tcl:357 -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:364 -msgid "No changes to commit." -msgstr "Няма промени за подаване." - -#: lib/commit.tcl:381 -msgid "commit-tree failed:" -msgstr "неуспешно подаване на дървото (commit-tree):" - -#: lib/commit.tcl:402 -msgid "update-ref failed:" -msgstr "неуспешно обновяване на указателите (update-ref):" - -#: lib/commit.tcl:495 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Успешно подаване %s: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "В момента се извършва действие, изчакайте…" - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Успех" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Грешка: неуспешно изпълнение на команда" - -#: lib/database.tcl:42 -msgid "Number of loose objects" -msgstr "Брой непакетирани обекти" - -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" -msgstr "Дисково пространство заето от непакетирани обекти" - -#: lib/database.tcl:44 -msgid "Number of packed objects" -msgstr "Брой пакетирани обекти" - -#: lib/database.tcl:45 -msgid "Number of packs" -msgstr "Брой пакети" - -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" -msgstr "Дисково пространство заето от пакетирани обекти" - -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" -msgstr "Пакетирани обекти за окастряне" - -#: lib/database.tcl:48 -msgid "Garbage files" -msgstr "Файлове за боклука" - -#: lib/database.tcl:57 lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 -#: lib/option.tcl:282 -#, tcl-format -msgid "%s:" -msgstr "%s:" - -#: lib/database.tcl:66 -#, tcl-format -msgid "%s (%s): Database Statistics" -msgstr "%s (%s): Статистика на базата от данни" - -#: 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:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"В това хранилище в момента има към %i непакетирани обекти.\n" -"\n" -"За добра производителност се препоръчва да компресирате базата с данни за " -"обектите.\n" -"\n" -"Да се започне ли компресирането?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Неправилни данни от Git: %s" - -#: lib/diff.tcl:77 -#, 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:117 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Зареждане на разликите в „%s“…" - -#: lib/diff.tcl:143 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"ЛОКАЛНО: изтрит\n" -"ОТДАЛЕЧЕНО:\n" - -#: lib/diff.tcl:148 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"ОТДАЛЕЧЕНО: изтрит\n" -"ЛОКАЛНО:\n" - -#: lib/diff.tcl:155 -msgid "LOCAL:\n" -msgstr "ЛОКАЛНО:\n" - -#: lib/diff.tcl:158 -msgid "REMOTE:\n" -msgstr "ОТДАЛЕЧЕНО:\n" - -#: lib/diff.tcl:220 lib/diff.tcl:357 -#, tcl-format -msgid "Unable to display %s" -msgstr "Файлът „%s“ не може да бъде показан" - -#: lib/diff.tcl:221 -msgid "Error loading file:" -msgstr "Грешка при зареждане на файл:" - -#: lib/diff.tcl:227 -msgid "Git Repository (subproject)" -msgstr "Хранилище на Git (подмодул)" - -#: lib/diff.tcl:239 -msgid "* Binary file (not showing content)." -msgstr "● Двоичен файл (съдържанието не се показва)." - -#: lib/diff.tcl:244 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"● Неследеният файл е %d байта.\n" -"● Показват се само първите %d байта.\n" - -#: lib/diff.tcl:250 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"● Неследеният файл е отрязан дотук от програмата „%s“.\n" -"● Използвайте външен редактор, за да видите целия файл.\n" - -#: lib/diff.tcl:580 -msgid "Failed to unstage selected hunk." -msgstr "Избраното парче не може да бъде извадено от индекса." - -#: lib/diff.tcl:587 -msgid "Failed to stage selected hunk." -msgstr "Избраното парче не може да бъде добавено към индекса." - -#: lib/diff.tcl:666 -msgid "Failed to unstage selected line." -msgstr "Избраният ред не може да бъде изваден от индекса." - -#: lib/diff.tcl:674 -msgid "Failed to stage selected line." -msgstr "Избраният ред не може да бъде добавен към индекса." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Стандартното" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Системното (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Друго" - -#: lib/error.tcl:20 -#, tcl-format -msgid "%s: error" -msgstr "%s: грешка" - -#: lib/error.tcl:36 -#, tcl-format -msgid "%s: warning" -msgstr "%s: предупреждение" - -#: lib/error.tcl:80 -#, tcl-format -msgid "%s hook failed:" -msgstr "%s: грешка от куката" - -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." -msgstr "Преди да можете да подадете, коригирайте горните грешки." - -#: lib/error.tcl:116 -#, tcl-format -msgid "%s (%s): error" -msgstr "%s (%s): грешка" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Индексът не може да бъде отключен." - -#: lib/index.tcl:17 -msgid "Index Error" -msgstr "Грешка в индекса" - -#: lib/index.tcl:19 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Неуспешно обновяване на индекса на Git. Автоматично ще започне нова проверка " -"за синхронизирането на git-gui." - -#: lib/index.tcl:30 -msgid "Continue" -msgstr "Продължаване" - -#: lib/index.tcl:33 -msgid "Unlock Index" -msgstr "Отключване на индекса" - -#: lib/index.tcl:294 -msgid "Unstaging selected files from commit" -msgstr "Изваждане на избраните файлове от подаването" - -#: lib/index.tcl:298 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Изваждане на „%s“ от подаването" - -#: lib/index.tcl:337 -msgid "Ready to commit." -msgstr "Готовност за подаване." - -#: lib/index.tcl:346 -msgid "Adding selected files" -msgstr "Добавяне на избраните файлове" - -#: lib/index.tcl:350 -#, tcl-format -msgid "Adding %s" -msgstr "Добавяне на „%s“" - -#: lib/index.tcl:380 -#, tcl-format -msgid "Stage %d untracked files?" -msgstr "Да се добавят ли %d неследени файла към индекса?" - -#: lib/index.tcl:388 -msgid "Adding all changed files" -msgstr "Добавяне на всички променени файлове" - -#: lib/index.tcl:428 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Да се махнат ли промените във файла „%s“?" - -#: lib/index.tcl:430 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Да се махнат ли промените в тези %i файла?" - -#: lib/index.tcl:438 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Всички промени, които не са били вкарани в индекса, ще бъдат безвъзвратно " -"загубени." - -#: lib/index.tcl:441 -msgid "Do Nothing" -msgstr "Нищо да не се прави" - -#: lib/index.tcl:459 -msgid "Reverting selected files" -msgstr "Махане на промените в избраните файлове" - -#: lib/index.tcl:463 -#, tcl-format -msgid "Reverting %s" -msgstr "Махане на промените в „%s“" - -#: lib/line.tcl:17 -msgid "Goto Line:" -msgstr "Към ред:" - -#: lib/line.tcl:23 -msgid "Go" -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" -"\n" - -#: lib/merge.tcl:45 -#, 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:55 -#, 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:108 -#, tcl-format -msgid "%s of %s" -msgstr "%s от общо %s" - -#: lib/merge.tcl:126 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Сливане на „%s“ и „%s“…" - -#: lib/merge.tcl:137 -msgid "Merge completed successfully." -msgstr "Сливането завърши успешно." - -#: lib/merge.tcl:139 -msgid "Merge failed. Conflict resolution is required." -msgstr "Неуспешно сливане — има конфликти за коригиране." - -#: lib/merge.tcl:156 -#, tcl-format -msgid "%s (%s): Merge" -msgstr "%s (%s): Сливане" - -#: lib/merge.tcl:164 -#, tcl-format -msgid "Merge Into %s" -msgstr "Сливане в „%s“" - -#: lib/merge.tcl:183 -msgid "Revision To Merge" -msgstr "Версия за сливане" - -#: lib/merge.tcl:218 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Поправянето не може да бъде преустановено.\n" -"\n" -"Трябва да завършите поправката на това подаване.\n" - -#: lib/merge.tcl:228 -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:234 -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:245 -msgid "Aborting" -msgstr "Преустановяване" - -#: lib/merge.tcl:245 -msgid "files reset" -msgstr "файла със занулени промени" - -#: lib/merge.tcl:273 -msgid "Abort failed." -msgstr "Неуспешно преустановяване." - -#: lib/merge.tcl:275 -msgid "Abort completed. Ready." -msgstr "Успешно преустановяване. Готовност за следващо действие." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Да се използва базовата версия" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Да се използва версията от този клон" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Да се използва версията от другия клон" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Разликата показва само разликите с конфликт.\n" -"\n" -"Файлът „%s“ ще бъде презаписан.\n" -"\n" -"Тази операция може да бъде отменена само чрез започване на сливането наново." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"Изглежда, че все още има некоригирани конфликти във файла „%s“. Да се добави " -"ли файлът към индекса?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Добавяне на корекция на конфликтите в „%s“" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Конфликтите при символни връзки или изтриване не могат да бъдат коригирани с " -"външна програма." - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Файлът, в който е конфликтът, не съществува" - -#: lib/mergetool.tcl:246 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Това не е графична програма за сливане: „%s“" - -#: lib/mergetool.tcl:275 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Неподдържана програма за сливане: „%s“" - -#: lib/mergetool.tcl:310 -msgid "Merge tool is already running, terminate it?" -msgstr "Програмата за сливане вече е стартирана. Да бъде ли изключена?" - -#: lib/mergetool.tcl:330 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Грешка при изтеглянето на версии:\n" -"%s" - -#: lib/mergetool.tcl:350 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Програмата за сливане не може да бъде стартирана:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:354 -msgid "Running merge tool..." -msgstr "Стартиране на програмата за сливане…" - -#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 -msgid "Merge tool failed." -msgstr "Грешка в програмата за сливане." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Неправилно глобално кодиране „%s“" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Неправилно кодиране „%s“ на хранилището" - -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "Стандартни настройки" - -#: lib/option.tcl:123 -msgid "Save" -msgstr "Запазване" - -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "Хранилище „%s“" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "Глобално (за всички хранилища)" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "Потребителско име" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "Адрес на е-поща" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "Обобщаване на подаванията при сливане" - -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "Подробности при сливанията" - -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "Извеждане на статистика след сливанията" - -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "Използване на програма за сливане" - -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "Доверие във времето на промяна на файловете" - -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "Окастряне на следящите клонове при доставяне" - -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "Напасване на следящите клонове" - -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "Използване на „textconv“ за разликите и анотирането" - -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "Анотиране на копието само по променените файлове" - -#: lib/option.tcl:153 -msgid "Maximum Length of Recent Repositories List" -msgstr "Максимален брой на списъка „Скоро ползвани“ хранилища" - -#: lib/option.tcl:154 -msgid "Minimum Letters To Blame Copy On" -msgstr "Минимален брой знаци за анотиране на копието" - -#: lib/option.tcl:155 -msgid "Blame History Context Radius (days)" -msgstr "Исторически обхват за анотиране в дни" - -#: lib/option.tcl:156 -msgid "Number of Diff Context Lines" -msgstr "Брой редове за контекста на разликите" - -#: lib/option.tcl:157 -msgid "Additional Diff Parameters" -msgstr "Аргументи към командата за разликите" - -#: lib/option.tcl:158 -msgid "Commit Message Text Width" -msgstr "Широчина на текста на съобщението при подаване" - -#: lib/option.tcl:159 -msgid "New Branch Name Template" -msgstr "Шаблон за името на новите клони" - -#: lib/option.tcl:160 -msgid "Default File Contents Encoding" -msgstr "Кодиране на файловете" - -#: lib/option.tcl:161 -msgid "Warn before committing to a detached head" -msgstr "Предупреждаване при подаване към несвързан указател" - -#: lib/option.tcl:162 -msgid "Staging of untracked files" -msgstr "Добавяне на неследените файлове към индекса" - -#: lib/option.tcl:163 -msgid "Show untracked files" -msgstr "Показване на неследените файлове" - -#: lib/option.tcl:164 -msgid "Tab spacing" -msgstr "Ширина на табулацията" - -#: lib/option.tcl:210 -msgid "Change" -msgstr "Смяна" - -#: lib/option.tcl:254 -msgid "Spelling Dictionary:" -msgstr "Правописен речник:" - -#: lib/option.tcl:284 -msgid "Change Font" -msgstr "Смяна на шрифта" - -#: lib/option.tcl:288 -#, tcl-format -msgid "Choose %s" -msgstr "Избор на „%s“" - -#: lib/option.tcl:294 -msgid "pt." -msgstr "тчк." - -#: lib/option.tcl:308 -msgid "Preferences" -msgstr "Настройки" - -#: lib/option.tcl:345 -msgid "Failed to completely save options:" -msgstr "Неуспешно запазване на настройките:" - -#: lib/remote.tcl:200 -msgid "Push to" -msgstr "Изтласкване към" - -#: lib/remote.tcl:218 -msgid "Remove Remote" -msgstr "Премахване на отдалечено хранилище" - -#: lib/remote.tcl:223 -msgid "Prune from" -msgstr "Окастряне от" - -#: lib/remote.tcl:228 -msgid "Fetch from" -msgstr "Доставяне от" - -#: lib/remote.tcl:253 lib/remote.tcl:258 -msgid "All" -msgstr "Всички" - -#: lib/remote_add.tcl:20 -#, tcl-format -msgid "%s (%s): Add Remote" -msgstr "%s (%s): Добавяне на отдалечено хранилище" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "Добавяне на отдалечено хранилище" - -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "Добавяне" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "Данни за отдалеченото хранилище" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Местоположение:" - -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "Следващо действие" - -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "Незабавно доставяне" - -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "Инициализиране на отдалеченото хранилище и изтласкване на промените" - -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "Да не се прави нищо" - -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "Задайте име за отдалеченото хранилище." - -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "Отдалечено хранилище не може да се казва „%s“." - -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Неуспешно добавяне на отдалеченото хранилище „%s“ от адрес „%s“." - -#: lib/remote_add.tcl:132 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "доставяне на „%s“" - -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "Доставяне на „%s“" - -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Хранилището с местоположение „%s“ не може да бъде инициализирано." - -#: lib/remote_add.tcl:162 lib/transport.tcl:54 lib/transport.tcl:92 -#: lib/transport.tcl:110 -#, tcl-format -msgid "push %s" -msgstr "изтласкване на „%s“" - -#: lib/remote_add.tcl:163 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Добавяне на хранилище „%s“ (с адрес „%s“)" - -#: lib/remote_branch_delete.tcl:29 -#, tcl-format -msgid "%s (%s): Delete Branch Remotely" -msgstr "%s (%s): Изтриване на отдалечения клон" - -#: lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Изтриване на отдалечения клон" - -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" -msgstr "От хранилище" - -#: lib/remote_branch_delete.tcl:51 lib/transport.tcl:165 -msgid "Remote:" -msgstr "Отдалечено хранилище:" - -#: lib/remote_branch_delete.tcl:72 lib/transport.tcl:187 -msgid "Arbitrary Location:" -msgstr "Произволно местоположение:" - -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" -msgstr "Клони" - -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" -msgstr "Изтриване, само ако" - -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" -msgstr "Слят в:" - -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." -msgstr "За данните „Слят в“ е необходимо да зададете клон." - -#: lib/remote_branch_delete.tcl:185 -#, 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:190 -#, 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:208 -msgid "Please select one or more branches to delete." -msgstr "Изберете поне един клон за изтриване." - -#: lib/remote_branch_delete.tcl:227 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Изтриване на клони от „%s“" - -#: lib/remote_branch_delete.tcl:300 -msgid "No repository selected." -msgstr "Не е избрано хранилище." - -#: lib/remote_branch_delete.tcl:305 -#, tcl-format -msgid "Scanning %s..." -msgstr "Претърсване на „%s“…" - -#: lib/search.tcl:48 -msgid "Find:" -msgstr "Търсене:" - -#: lib/search.tcl:50 -msgid "Next" -msgstr "Следваща поява" - -#: lib/search.tcl:51 -msgid "Prev" -msgstr "Предишна поява" - -#: lib/search.tcl:52 -msgid "RegExp" -msgstr "РегИзр" - -#: lib/search.tcl:54 -msgid "Case" -msgstr "Главни/малки" - -#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75 -#, tcl-format -msgid "%s (%s): Create Desktop Icon" -msgstr "%s (%s): Добавяне на икона на работния плот" - -#: lib/shortcut.tcl:24 lib/shortcut.tcl:65 -msgid "Cannot write shortcut:" -msgstr "Клавишната комбинация не може да бъде запазена:" - -#: lib/shortcut.tcl:140 -msgid "Cannot write icon:" -msgstr "Иконата не може да бъде запазена:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Тази програма за проверка на правописа не се поддържа" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Липсва програма за проверка на правописа" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Неправилни настройки на проверката на правописа" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Ползване на речник за език „%s“." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Програмата за правопис даже не стартира успешно." - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Непозната програма за проверка на правописа" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Няма предложения" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Неочакван край на файл от програмата за проверка на правописа" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Грешка в програмата за проверка на правописа" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Не са открити ключове." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Открит е публичен ключ в „%s“" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Генериране на ключ" - -#: lib/sshkey.tcl:58 -msgid "Copy To Clipboard" -msgstr "Копиране към системния буфер" - -#: lib/sshkey.tcl:72 -msgid "Your OpenSSH Public Key" -msgstr "Публичният ви ключ за OpenSSH" - -#: lib/sshkey.tcl:80 -msgid "Generating..." -msgstr "Генериране…" - -#: lib/sshkey.tcl:86 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Програмата „ssh-keygen“ не може да бъде стартирана:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:113 -msgid "Generation failed." -msgstr "Неуспешно генериране." - -#: lib/sshkey.tcl:120 -msgid "Generation succeeded, but no keys found." -msgstr "Генерирането завърши успешно, а не са намерени ключове." - -#: lib/sshkey.tcl:123 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Ключът ви е в „%s“" - -#: lib/status_bar.tcl:87 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s… %*i от общо %*i %s (%3i%%)" - -#: lib/tools.tcl:76 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "За изпълнението на „%s“ трябва да изберете файл." - -#: lib/tools.tcl:92 -#, tcl-format -msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "Сигурни ли сте, че искате да изпълните „%1$s“ върху файла „%2$s“?" - -#: lib/tools.tcl:96 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Сигурни ли сте, че искате да изпълните „%s“?" - -#: lib/tools.tcl:118 -#, tcl-format -msgid "Tool: %s" -msgstr "Команда: %s" - -#: lib/tools.tcl:119 -#, tcl-format -msgid "Running: %s" -msgstr "Изпълнение: %s" - -#: lib/tools.tcl:158 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Командата завърши успешно: %s" - -#: lib/tools.tcl:160 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Командата върна грешка: %s" - -#: lib/tools_dlg.tcl:22 -#, tcl-format -msgid "%s (%s): Add Tool" -msgstr "%s (%s): Добавяне на команда" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Добавяне на команда" - -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "Глобално добавяне" - -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "Подробности за командата" - -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "За създаване на подменюта използвайте знака „/“ за разделител:" - -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "Команда:" - -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "Преди изпълнение да се извежда диалогов прозорец" - -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Потребителят да укаже версия (задаване на променливата $REVISION)" - -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "" -"Потребителят да укаже допълнителни аргументи (задаване на променливата $ARGS)" - -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "Без показване на прозорец с изхода от командата" - -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "" -"Стартиране само след избор на разлика (променливата $FILENAME не е празна)" - -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "Задайте име за командата." - -#: lib/tools_dlg.tcl:126 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Командата „%s“ вече съществува." - -#: lib/tools_dlg.tcl:148 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Командата не може да бъде добавена:\n" -"%s" - -#: lib/tools_dlg.tcl:187 -#, tcl-format -msgid "%s (%s): Remove Tool" -msgstr "%s (%s): Премахване на команда" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "Премахване на команди" - -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "Премахване" - -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "(командите към локалното хранилище са обозначени в синьо)" - -#: lib/tools_dlg.tcl:283 -#, tcl-format -msgid "%s (%s):" -msgstr "%s (%s):" - -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "Изпълнение на командата „%s“" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "Аргументи" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "Добре" - -#: 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 -msgid "fetch all remotes" -msgstr "доставяне от всички отдалечени" - -#: lib/transport.tcl:26 -msgid "Fetching new changes from all remotes" -msgstr "Доставяне на промените от всички отдалечени хранилища" - -#: lib/transport.tcl:40 -msgid "remote prune all remotes" -msgstr "окастряне на следящите изтрити" - -#: lib/transport.tcl:41 -msgid "Pruning tracking branches deleted from all remotes" -msgstr "" -"Окастряне на следящите клони на изтритите клони от всички отдалечени " -"хранилища" - -#: lib/transport.tcl:55 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Изтласкване на промените към „%s“" - -#: lib/transport.tcl:93 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Изтласкване на всичко към „%s“" - -#: lib/transport.tcl:111 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Изтласкване на %s „%s“ към „%s“" - -#: lib/transport.tcl:132 -msgid "Push Branches" -msgstr "Клони за изтласкване" - -#: lib/transport.tcl:147 -msgid "Source Branches" -msgstr "Клони-източници" - -#: lib/transport.tcl:162 -msgid "Destination Repository" -msgstr "Целево хранилище" - -#: lib/transport.tcl:205 -msgid "Transfer Options" -msgstr "Настройки при пренасянето" - -#: lib/transport.tcl:207 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" -"Изрично презаписване на съществуващ клон (някои промени може да бъдат " -"загубени)" - -#: lib/transport.tcl:211 -msgid "Use thin pack (for slow network connections)" -msgstr "Максимална компресия (за бавни мрежови връзки)" - -#: lib/transport.tcl:215 -msgid "Include tags" -msgstr "Включване на етикетите" - -#: lib/transport.tcl:229 -#, tcl-format -msgid "%s (%s): Push" -msgstr "%s (%s): Изтласкване" diff --git a/third_party/git/git-gui/po/de.po b/third_party/git/git-gui/po/de.po deleted file mode 100644 index a8d5f61ca36c..000000000000 --- a/third_party/git/git-gui/po/de.po +++ /dev/null @@ -1,2874 +0,0 @@ -# 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 <stimming@tuhh.de>, 2007 -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-08 22:54+0100\n" -"PO-Revision-Date: 2020-02-09 22:40+0100\n" -"Last-Translator: Christian Stimming <christian@cstimming.de>\n" -"Language-Team: German\n" -"Language: de_DE\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: git-gui.sh:847 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Ungültige Zeichensatz-Angabe in %s:" - -#: git-gui.sh:901 -msgid "Main Font" -msgstr "Programmschriftart" - -#: git-gui.sh:902 -msgid "Diff/Console Font" -msgstr "Vergleich-Schriftart" - -#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053 -#: git-gui.sh:3212 -msgid "git-gui: fatal error" -msgstr "git-gui: Programmfehler" - -#: git-gui.sh:918 -msgid "Cannot find git in PATH." -msgstr "Git kann im PATH nicht gefunden werden." - -#: git-gui.sh:945 -msgid "Cannot parse Git version string:" -msgstr "Git Versionsangabe kann nicht erkannt werden:" - -#: git-gui.sh:970 -#, 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:1267 -msgid "Git directory not found:" -msgstr "Git-Verzeichnis nicht gefunden:" - -#: git-gui.sh:1301 -msgid "Cannot move to top of working directory:" -msgstr "" -"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt " -"werden:" - -#: git-gui.sh:1309 -msgid "Cannot use bare repository:" -msgstr "Bloßes Repository kann nicht benutzt werden:" - -#: git-gui.sh:1317 -msgid "No working directory" -msgstr "Kein Arbeitsverzeichnis" - -#: git-gui.sh:1491 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Dateistatus aktualisieren..." - -#: git-gui.sh:1551 -msgid "Scanning for modified files ..." -msgstr "Nach geänderten Dateien suchen..." - -#: git-gui.sh:1629 -msgid "Calling prepare-commit-msg hook..." -msgstr "Aufrufen des »prepare-commit-msg hook«..." - -#: git-gui.sh:1646 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "Commit abgelehnt durch »prepare-commit-msg hook«." - -#: git-gui.sh:1804 lib/browser.tcl:252 -msgid "Ready." -msgstr "Bereit." - -#: git-gui.sh:1968 -#, tcl-format -msgid "" -"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." -msgstr "" -"Anzeigelimit erreicht (gui.maxfilesdisplayed = %s) für Anzahl Einträge. Es " -"werden nicht alle %s Dateien gezeigt." - -#: git-gui.sh:2091 -msgid "Unmodified" -msgstr "Unverändert" - -#: git-gui.sh:2093 -msgid "Modified, not staged" -msgstr "Verändert, nicht bereitgestellt" - -#: git-gui.sh:2094 git-gui.sh:2106 -msgid "Staged for commit" -msgstr "Bereitgestellt zum Committen" - -#: git-gui.sh:2095 git-gui.sh:2107 -msgid "Portions staged for commit" -msgstr "Teilweise bereitgestellt zum Committen" - -#: git-gui.sh:2096 git-gui.sh:2108 -msgid "Staged for commit, missing" -msgstr "Bereitgestellt zum Committen, fehlend" - -#: git-gui.sh:2098 -msgid "File type changed, not staged" -msgstr "Dateityp geändert, nicht bereitgestellt" - -#: git-gui.sh:2099 git-gui.sh:2100 -msgid "File type changed, old type staged for commit" -msgstr "Dateityp geändert, alter Dateityp bereitgestellt" - -#: git-gui.sh:2101 -msgid "File type changed, staged" -msgstr "Dateityp geändert, bereitgestellt" - -#: git-gui.sh:2102 -msgid "File type change staged, modification not staged" -msgstr "Dateityp-Änderung bereitgestellt, Inhaltsänderung nicht bereitgestellt" - -#: git-gui.sh:2103 -msgid "File type change staged, file missing" -msgstr "Dateityp-Änderung bereitgestellt, Datei gelöscht" - -#: git-gui.sh:2105 -msgid "Untracked, not staged" -msgstr "Unversioniert, nicht bereitgestellt" - -#: git-gui.sh:2110 -msgid "Missing" -msgstr "Fehlend" - -#: git-gui.sh:2111 -msgid "Staged for removal" -msgstr "Bereitgestellt zum Löschen" - -#: git-gui.sh:2112 -msgid "Staged for removal, still present" -msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden" - -#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 -#: git-gui.sh:2118 git-gui.sh:2119 -msgid "Requires merge resolution" -msgstr "Konfliktauflösung nötig" - -#: git-gui.sh:2164 -msgid "Couldn't find gitk in PATH" -msgstr "Gitk kann im PATH nicht gefunden werden." - -#: git-gui.sh:2210 git-gui.sh:2245 -#, tcl-format -msgid "Starting %s... please wait..." -msgstr "%s wird gestartet... bitte warten." - -#: git-gui.sh:2224 -msgid "Couldn't find git gui in PATH" -msgstr "»Git gui« kann im PATH nicht gefunden werden." - -#: git-gui.sh:2726 lib/choose_repository.tcl:53 -msgid "Repository" -msgstr "Repository" - -#: git-gui.sh:2727 -msgid "Edit" -msgstr "Bearbeiten" - -#: git-gui.sh:2729 lib/choose_rev.tcl:567 -msgid "Branch" -msgstr "Branch" - -#: git-gui.sh:2732 lib/choose_rev.tcl:554 -msgid "Commit@@noun" -msgstr "Commit" - -#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 -msgid "Merge" -msgstr "Zusammenführen" - -#: git-gui.sh:2736 lib/choose_rev.tcl:563 -msgid "Remote" -msgstr "Extern" - -#: git-gui.sh:2739 -msgid "Tools" -msgstr "Werkzeuge" - -#: git-gui.sh:2748 -msgid "Explore Working Copy" -msgstr "Arbeitskopie im Dateimanager öffnen" - -#: git-gui.sh:2763 -msgid "Git Bash" -msgstr "Git Bash" - -#: git-gui.sh:2772 -msgid "Browse Current Branch's Files" -msgstr "Aktuellen Branch durchblättern" - -#: git-gui.sh:2776 -msgid "Browse Branch Files..." -msgstr "Branch durchblättern..." - -#: git-gui.sh:2781 -msgid "Visualize Current Branch's History" -msgstr "Aktuellen Branch darstellen" - -#: git-gui.sh:2785 -msgid "Visualize All Branch History" -msgstr "Historie aller Branches darstellen" - -#: git-gui.sh:2792 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Branch »%s« durchblättern" - -#: git-gui.sh:2794 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Historie von »%s« darstellen" - -#: git-gui.sh:2799 lib/database.tcl:40 -msgid "Database Statistics" -msgstr "Datenbankstatistik" - -#: git-gui.sh:2802 lib/database.tcl:33 -msgid "Compress Database" -msgstr "Datenbank komprimieren" - -#: git-gui.sh:2805 -msgid "Verify Database" -msgstr "Datenbank überprüfen" - -#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 -msgid "Create Desktop Icon" -msgstr "Desktop-Icon erstellen" - -#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 -msgid "Quit" -msgstr "Beenden" - -#: git-gui.sh:2836 -msgid "Undo" -msgstr "Rückgängig" - -#: git-gui.sh:2839 -msgid "Redo" -msgstr "Wiederholen" - -#: git-gui.sh:2843 git-gui.sh:3461 -msgid "Cut" -msgstr "Ausschneiden" - -#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Kopieren" - -#: git-gui.sh:2849 git-gui.sh:3467 -msgid "Paste" -msgstr "Einfügen" - -#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 -#: lib/branch_delete.tcl:28 -msgid "Delete" -msgstr "Löschen" - -#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 -msgid "Select All" -msgstr "Alle auswählen" - -#: git-gui.sh:2865 -msgid "Create..." -msgstr "Erstellen..." - -#: git-gui.sh:2871 -msgid "Checkout..." -msgstr "Auschecken..." - -#: git-gui.sh:2877 -msgid "Rename..." -msgstr "Umbenennen..." - -#: git-gui.sh:2882 -msgid "Delete..." -msgstr "Löschen..." - -#: git-gui.sh:2887 -msgid "Reset..." -msgstr "Änderungen verwerfen..." - -#: git-gui.sh:2897 -msgid "Done" -msgstr "Fertig" - -#: git-gui.sh:2899 -msgid "Commit@@verb" -msgstr "Committen" - -#: git-gui.sh:2908 git-gui.sh:3400 -msgid "Amend Last Commit" -msgstr "Letzten Commit nachbessern" - -#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 -msgid "Rescan" -msgstr "Neu laden" - -#: git-gui.sh:2924 -msgid "Stage To Commit" -msgstr "Für Commit bereitstellen" - -#: git-gui.sh:2930 -msgid "Stage Changed Files To Commit" -msgstr "Geänderte Dateien für Commit bereitstellen" - -#: git-gui.sh:2936 -msgid "Unstage From Commit" -msgstr "Aus Commit-Bereitstellung herausnehmen" - -#: git-gui.sh:2942 lib/index.tcl:521 -msgid "Revert Changes" -msgstr "Änderungen verwerfen" - -#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 -msgid "Show Less Context" -msgstr "Weniger Zeilen anzeigen" - -#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 -msgid "Show More Context" -msgstr "Mehr Zeilen anzeigen" - -#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 -msgid "Sign Off" -msgstr "Abzeichnen" - -#: git-gui.sh:2977 -msgid "Local Merge..." -msgstr "Lokales Zusammenführen..." - -#: git-gui.sh:2982 -msgid "Abort Merge..." -msgstr "Zusammenführen abbrechen..." - -#: git-gui.sh:2994 git-gui.sh:3022 -msgid "Add..." -msgstr "Neues hinzufügen..." - -#: git-gui.sh:2998 -msgid "Push..." -msgstr "Versenden..." - -#: git-gui.sh:3002 -msgid "Delete Branch..." -msgstr "Branch löschen..." - -#: git-gui.sh:3012 git-gui.sh:3666 -msgid "Options..." -msgstr "Optionen..." - -#: git-gui.sh:3023 -msgid "Remove..." -msgstr "Entfernen..." - -#: git-gui.sh:3032 lib/choose_repository.tcl:67 -msgid "Help" -msgstr "Hilfe" - -#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 -#: lib/choose_repository.tcl:70 lib/about.tcl:14 -#, tcl-format -msgid "About %s" -msgstr "Über %s" - -#: git-gui.sh:3064 -msgid "Online Documentation" -msgstr "Online-Dokumentation" - -#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 -msgid "Show SSH Key" -msgstr "SSH-Schlüssel anzeigen" - -#: git-gui.sh:3097 git-gui.sh:3229 -msgid "usage:" -msgstr "Verwendung:" - -#: git-gui.sh:3101 git-gui.sh:3233 -msgid "Usage" -msgstr "Verwendung" - -#: git-gui.sh:3182 lib/blame.tcl:575 -msgid "Error" -msgstr "Fehler" - -#: git-gui.sh:3213 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis " -"nicht gefunden" - -#: git-gui.sh:3246 -msgid "Current Branch:" -msgstr "Aktueller Branch:" - -#: git-gui.sh:3271 -msgid "Unstaged Changes" -msgstr "Nicht bereitgestellte Änderungen" - -#: git-gui.sh:3293 -msgid "Staged Changes (Will Commit)" -msgstr "Bereitstellung (zum Committen)" - -#: git-gui.sh:3367 -msgid "Stage Changed" -msgstr "Alles bereitstellen" - -#: git-gui.sh:3386 lib/transport.tcl:137 -msgid "Push" -msgstr "Versenden" - -#: git-gui.sh:3413 -msgid "Initial Commit Message:" -msgstr "Erste Commit-Beschreibung:" - -#: git-gui.sh:3414 -msgid "Amended Commit Message:" -msgstr "Nachgebesserte Beschreibung:" - -#: git-gui.sh:3415 -msgid "Amended Initial Commit Message:" -msgstr "Nachgebesserte erste Beschreibung:" - -#: git-gui.sh:3416 -msgid "Amended Merge Commit Message:" -msgstr "Nachgebesserte Zusammenführungs-Beschreibung:" - -#: git-gui.sh:3417 -msgid "Merge Commit Message:" -msgstr "Zusammenführungs-Beschreibung:" - -#: git-gui.sh:3418 -msgid "Commit Message:" -msgstr "Commit-Beschreibung:" - -#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 -msgid "Copy All" -msgstr "Alle kopieren" - -#: git-gui.sh:3501 lib/blame.tcl:106 -msgid "File:" -msgstr "Datei:" - -#: git-gui.sh:3549 lib/choose_repository.tcl:1100 -msgid "Open" -msgstr "Öffnen" - -#: git-gui.sh:3629 -msgid "Refresh" -msgstr "Aktualisieren" - -#: git-gui.sh:3650 -msgid "Decrease Font Size" -msgstr "Schriftgröße verkleinern" - -#: git-gui.sh:3654 -msgid "Increase Font Size" -msgstr "Schriftgröße vergrößern" - -#: git-gui.sh:3662 lib/blame.tcl:296 -msgid "Encoding" -msgstr "Zeichenkodierung" - -#: git-gui.sh:3673 -msgid "Apply/Reverse Hunk" -msgstr "Patch-Block anwenden/zurücknehmen" - -#: git-gui.sh:3678 -msgid "Apply/Reverse Line" -msgstr "Zeile anwenden/zurücknehmen" - -#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805 -msgid "Revert Hunk" -msgstr "Patch-Block zurücknehmen" - -#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812 -msgid "Revert Line" -msgstr "Zeilenänderungen zurücknehmen" - -#: git-gui.sh:3694 git-gui.sh:3791 -msgid "Undo Last Revert" -msgstr "Letztes Zurücknehmen rückgängig" - -#: git-gui.sh:3713 -msgid "Run Merge Tool" -msgstr "Zusammenführungswerkzeug" - -#: git-gui.sh:3718 -msgid "Use Remote Version" -msgstr "Externe Version benutzen" - -#: git-gui.sh:3722 -msgid "Use Local Version" -msgstr "Lokale Version benutzen" - -#: git-gui.sh:3726 -msgid "Revert To Base" -msgstr "Zurücksetzen auf ursprünglichen Commit" - -#: git-gui.sh:3744 -msgid "Visualize These Changes In The Submodule" -msgstr "Diese Änderungen im Submodul darstellen" - -#: git-gui.sh:3748 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Aktuellen Branch im Submodul darstellen" - -#: git-gui.sh:3752 -msgid "Visualize All Branch History In The Submodule" -msgstr "Alle Branches im Submodul darstellen" - -#: git-gui.sh:3757 -msgid "Start git gui In The Submodule" -msgstr "Git gui im Submodul starten" - -#: git-gui.sh:3793 -msgid "Unstage Hunk From Commit" -msgstr "Patch-Block aus Bereitstellung herausnehmen" - -#: git-gui.sh:3797 -msgid "Unstage Lines From Commit" -msgstr "Zeilen aus der Bereitstellung herausnehmen" - -#: git-gui.sh:3798 git-gui.sh:3809 -msgid "Revert Lines" -msgstr "Zeilenänderung zurücknehmen" - -#: git-gui.sh:3800 -msgid "Unstage Line From Commit" -msgstr "Zeile aus der Bereitstellung herausnehmen" - -#: git-gui.sh:3804 -msgid "Stage Hunk For Commit" -msgstr "Patch-Block zur Bereitstellung hinzufügen" - -#: git-gui.sh:3808 -msgid "Stage Lines For Commit" -msgstr "Zeilen zur Bereitstellung hinzufügen" - -#: git-gui.sh:3811 -msgid "Stage Line For Commit" -msgstr "Zeile zur Bereitstellung hinzufügen" - -#: git-gui.sh:3861 -msgid "Initializing..." -msgstr "Initialisieren..." - -#: git-gui.sh:4017 -#, 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:4046 -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:4051 -#, 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/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Rechtschreibprüfungsprogramm nicht unterstützt" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Rechtschreibprüfung nicht verfügbar" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Wörterbuch auf %s zurückgesetzt." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Unbekanntes Rechtschreibprüfungsprogramm" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Keine Vorschläge" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Rechtschreibprüfung fehlgeschlagen" - -#: lib/transport.tcl:6 lib/remote_add.tcl:132 -#, 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 "Gelöschte externe Branches aus »%s« entfernen" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Gelöschte externe Trackingbranches aus »%s« werden entfernt" - -#: lib/transport.tcl:25 -msgid "fetch all remotes" -msgstr "Abrufen aller externen" - -#: lib/transport.tcl:26 -msgid "Fetching new changes from all remotes" -msgstr "Neue Änderungen von allen externen anfordern" - -#: lib/transport.tcl:40 -msgid "remote prune all remotes" -msgstr "Extern veraltete Branches entfernen aller Repositories" - -#: lib/transport.tcl:41 -msgid "Pruning tracking branches deleted from all remotes" -msgstr "" -"Gelöschte externe Trackingbranches aus allen Repositories werden entfernt" - -#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 -#: lib/remote_add.tcl:162 -#, tcl-format -msgid "push %s" -msgstr "»%s« versenden..." - -#: lib/transport.tcl:55 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Änderungen nach »%s« versenden" - -#: lib/transport.tcl:93 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Spiegeln nach %s" - -#: lib/transport.tcl:111 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "%s %s nach %s versenden" - -#: lib/transport.tcl:132 -msgid "Push Branches" -msgstr "Branches versenden" - -#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34 -#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32 -#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 -#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 -#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178 -msgid "Cancel" -msgstr "Abbrechen" - -#: lib/transport.tcl:147 -msgid "Source Branches" -msgstr "Lokale Branches" - -#: lib/transport.tcl:162 -msgid "Destination Repository" -msgstr "Ziel-Repository" - -#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 -msgid "Remote:" -msgstr "Externes Repository:" - -#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 -msgid "Arbitrary Location:" -msgstr "Beliebige Adresse:" - -#: lib/transport.tcl:205 -msgid "Transfer Options" -msgstr "Netzwerk-Einstellungen" - -#: lib/transport.tcl:207 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" -"Überschreiben von existierenden Branches erzwingen (könnte Änderungen " -"löschen)" - -#: lib/transport.tcl:211 -msgid "Use thin pack (for slow network connections)" -msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" - -#: lib/transport.tcl:215 -msgid "Include tags" -msgstr "Mit Tags versenden" - -#: lib/transport.tcl:229 -#, tcl-format -msgid "%s (%s): Push" -msgstr "%s (%s): Versenden" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Änderungen »%s« von »%s« anfordern" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "Fehler: »%s« kann nicht als Branch oder Version erkannt werden" - -#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 -#: lib/database.tcl:30 -msgid "Close" -msgstr "Schließen" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Branch »%s« existiert nicht." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«." - -#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Branch »%s« existiert bereits." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"Branch »%s« existiert bereits.\n" -"\n" -"Branch kann nicht auf »%s« vorgespult werden. Reguläres Zusammenführen ist " -"notwendig." - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Zusammenführungsmethode »%s« nicht unterstützt." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Aktualisieren von »%s« fehlgeschlagen." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "Bereitstellung (»index«) ist zur Bearbeitung gesperrt (»locked«)." - -#: lib/checkout_op.tcl:289 -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 Repository überein.\n" -"\n" -"Ein anderes Git-Programm hat das Repository seit dem letzten Laden " -"geändert. Vor dem Wechseln des lokalen Branches muss neu geladen werden.\n" -"\n" -"Es wird gleich neu geladen.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Arbeitskopie aktualisieren auf »%s«..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "Dateien aktualisiert" - -#: lib/checkout_op.tcl:377 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "" -"Branch »%s« Auschecken abgebrochen (Zusammenführen der Dateien ist " -"notwendig)." - -#: lib/checkout_op.tcl:378 -msgid "File level merge required." -msgstr "Zusammenführen der Dateien ist notwendig." - -#: lib/checkout_op.tcl:382 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Es wird auf Branch »%s« verblieben." - -#: lib/checkout_op.tcl:453 -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 Branch.\n" -"\n" -"Wenn Sie auf einem Branch arbeiten möchten, erstellen Sie bitte jetzt einen " -"Branch mit der Auswahl »Losgelöste Arbeitskopie-Version«." - -#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Umgestellt auf »%s«." - -#: lib/checkout_op.tcl:536 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Umsetzen von »%s« nach »%s« wird folgende Commits verlieren:" - -#: lib/checkout_op.tcl:558 -msgid "Recovering lost commits may not be easy." -msgstr "" -"Verlorene Commits können nur mit größerem Aufwand wiederhergestellt werden." - -#: lib/checkout_op.tcl:563 -#, tcl-format -msgid "Reset '%s'?" -msgstr "»%s« umsetzen?" - -#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 -msgid "Visualize" -msgstr "Darstellen" - -#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 -msgid "Reset" -msgstr "Umsetzen (Reset)" - -#: lib/checkout_op.tcl:636 -#, 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 Branch 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/remote_add.tcl:20 -#, tcl-format -msgid "%s (%s): Add Remote" -msgstr "%s (%s): Externes Repository hinzufügen" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "Neues externes Repository hinzufügen" - -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "Hinzufügen" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "Einzelheiten des externen Repository" - -#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 -msgid "Name:" -msgstr "Name:" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Adresse:" - -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "Weitere Aktion" - -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "Jetzt anfordern" - -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "Externes Repository initialisieren und dahin versenden" - -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "Keine weitere Aktion" - -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "Bitte geben Sie einen Namen des externen Repository an." - -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "»%s« ist kein zulässiger Name eines externen Repository." - -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Fehler beim Hinzufügen des externen Repository »%s« aus Adresse »%s«." - -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "»%s« anfordern" - -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "" -"Initialisieren eines externen Repositories an Adresse »%s« ist nicht möglich." - -#: lib/remote_add.tcl:163 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Einrichten von »%s« an »%s«" - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Starten..." - -#: lib/browser.tcl:27 -#, tcl-format -msgid "%s (%s): File Browser" -msgstr "%s (%s): Datei-Browser" - -#: lib/browser.tcl:132 lib/browser.tcl:149 -#, tcl-format -msgid "Loading %s..." -msgstr "%s laden..." - -#: lib/browser.tcl:193 -msgid "[Up To Parent]" -msgstr "[Nach oben]" - -#: lib/browser.tcl:275 -#, tcl-format -msgid "%s (%s): Browse Branch Files" -msgstr "%s (%s): Dateien des Branches durchblättern" - -#: lib/browser.tcl:282 -msgid "Browse Branch Files" -msgstr "Dateien des Branches durchblättern" - -#: lib/browser.tcl:288 lib/choose_repository.tcl:437 -#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533 -#: lib/choose_repository.tcl:1115 -msgid "Browse" -msgstr "Blättern" - -#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "Version" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Bereitstellung kann nicht wieder freigegeben werden." - -#: lib/index.tcl:30 -msgid "Index Error" -msgstr "Fehler in Bereitstellung" - -#: lib/index.tcl:32 -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:43 -msgid "Continue" -msgstr "Fortsetzen" - -#: lib/index.tcl:46 -msgid "Unlock Index" -msgstr "Bereitstellung freigeben" - -#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587 -#: lib/choose_repository.tcl:999 -msgid "files" -msgstr "Dateien" - -#: lib/index.tcl:326 -msgid "Unstaging selected files from commit" -msgstr "Gewählte Dateien aus der Bereitstellung herausnehmen" - -#: lib/index.tcl:330 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Datei »%s« aus der Bereitstellung herausnehmen" - -#: lib/index.tcl:369 -msgid "Ready to commit." -msgstr "Bereit zum Committen." - -#: lib/index.tcl:378 -msgid "Adding selected files" -msgstr "Gewählte Dateien hinzufügen" - -#: lib/index.tcl:382 -#, tcl-format -msgid "Adding %s" -msgstr "»%s« hinzufügen" - -#: lib/index.tcl:412 -#, tcl-format -msgid "Stage %d untracked files?" -msgstr "%d unversionierte Dateien bereitstellen?" - -#: lib/index.tcl:420 -msgid "Adding all changed files" -msgstr "Alle geänderten Dateien hinzufügen" - -#: lib/index.tcl:503 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Änderungen in Datei »%s« verwerfen?" - -#: lib/index.tcl:508 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Änderungen in diesen %i Dateien verwerfen?" - -#: lib/index.tcl:517 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen." - -#: lib/index.tcl:520 lib/index.tcl:563 -msgid "Do Nothing" -msgstr "Nichts tun" - -#: lib/index.tcl:545 -#, tcl-format -msgid "Delete untracked file %s?" -msgstr "Unversionierte Datei »%s« löschen?" - -#: lib/index.tcl:550 -#, tcl-format -msgid "Delete these %i untracked files?" -msgstr "Diese %i unversionierten Dateien löschen?" - -#: lib/index.tcl:560 -msgid "Files will be permanently deleted." -msgstr "Dateien werden endgültig gelöscht." - -#: lib/index.tcl:564 -msgid "Delete Files" -msgstr "Dateien löschen" - -#: lib/index.tcl:586 -msgid "Deleting" -msgstr "Löschen" - -#: lib/index.tcl:665 -msgid "Encountered errors deleting files:\n" -msgstr "Fehler beim Löschen der Dateien:\n" - -#: lib/index.tcl:674 -#, tcl-format -msgid "None of the %d selected files could be deleted." -msgstr "Keine der %d gewählten Dateien konnten gelöscht werden." - -#: lib/index.tcl:679 -#, tcl-format -msgid "%d of the %d selected files could not be deleted." -msgstr "%d der %d gewählten Dateien konnten nicht gelöscht werden." - -#: lib/index.tcl:726 -msgid "Reverting selected files" -msgstr "Änderungen in gewählten Dateien verwerfen" - -#: lib/index.tcl:730 -#, tcl-format -msgid "Reverting %s" -msgstr "Änderungen in %s verwerfen" - -#: lib/branch_checkout.tcl:16 -#, tcl-format -msgid "%s (%s): Checkout Branch" -msgstr "%s (%s): Branch auschecken" - -#: lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "Branch auschecken" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "Auschecken" - -#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 -msgid "Options" -msgstr "Optionen" - -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Trackingbranch anfordern" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "Verbindung zu lokalem Branch lösen" - -#: lib/status_bar.tcl:263 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i von %*i %s (%3i%%)" - -#: lib/remote.tcl:200 -msgid "Push to" -msgstr "Versenden nach" - -#: lib/remote.tcl:218 -msgid "Remove Remote" -msgstr "Externes Repository entfernen" - -#: lib/remote.tcl:223 -msgid "Prune from" -msgstr "Veraltete Branches entfernen" - -#: lib/remote.tcl:228 -msgid "Fetch from" -msgstr "Anfordern" - -#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264 -msgid "All" -msgstr "Alle" - -#: lib/branch_rename.tcl:15 -#, tcl-format -msgid "%s (%s): Rename Branch" -msgstr "%s (%s): Branch umbenennen" - -#: lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "Branch umbenennen" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "Umbenennen" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "Branch:" - -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "Neuer Name:" - -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "Bitte wählen Sie einen Branch zum umbenennen." - -#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 -msgid "Please supply a branch name." -msgstr "Bitte geben Sie einen Branchnamen an." - -#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "»%s« ist kein zulässiger Branchname." - -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Fehler beim Umbenennen von »%s«." - -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "Auswählen" - -#: lib/choose_font.tcl:55 -msgid "Font Family" -msgstr "Schriftfamilie" - -#: lib/choose_font.tcl:76 -msgid "Font Size" -msgstr "Schriftgröße" - -#: lib/choose_font.tcl:93 -msgid "Font Example" -msgstr "Schriftbeispiel" - -#: lib/choose_font.tcl:105 -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/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Ungültige globale Zeichenkodierung »%s«" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Ungültige Repository-Zeichenkodierung »%s«" - -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "Voreinstellungen wiederherstellen" - -#: lib/option.tcl:123 -msgid "Save" -msgstr "Speichern" - -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "%s Repository" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "Global (Alle Repositories)" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "Benutzername" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "E-Mail-Adresse" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "Zusammenführungs-Commits zusammenfassen" - -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "Ausführlichkeit der Zusammenführen-Meldungen" - -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "Vergleichsstatistik nach Zusammenführen anzeigen" - -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "Zusammenführungswerkzeug" - -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "Auf Dateiänderungsdatum verlassen" - -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "Veraltete Trackingbranches entfernen während Anforderung" - -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "Neue Branches automatisch als Trackingbranch" - -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "Benutze »textconv« für Vergleich und Annotieren" - -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "Kopie-Annotieren nur bei geänderten Dateien" - -#: lib/option.tcl:153 -msgid "Maximum Length of Recent Repositories List" -msgstr "Anzahl Einträge in »Letzte Repositories«" - -#: lib/option.tcl:154 -msgid "Minimum Letters To Blame Copy On" -msgstr "Mindestzahl Zeichen für Kopie-Annotieren" - -#: lib/option.tcl:155 -msgid "Blame History Context Radius (days)" -msgstr "Anzahl Tage für Annotieren-Historien-Kontext" - -#: lib/option.tcl:156 -msgid "Number of Diff Context Lines" -msgstr "Anzahl der Kontextzeilen beim Vergleich" - -#: lib/option.tcl:157 -msgid "Additional Diff Parameters" -msgstr "Zusätzliche Vergleich-/diff-Parameter" - -#: lib/option.tcl:158 -msgid "Commit Message Text Width" -msgstr "Textbreite der Commit-Beschreibung" - -#: lib/option.tcl:159 -msgid "New Branch Name Template" -msgstr "Namensvorlage für neue Branches" - -#: lib/option.tcl:160 -msgid "Default File Contents Encoding" -msgstr "Voreingestellte Zeichenkodierung" - -#: lib/option.tcl:161 -msgid "Warn before committing to a detached head" -msgstr "Warnen vor Committen auf losgelöste Branchspitze" - -#: lib/option.tcl:162 -msgid "Staging of untracked files" -msgstr "Unversionierte Dateien bereitstellen" - -#: lib/option.tcl:163 -msgid "Show untracked files" -msgstr "Unversionierte Dateien anzeigen" - -#: lib/option.tcl:164 -msgid "Tab spacing" -msgstr "Tabulator-Breite" - -#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282 -#: lib/database.tcl:57 -#, tcl-format -msgid "%s:" -msgstr "%s:" - -#: lib/option.tcl:210 -msgid "Change" -msgstr "Ändern" - -#: lib/option.tcl:254 -msgid "Spelling Dictionary:" -msgstr "Wörterbuch Rechtschreibprüfung:" - -#: lib/option.tcl:284 -msgid "Change Font" -msgstr "Schriftart ändern" - -#: lib/option.tcl:288 -#, tcl-format -msgid "Choose %s" -msgstr "%s wählen" - -#: lib/option.tcl:294 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:308 -msgid "Preferences" -msgstr "Einstellungen" - -#: lib/option.tcl:345 -msgid "Failed to completely save options:" -msgstr "Optionen konnten nicht gespeichert werden:" - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Voreinstellung" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Systemweit (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Andere" - -#: lib/tools.tcl:76 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein." - -#: lib/tools.tcl:92 -#, tcl-format -msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "Wollen Sie %1$s wirklich auf Datei »%2$s« starten?" - -#: lib/tools.tcl:96 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Wollen Sie %s wirklich starten?" - -#: lib/tools.tcl:118 -#, tcl-format -msgid "Tool: %s" -msgstr "Werkzeug: %s" - -#: lib/tools.tcl:119 -#, tcl-format -msgid "Running: %s" -msgstr "Starten: %s" - -#: lib/tools.tcl:158 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Werkzeug erfolgreich abgeschlossen: %s" - -#: lib/tools.tcl:160 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Werkzeug fehlgeschlagen: %s" - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Konflikt durch Basisversion ersetzen?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Konflikt durch diesen Branch ersetzen?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Konflikt durch anderen Branch ersetzen?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n" -"\n" -"»%s« wird überschrieben.\n" -"\n" -"Diese Operation kann nur rückgängig gemacht werden, wenn die\n" -"Zusammenführung erneut gestartet wird." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Auflösung hinzugefügt für %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch " -"das Zusamenführungswerkzeug gelöst werden." - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Konflikt-Datei existiert nicht" - -#: lib/mergetool.tcl:246 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Kein GUI Zusammenführungswerkzeug: »%s«" - -#: lib/mergetool.tcl:275 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«" - -#: lib/mergetool.tcl:310 -msgid "Merge tool is already running, terminate it?" -msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?" - -#: lib/mergetool.tcl:330 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Fehler beim Abrufen der Dateiversionen:\n" -"%s" - -#: lib/mergetool.tcl:350 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Zusammenführungswerkzeug konnte nicht gestartet werden:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:354 -msgid "Running merge tool..." -msgstr "Zusammenführungswerkzeug starten..." - -#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 -msgid "Merge tool failed." -msgstr "Zusammenführungswerkzeug fehlgeschlagen." - -#: lib/tools_dlg.tcl:22 -#, tcl-format -msgid "%s (%s): Add Tool" -msgstr "%s (%s): Werkzeug hinzufügen" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Neues Kommando für Werkzeug hinzufügen" - -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "Global hinzufügen" - -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "Einzelheiten des Werkzeugs" - -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:" - -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "Kommando:" - -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "Bestätigungsfrage vor Starten anzeigen" - -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Benutzer nach Version fragen (setzt $REVISION)" - -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)" - -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "Kein Ausgabefenster zeigen" - -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)" - -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "Bitte geben Sie einen Werkzeugnamen an." - -#: lib/tools_dlg.tcl:126 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Werkzeug »%s« existiert bereits." - -#: lib/tools_dlg.tcl:148 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Werkzeug konnte nicht hinzugefügt werden:\n" -"\n" -"%s" - -#: lib/tools_dlg.tcl:187 -#, tcl-format -msgid "%s (%s): Remove Tool" -msgstr "%s (%s): Werkzeug entfernen" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "Werkzeugkommandos entfernen" - -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "Entfernen" - -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "(Werkzeuge für lokales Repository werden in Blau angezeigt)" - -#: lib/tools_dlg.tcl:283 -#, tcl-format -msgid "%s (%s):" -msgstr "%s (%s):" - -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "Kommando aufrufen: %s" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "Argumente" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "Ok" - -#: lib/search.tcl:48 -msgid "Find:" -msgstr "Suchen:" - -#: lib/search.tcl:50 -msgid "Next" -msgstr "Nächster" - -#: lib/search.tcl:51 -msgid "Prev" -msgstr "Voriger" - -#: lib/search.tcl:52 -msgid "RegExp" -msgstr "RegAusdruck" - -#: lib/search.tcl:54 -msgid "Case" -msgstr "Groß/klein" - -#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75 -#, tcl-format -msgid "%s (%s): Create Desktop Icon" -msgstr "%s (%s): Desktop-Icon erstellen" - -#: lib/shortcut.tcl:24 lib/shortcut.tcl:65 -msgid "Cannot write shortcut:" -msgstr "Fehler beim Schreiben der Verknüpfung:" - -#: lib/shortcut.tcl:140 -msgid "Cannot write icon:" -msgstr "Fehler beim Erstellen des Icons:" - -#: lib/remote_branch_delete.tcl:29 -#, tcl-format -msgid "%s (%s): Delete Branch Remotely" -msgstr "%s (%s): Branch in externem Repository löschen" - -#: lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Branch in externem Repository löschen" - -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" -msgstr "In Repository" - -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" -msgstr "Branches" - -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" -msgstr "Nur löschen, wenn" - -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" -msgstr "Zusammengeführt mit:" - -#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 -msgid "Always (Do not perform merge checks)" -msgstr "Immer (Keine Zusammenführungsprüfung)" - -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." -msgstr "Für »Zusammenführen mit« muss ein Branch angegeben werden." - -#: lib/remote_branch_delete.tcl:185 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Folgende Branches sind noch nicht mit »%s« zusammengeführt:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:190 -#, 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 Commits vorher angefordert haben. Sie sollten versuchen, zuerst " -"von »%s« anzufordern." - -#: lib/remote_branch_delete.tcl:208 -msgid "Please select one or more branches to delete." -msgstr "Bitte wählen Sie mindestens einen Branch, der gelöscht werden soll." - -#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Das Wiederherstellen von gelöschten Branches ist nur mit größerem Aufwand " -"möglich.\n" -"\n" -"Sollen die ausgewählten Branches gelöscht werden?" - -#: lib/remote_branch_delete.tcl:227 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Branches auf »%s« werden gelöscht" - -#: lib/remote_branch_delete.tcl:300 -msgid "No repository selected." -msgstr "Kein Repository ausgewählt." - -#: lib/remote_branch_delete.tcl:305 -#, tcl-format -msgid "Scanning %s..." -msgstr "»%s« laden..." - -#: lib/choose_repository.tcl:45 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 -msgid "Create New Repository" -msgstr "Repository neu erstellen" - -#: lib/choose_repository.tcl:110 -msgid "New..." -msgstr "Neu..." - -#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 -msgid "Clone Existing Repository" -msgstr "Repository klonen" - -#: lib/choose_repository.tcl:128 -msgid "Clone..." -msgstr "Klonen..." - -#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 -msgid "Open Existing Repository" -msgstr "Repository öffnen" - -#: lib/choose_repository.tcl:141 -msgid "Open..." -msgstr "Öffnen..." - -#: lib/choose_repository.tcl:154 -msgid "Recent Repositories" -msgstr "Letzte Repositories" - -#: lib/choose_repository.tcl:164 -msgid "Open Recent Repository:" -msgstr "Zuletzt benutztes Repository öffnen:" - -#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 -#: lib/choose_repository.tcl:345 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Repository »%s« konnte nicht erstellt werden:" - -#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 -msgid "Create" -msgstr "Erstellen" - -#: lib/choose_repository.tcl:432 -msgid "Directory:" -msgstr "Verzeichnis:" - -#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 -#: lib/choose_repository.tcl:1139 -msgid "Git Repository" -msgstr "Git Repository" - -#: lib/choose_repository.tcl:487 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Verzeichnis »%s« existiert bereits." - -#: lib/choose_repository.tcl:491 -#, tcl-format -msgid "File %s already exists." -msgstr "Datei »%s« existiert bereits." - -#: lib/choose_repository.tcl:506 -msgid "Clone" -msgstr "Klonen" - -#: lib/choose_repository.tcl:519 -msgid "Source Location:" -msgstr "Herkunfts-Adresse:" - -#: lib/choose_repository.tcl:528 -msgid "Target Directory:" -msgstr "Zielverzeichnis:" - -#: lib/choose_repository.tcl:538 -msgid "Clone Type:" -msgstr "Art des Klonens:" - -#: lib/choose_repository.tcl:543 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (schnell, teilweise redundant, Hardlinks)" - -#: lib/choose_repository.tcl:548 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Alles kopieren (langsamer, volle Redundanz)" - -#: lib/choose_repository.tcl:553 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)" - -#: lib/choose_repository.tcl:560 -msgid "Recursively clone submodules too" -msgstr "Rekursiv weitere Submodule klonen" - -#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641 -#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864 -#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Kein Git-Repository: %s" - -#: lib/choose_repository.tcl:630 -msgid "Standard only available for local repository." -msgstr "Standard ist nur für lokale Repositories verfügbar." - -#: lib/choose_repository.tcl:634 -msgid "Shared only available for local repository." -msgstr "Verknüpft ist nur für lokale Repositories verfügbar." - -#: lib/choose_repository.tcl:655 -#, tcl-format -msgid "Location %s already exists." -msgstr "Adresse »%s« existiert bereits." - -#: lib/choose_repository.tcl:666 -msgid "Failed to configure origin" -msgstr "Der Ursprungsort konnte nicht eingerichtet werden" - -#: lib/choose_repository.tcl:678 -msgid "Counting objects" -msgstr "Objekte werden gezählt" - -#: lib/choose_repository.tcl:679 -msgid "buckets" -msgstr "Buckets" - -#: lib/choose_repository.tcl:703 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s" - -#: lib/choose_repository.tcl:740 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Von »%s« konnte nichts geklont werden." - -#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 -#: lib/choose_repository.tcl:974 -msgid "The 'master' branch has not been initialized." -msgstr "Der »master«-Branch wurde noch nicht initialisiert." - -#: lib/choose_repository.tcl:755 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert." - -#: lib/choose_repository.tcl:769 -#, tcl-format -msgid "Cloning from %s" -msgstr "Kopieren von »%s«" - -#: lib/choose_repository.tcl:800 -msgid "Copying objects" -msgstr "Objektdatenbank kopieren" - -#: lib/choose_repository.tcl:801 -msgid "KiB" -msgstr "KB" - -#: lib/choose_repository.tcl:825 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Objekt kann nicht kopiert werden: %s" - -#: lib/choose_repository.tcl:837 -msgid "Linking objects" -msgstr "Objekte verlinken" - -#: lib/choose_repository.tcl:838 -msgid "objects" -msgstr "Objekte" - -#: lib/choose_repository.tcl:846 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s" - -#: lib/choose_repository.tcl:903 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Branches und Objekte konnten nicht angefordert werden. Kontrollieren Sie " -"die Ausgaben auf der Konsole für weitere Angaben." - -#: lib/choose_repository.tcl:914 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Tags konnten nicht angefordert werden. Kontrollieren Sie die Ausgaben auf " -"der Konsole für weitere Angaben." - -#: lib/choose_repository.tcl:938 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Die Branchspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die " -"Ausgaben auf der Konsole für weitere Angaben." - -#: lib/choose_repository.tcl:947 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden." - -#: lib/choose_repository.tcl:953 -msgid "Clone failed." -msgstr "Klonen fehlgeschlagen." - -#: lib/choose_repository.tcl:960 -msgid "No default branch obtained." -msgstr "Kein voreingestellter Branch gefunden." - -#: lib/choose_repository.tcl:971 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "»%s« wurde nicht als Commit gefunden." - -#: lib/choose_repository.tcl:998 -msgid "Creating working directory" -msgstr "Arbeitskopie erstellen" - -#: lib/choose_repository.tcl:1028 -msgid "Initial file checkout failed." -msgstr "Erstellen der Arbeitskopie fehlgeschlagen." - -#: lib/choose_repository.tcl:1072 -msgid "Cloning submodules" -msgstr "Klone Submodul" - -#: lib/choose_repository.tcl:1087 -msgid "Cannot clone submodules." -msgstr "Submodul konnte nicht geklont werden." - -#: lib/choose_repository.tcl:1110 -msgid "Repository:" -msgstr "Repository:" - -#: lib/choose_repository.tcl:1159 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Repository »%s« konnte nicht geöffnet werden." - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - eine grafische Oberfläche für Git." - -#: lib/blame.tcl:74 -#, tcl-format -msgid "%s (%s): File Viewer" -msgstr "%s (%s): Datei-Browser" - -#: lib/blame.tcl:80 -msgid "Commit:" -msgstr "Commit:" - -#: lib/blame.tcl:282 -msgid "Copy Commit" -msgstr "Commit kopieren" - -#: lib/blame.tcl:286 -msgid "Find Text..." -msgstr "Text suchen..." - -#: lib/blame.tcl:290 -msgid "Goto Line..." -msgstr "Gehe zu Zeile..." - -#: lib/blame.tcl:299 -msgid "Do Full Copy Detection" -msgstr "Volle Kopie-Erkennung" - -#: lib/blame.tcl:303 -msgid "Show History Context" -msgstr "Historien-Kontext anzeigen" - -#: lib/blame.tcl:306 -msgid "Blame Parent Commit" -msgstr "Elterncommit annotieren" - -#: lib/blame.tcl:468 -#, tcl-format -msgid "Reading %s..." -msgstr "%s lesen..." - -#: lib/blame.tcl:596 -msgid "Loading copy/move tracking annotations..." -msgstr "Annotierungen für Kopieren/Verschieben werden geladen..." - -#: lib/blame.tcl:613 -msgid "lines annotated" -msgstr "Zeilen annotiert" - -#: lib/blame.tcl:815 -msgid "Loading original location annotations..." -msgstr "Annotierungen für ursprünglichen Ort werden geladen..." - -#: lib/blame.tcl:818 -msgid "Annotation complete." -msgstr "Annotierung vollständig." - -#: lib/blame.tcl:849 -msgid "Busy" -msgstr "Verarbeitung läuft" - -#: lib/blame.tcl:850 -msgid "Annotation process is already running." -msgstr "Annotierung läuft bereits." - -#: lib/blame.tcl:889 -msgid "Running thorough copy detection..." -msgstr "Intensive Kopie-Erkennung läuft..." - -#: lib/blame.tcl:957 -msgid "Loading annotation..." -msgstr "Annotierung laden..." - -#: lib/blame.tcl:1010 -msgid "Author:" -msgstr "Autor:" - -#: lib/blame.tcl:1014 -msgid "Committer:" -msgstr "Committer:" - -#: lib/blame.tcl:1019 -msgid "Original File:" -msgstr "Ursprüngliche Datei:" - -#: lib/blame.tcl:1067 -msgid "Cannot find HEAD commit:" -msgstr "Branchspitze (»HEAD commit«) kann nicht gefunden werden:" - -#: lib/blame.tcl:1122 -msgid "Cannot find parent commit:" -msgstr "Elterncommit kann nicht gefunden werden:" - -#: lib/blame.tcl:1137 -msgid "Unable to display parent" -msgstr "Elterncommit kann nicht angezeigt werden" - -#: lib/blame.tcl:1138 lib/diff.tcl:345 -msgid "Error loading diff:" -msgstr "Fehler beim Laden des Vergleichs:" - -#: lib/blame.tcl:1279 -msgid "Originally By:" -msgstr "Ursprünglich von:" - -#: lib/blame.tcl:1285 -msgid "In File:" -msgstr "In Datei:" - -#: lib/blame.tcl:1290 -msgid "Copied Or Moved Here By:" -msgstr "Kopiert oder verschoben durch:" - -#: lib/diff.tcl:77 -#, 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:117 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Vergleich von »%s« laden..." - -#: lib/diff.tcl:143 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOKAL: gelöscht\n" -"EXTERN:\n" - -#: lib/diff.tcl:148 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"EXTERN: gelöscht\n" -"LOKAL:\n" - -#: lib/diff.tcl:155 -msgid "LOCAL:\n" -msgstr "LOKAL:\n" - -#: lib/diff.tcl:158 -msgid "REMOTE:\n" -msgstr "EXTERN:\n" - -#: lib/diff.tcl:220 lib/diff.tcl:344 -#, tcl-format -msgid "Unable to display %s" -msgstr "Datei »%s« kann nicht angezeigt werden" - -#: lib/diff.tcl:221 -msgid "Error loading file:" -msgstr "Fehler beim Laden der Datei:" - -#: lib/diff.tcl:227 -msgid "Git Repository (subproject)" -msgstr "Git-Repository (Subprojekt)" - -#: lib/diff.tcl:239 -msgid "* Binary file (not showing content)." -msgstr "* Binärdatei (Inhalt wird nicht angezeigt)" - -#: lib/diff.tcl:244 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Unversionierte Datei hat %d Bytes.\n" -"* Nur erste %d Bytes werden angezeigt.\n" - -#: lib/diff.tcl:250 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Unversionierte Datei, hier abgeschnitten durch %s.\n" -"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n" - -#: lib/diff.tcl:583 -msgid "Failed to unstage selected hunk." -msgstr "" -"Fehler beim Herausnehmen des gewählten Patch-Blocks aus der Bereitstellung." - -#: lib/diff.tcl:591 -msgid "Failed to revert selected hunk." -msgstr "Fehler beim Zurücknehmen des gewählten Patch-Blocks." - -#: lib/diff.tcl:594 -msgid "Failed to stage selected hunk." -msgstr "Fehler beim Bereitstellen des gewählten Patch-Blocks." - -#: lib/diff.tcl:687 -msgid "Failed to unstage selected line." -msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung." - -#: lib/diff.tcl:696 -msgid "Failed to revert selected line." -msgstr "Fehler beim Zurücknehmen der gewählten Zeile." - -#: lib/diff.tcl:700 -msgid "Failed to stage selected line." -msgstr "Fehler beim Bereitstellen der gewählten Zeile." - -#: lib/diff.tcl:889 -msgid "Failed to undo last revert." -msgstr "Fehler beim Rückgängigmachen des letzten Zurücknehmen-Commits" - -#: lib/sshkey.tcl:34 -msgid "No keys found." -msgstr "Keine Schlüssel gefunden." - -#: lib/sshkey.tcl:37 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Öffentlicher Schlüssel gefunden in: %s" - -#: lib/sshkey.tcl:43 -msgid "Generate Key" -msgstr "Schlüssel erzeugen" - -#: lib/sshkey.tcl:61 -msgid "Copy To Clipboard" -msgstr "In Zwischenablage kopieren" - -#: lib/sshkey.tcl:75 -msgid "Your OpenSSH Public Key" -msgstr "Ihr OpenSSH öffenlicher Schlüssel" - -#: lib/sshkey.tcl:83 -msgid "Generating..." -msgstr "Erzeugen..." - -#: lib/sshkey.tcl:89 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Konnte »ssh-keygen« nicht starten:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:116 -msgid "Generation failed." -msgstr "Schlüsselerzeugung fehlgeschlagen." - -#: lib/sshkey.tcl:123 -msgid "Generation succeeded, but no keys found." -msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden." - -#: lib/sshkey.tcl:126 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Ihr Schlüssel ist abgelegt in: %s" - -#: lib/branch_create.tcl:23 -#, tcl-format -msgid "%s (%s): Create Branch" -msgstr "%s (%s): Branch erstellen" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "Neuen Branch erstellen" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "Branchname" - -#: lib/branch_create.tcl:57 -msgid "Match Tracking Branch Name" -msgstr "Passend zu Trackingbranch-Name" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Anfangsversion" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Existierenden Branch aktualisieren:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nein" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Nur Vorspulen" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Branch auschecken nach Erstellen" - -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "Bitte wählen Sie einen Trackingbranch." - -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Trackingbranch »%s« ist kein Branch im externen Repository." - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Verarbeitung. Bitte warten..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Erfolgreich" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Fehler: Kommando fehlgeschlagen" - -#: lib/line.tcl:17 -msgid "Goto Line:" -msgstr "Gehe zu Zeile:" - -#: lib/line.tcl:23 -msgid "Go" -msgstr "Gehe" - -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" -msgstr "Losgelöste Arbeitskopie-Version" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Version Regex-Ausdruck:" - -#: lib/choose_rev.tcl:72 -msgid "Local Branch" -msgstr "Lokaler Branch" - -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" -msgstr "Trackingbranch" - -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 -msgid "Tag" -msgstr "Tag" - -#: lib/choose_rev.tcl:321 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Ungültige Version: %s" - -#: lib/choose_rev.tcl:342 -msgid "No revision selected." -msgstr "Keine Version ausgewählt." - -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." -msgstr "Versions-Ausdruck ist leer." - -#: lib/choose_rev.tcl:537 -msgid "Updated" -msgstr "Aktualisiert" - -#: lib/choose_rev.tcl:565 -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 "" -"Kein Commit zur Nachbesserung vorhanden.\n" -"\n" -"Sie sind dabei, den ersten Commit zu erstellen. Es gibt keinen existierenden " -"Commit, den 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 bei Zusammenführung nicht möglich.\n" -"\n" -"Sie haben das Zusammenführen von Commits angefangen, aber noch nicht " -"beendet. Sie können keinen vorigen Commit nachbessern, solange eine " -"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung " -"beenden oder abbrechen.\n" - -#: lib/commit.tcl:56 -msgid "Error loading commit data for amend:" -msgstr "Fehler beim Laden der Commitdaten für Nachbessern:" - -#: lib/commit.tcl:83 -msgid "Unable to obtain your identity:" -msgstr "Benutzername konnte nicht bestimmt werden:" - -#: lib/commit.tcl:88 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:" - -#: lib/commit.tcl:138 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht." - -#: lib/commit.tcl:158 -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 Repository überein.\n" -"\n" -"Ein anderes Git-Programm hat das Repository seit dem letzten Laden " -"geändert. Vor dem nächsten Commit muss neu geladen werden.\n" -"\n" -"Es wird gleich neu geladen.\n" - -#: lib/commit.tcl:182 -#, 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 committet werden.\n" -"\n" -"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie " -"müssen diese Konflikte auflösen und die Dateien in die Bereitstellung " -"hinzufügen, bevor Sie committen können.\n" - -#: lib/commit.tcl:190 -#, 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 committet werden.\n" - -#: lib/commit.tcl:198 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Keine Änderungen vorhanden, die committet werden könnten.\n" -"\n" -"Sie müssen mindestens eine Datei bereitstellen, bevor Sie committen können.\n" - -#: lib/commit.tcl:213 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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:244 -msgid "Calling pre-commit hook..." -msgstr "Aufrufen des »pre-commit hook«..." - -#: lib/commit.tcl:259 -msgid "Commit declined by pre-commit hook." -msgstr "Committen abgelehnt durch »pre-commit hook«." - -#: lib/commit.tcl:278 -msgid "" -"You are about to commit on a detached head. This is a potentially dangerous " -"thing to do because if you switch to another branch you will lose your " -"changes and it can be difficult to retrieve them later from the reflog. You " -"should probably cancel this commit and create a new branch to continue.\n" -" \n" -" Do you really want to proceed with your Commit?" -msgstr "" -"Sie sind dabei, einen Commit auf losgelöste Branchspitze (»commit to " -"detached head«) zu erstellen. Das ist riskant, denn wenn Sie zu einem " -"anderen Branch wechseln, würden Sie diese Änderungen verlieren und es ist " -"nachträglich schwierig, diese aus dem Commit-Log (»reflog«) wiederzufinden. " -"Es wird empfohlen, diesen Commit abzubrechen und zunächst einen neuen Branch " -"zu erstellen.\n" -"\n" -" Wollen Sie den Commit trotzdem in dieser Form erstellen?" - -#: lib/commit.tcl:299 -msgid "Calling commit-msg hook..." -msgstr "Aufrufen des »commit-msg hook«..." - -#: lib/commit.tcl:314 -msgid "Commit declined by commit-msg hook." -msgstr "Committen abgelehnt durch »commit-msg hook«." - -#: lib/commit.tcl:327 -msgid "Committing changes..." -msgstr "Änderungen committen..." - -#: lib/commit.tcl:344 -msgid "write-tree failed:" -msgstr "write-tree fehlgeschlagen:" - -#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 -msgid "Commit failed." -msgstr "Committen fehlgeschlagen." - -#: lib/commit.tcl:362 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Version »%s« scheint beschädigt zu sein" - -#: lib/commit.tcl:367 -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 zum committen.\n" -"\n" -"Es gibt keine geänderte Datei in diesem Commit und es wurde auch nichts " -"zusammengeführt.\n" -"\n" -"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n" - -#: lib/commit.tcl:374 -msgid "No changes to commit." -msgstr "Keine Änderungen, die committet werden können." - -#: lib/commit.tcl:394 -msgid "commit-tree failed:" -msgstr "commit-tree fehlgeschlagen:" - -#: lib/commit.tcl:421 -msgid "update-ref failed:" -msgstr "update-ref fehlgeschlagen:" - -#: lib/commit.tcl:514 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Commit %s erstellt: %s" - -#: lib/branch_delete.tcl:16 -#, tcl-format -msgid "%s (%s): Delete Branch" -msgstr "%s (%s): Branch löschen" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "Lokalen Branch löschen" - -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "Lokale Branches" - -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "Nur löschen, wenn zusammengeführt nach" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Folgende Branches sind noch nicht mit »%s« zusammengeführt:" - -#: lib/branch_delete.tcl:131 -#, tcl-format -msgid " - %s:" -msgstr " - %s:" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Fehler beim Löschen der Branches:\n" -"%s" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ungültiges Datum von Git: %s" - -#: lib/database.tcl:42 -msgid "Number of loose objects" -msgstr "Anzahl unverknüpfter Objekte" - -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" -msgstr "Festplattenplatz von unverknüpften Objekten" - -#: lib/database.tcl:44 -msgid "Number of packed objects" -msgstr "Anzahl komprimierter Objekte" - -#: lib/database.tcl:45 -msgid "Number of packs" -msgstr "Anzahl Komprimierungseinheiten" - -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" -msgstr "Festplattenplatz von komprimierten Objekten" - -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" -msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind" - -#: lib/database.tcl:48 -msgid "Garbage files" -msgstr "Dateien im Mülleimer" - -#: lib/database.tcl:66 -#, tcl-format -msgid "%s (%s): Database Statistics" -msgstr "%s (%s): Datenbankstatistik" - -#: 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:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Dieses Repository enthält ungefähr %i nicht verknüpfte Objekte.\n" -"\n" -"Für eine optimale Performance wird empfohlen, die Datenbank des Repository " -"zu komprimieren.\n" -"\n" -"Soll die Datenbank jetzt komprimiert werden?" - -#: lib/error.tcl:20 -#, tcl-format -msgid "%s: error" -msgstr "%s: Fehler" - -#: lib/error.tcl:36 -#, tcl-format -msgid "%s: warning" -msgstr "%s: Warnung" - -#: lib/error.tcl:80 -#, tcl-format -msgid "%s hook failed:" -msgstr "%s hook fehlgeschlagen:" - -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." -msgstr "" -"Sie müssen die obigen Fehler zuerst beheben, bevor Sie committen können." - -#: lib/error.tcl:116 -#, tcl-format -msgid "%s (%s): error" -msgstr "%s (%s): Fehler" - -#: 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 den Nachbesserungs-Commit 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 Repository überein.\n" -"\n" -"Ein anderes Git-Programm hat das Repository 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:45 -#, 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.\n" -"\n" -"Sie müssen diese Konflikte per Hand auflösen. Anschließend müssen Sie die " -"Datei wieder bereitstellen und committen, um die Zusammenführung " -"abzuschließen. Erst danach kann eine neue Zusammenführung begonnen werden.\n" - -#: lib/merge.tcl:55 -#, 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.\n" -"\n" -"Sie sollten zuerst den bereitgestellten Commit 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:108 -#, tcl-format -msgid "%s of %s" -msgstr "%s von %s" - -#: lib/merge.tcl:126 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Zusammenführen von %s und %s..." - -#: lib/merge.tcl:137 -msgid "Merge completed successfully." -msgstr "Zusammenführen erfolgreich abgeschlossen." - -#: lib/merge.tcl:139 -msgid "Merge failed. Conflict resolution is required." -msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig." - -#: lib/merge.tcl:156 -#, tcl-format -msgid "%s (%s): Merge" -msgstr "%s (%s): Zusammenführen" - -#: lib/merge.tcl:164 -#, tcl-format -msgid "Merge Into %s" -msgstr "Zusammenführen in »%s«" - -#: lib/merge.tcl:183 -msgid "Revision To Merge" -msgstr "Zusammenzuführende Version" - -#: lib/merge.tcl:218 -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 diese Commits abschließen.\n" - -#: lib/merge.tcl:228 -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 committeten Änderungen verloren.\n" -"\n" -"Zusammenführen jetzt abbrechen?" - -#: lib/merge.tcl:234 -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 verwerfen?\n" -"\n" -"Alle noch nicht committeten Änderungen würden verloren gehen.\n" -"\n" -"Änderungen jetzt verwerfen?" - -#: lib/merge.tcl:246 -msgid "Aborting" -msgstr "Abbruch" - -#: lib/merge.tcl:247 -msgid "files reset" -msgstr "Dateien zurückgesetzt" - -#: lib/merge.tcl:277 -msgid "Abort failed." -msgstr "Abbruch fehlgeschlagen." - -#: lib/merge.tcl:279 -msgid "Abort completed. Ready." -msgstr "Abbruch durchgeführt. Bereit." diff --git a/third_party/git/git-gui/po/el.po b/third_party/git/git-gui/po/el.po deleted file mode 100644 index 3634ba469da0..000000000000 --- a/third_party/git/git-gui/po/el.po +++ /dev/null @@ -1,2005 +0,0 @@ -# Translation of git-gui to Greek -# Copyright (C) 2009 Jimmy Angelakos -# This file is distributed under the same license as the git-gui package. -# Jimmy Angelakos <vyruss@hellug.gr>, 2009. -msgid "" -msgstr "" -"Project-Id-Version: el\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-14 07:18+0100\n" -"PO-Revision-Date: 2009-06-23 21:33+0300\n" -"Last-Translator: Jimmy Angelakos <vyruss@hellug.gr>\n" -"Language-Team: Greek <i18n@lists.hellug.gr>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.3\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 -msgid "git-gui: fatal error" -msgstr "git-gui: κρίσιμο σφάλμα" - -#: git-gui.sh:593 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Μη έγκυρη γραμματοσειρά στο %s:" - -#: git-gui.sh:620 -msgid "Main Font" -msgstr "Κύρια Γραμματοσειρά" - -#: git-gui.sh:621 -msgid "Diff/Console Font" -msgstr "Γραμματοσειρά Διαφοράς/Κονσόλας" - -#: git-gui.sh:635 -msgid "Cannot find git in PATH." -msgstr "Δε βρέθηκε το git στο PATH." - -#: git-gui.sh:662 -msgid "Cannot parse Git version string:" -msgstr "Αδύνατη η ανάγνωση στοιχειοσειράς έκδοσης Git:" - -#: git-gui.sh:680 -#, 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 απαιτεί τουλάχιστον Git 1.5.0 ή πιό πρόσφατη.\n" -"\n" -"Να υποτεθεί πως το '%s' είναι η έκδοση 1.5.0;\n" - -#: git-gui.sh:918 -msgid "Git directory not found:" -msgstr "Δε βρέθηκε φάκελος Git:" - -#: git-gui.sh:925 -msgid "Cannot move to top of working directory:" -msgstr "Δεν είναι δυνατή η μετακίνηση στην κορυφή του φακέλου εργασίας:" - -#: git-gui.sh:932 -msgid "Cannot use funny .git directory:" -msgstr "Δεν είναι δυνατή η χρήση περίεργου φακέλου .git:" - -#: git-gui.sh:937 -msgid "No working directory" -msgstr "Δεν υπάρχει φάκελος εργασίας" - -#: git-gui.sh:1084 lib/checkout_op.tcl:283 -msgid "Refreshing file status..." -msgstr "Ανανέωση κατάστασης αρχείου..." - -#: git-gui.sh:1149 -msgid "Scanning for modified files ..." -msgstr "Ανίχνευση για τροποποιημένα αρχεία..." - -#: git-gui.sh:1324 lib/browser.tcl:246 -msgid "Ready." -msgstr "Έτοιμο." - -#: git-gui.sh:1590 -msgid "Unmodified" -msgstr "Μη τροποποιημένο" - -#: git-gui.sh:1592 -msgid "Modified, not staged" -msgstr "Τροποποιημένο, μη σταδιοποιημένο" - -#: git-gui.sh:1593 git-gui.sh:1598 -msgid "Staged for commit" -msgstr "Σταδιοποιημένο προς υποβολή" - -#: git-gui.sh:1594 git-gui.sh:1599 -msgid "Portions staged for commit" -msgstr "Μέρη σταδιοποιημένα προς υποβολή" - -#: git-gui.sh:1595 git-gui.sh:1600 -msgid "Staged for commit, missing" -msgstr "Σταδιοποιημένο προς υποβολή, λείπει" - -#: git-gui.sh:1597 -msgid "Untracked, not staged" -msgstr "Μη παρακολουθούμενο, μη σταδιοποιημένο" - -#: git-gui.sh:1602 -msgid "Missing" -msgstr "Λείπει" - -#: git-gui.sh:1603 -msgid "Staged for removal" -msgstr "Σταδιοποιημένο προς αφαίρεση" - -#: git-gui.sh:1604 -msgid "Staged for removal, still present" -msgstr "Σταδιοποιημένο προς αφαίρεση, ακόμα παρόν" - -#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609 -msgid "Requires merge resolution" -msgstr "Απαιτεί επίλυση συγχώνευσης" - -#: git-gui.sh:1644 -msgid "Starting gitk... please wait..." -msgstr "Γίνεται εκκίνηση του gitk... παρακαλώ περιμένετε..." - -#: git-gui.sh:1653 -#, tcl-format -msgid "" -"Unable to start gitk:\n" -"\n" -"%s does not exist" -msgstr "" -"Αδυναμία εκκίνησης του gitk:\n" -"\n" -"Το %s δεν υπάρχει" - -#: git-gui.sh:1860 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Αποθετήριο" - -#: git-gui.sh:1861 -msgid "Edit" -msgstr "Επεξεργασία" - -#: git-gui.sh:1863 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Κλάδος" - -#: git-gui.sh:1866 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Υποβολή@@noun" - -#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167 -msgid "Merge" -msgstr "Συγχώνευση" - -#: git-gui.sh:1870 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Απομακρυσμένο" - -#: git-gui.sh:1879 -msgid "Browse Current Branch's Files" -msgstr "Περιήγηση Αρχείων Τρέχοντα Κλάδου" - -#: git-gui.sh:1883 -msgid "Browse Branch Files..." -msgstr "Περιήγηση Αρχείων Κλάδου..." - -#: git-gui.sh:1888 -msgid "Visualize Current Branch's History" -msgstr "Απεικόνιση Ιστορικού Τρέχοντα Κλάδου" - -#: git-gui.sh:1892 -msgid "Visualize All Branch History" -msgstr "Απεικόνιση Ιστορικού Όλων των Κλάδων" - -#: git-gui.sh:1899 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Περιήγηση Αρχείων του %s" - -#: git-gui.sh:1901 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Απεικόνιση Ιστορικού του %s" - -#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Στατιστικά Βάσης Δεδομένων" - -#: git-gui.sh:1909 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Συμπίεση Βάσης Δεδομένων" - -#: git-gui.sh:1912 -msgid "Verify Database" -msgstr "Επαλήθευση Βάσης Δεδομένων" - -#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 -msgid "Create Desktop Icon" -msgstr "Δημιουργία Εικονιδίου Επιφάνειας Εργασίας" - -#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185 -msgid "Quit" -msgstr "Έξοδος" - -#: git-gui.sh:1939 -msgid "Undo" -msgstr "Αναίρεση" - -#: git-gui.sh:1942 -msgid "Redo" -msgstr "Ξανά" - -#: git-gui.sh:1946 git-gui.sh:2443 -msgid "Cut" -msgstr "Αποκοπή" - -#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Αντιγραφή" - -#: git-gui.sh:1952 git-gui.sh:2449 -msgid "Paste" -msgstr "Επικόλληση" - -#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Διαγραφή" - -#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71 -msgid "Select All" -msgstr "Επιλογή Όλων" - -#: git-gui.sh:1968 -msgid "Create..." -msgstr "Δημιουργία..." - -#: git-gui.sh:1974 -msgid "Checkout..." -msgstr "Εξαγωγή..." - -#: git-gui.sh:1980 -msgid "Rename..." -msgstr "Μετονομασία..." - -#: git-gui.sh:1985 git-gui.sh:2085 -msgid "Delete..." -msgstr "Διαγραφή..." - -#: git-gui.sh:1990 -msgid "Reset..." -msgstr "Επαναφορά..." - -#: git-gui.sh:2002 git-gui.sh:2389 -msgid "New Commit" -msgstr "Νέα Υποβολή" - -#: git-gui.sh:2010 git-gui.sh:2396 -msgid "Amend Last Commit" -msgstr "Διόρθωση Τελευταίας Υποβολής" - -#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Επανανίχνευση" - -#: git-gui.sh:2025 -msgid "Stage To Commit" -msgstr "Σταδιοποίηση Προς Υποβολή" - -#: git-gui.sh:2031 -msgid "Stage Changed Files To Commit" -msgstr "Σταδιοποίηση Αλλαγμένων Αρχείων Προς Υποβολή" - -#: git-gui.sh:2037 -msgid "Unstage From Commit" -msgstr "Αποσταδιοποίηση Από Υποβολή" - -#: git-gui.sh:2042 lib/index.tcl:395 -msgid "Revert Changes" -msgstr "Αναίρεση Αλλαγών" - -#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467 -msgid "Sign Off" -msgstr "Αποσύνδεση" - -#: git-gui.sh:2053 git-gui.sh:2372 -msgid "Commit@@verb" -msgstr "Υποβολή@@verb" - -#: git-gui.sh:2064 -msgid "Local Merge..." -msgstr "Τοπική Συγχώνευση..." - -#: git-gui.sh:2069 -msgid "Abort Merge..." -msgstr "Ακύρωση Συγχώνευσης..." - -#: git-gui.sh:2081 -msgid "Push..." -msgstr "Ώθηση..." - -#: git-gui.sh:2092 lib/choose_repository.tcl:41 -#, fuzzy -msgid "Apple" -msgstr "" - -#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 -#, tcl-format -msgid "About %s" -msgstr "Περί %s" - -#: git-gui.sh:2099 -msgid "Preferences..." -msgstr "Προτιμήσεις..." - -#: git-gui.sh:2107 git-gui.sh:2639 -msgid "Options..." -msgstr "Επιλογές..." - -#: git-gui.sh:2113 lib/choose_repository.tcl:47 -msgid "Help" -msgstr "Βοήθεια" - -#: git-gui.sh:2154 -msgid "Online Documentation" -msgstr "Διαδικτυακή Τεκμηρίωση" - -#: git-gui.sh:2238 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "κρίσιμο: δε βρέθηκε η διαδρομή: %s: Δεν υπάρχει το αρχείο ή ο φάκελος" - -#: git-gui.sh:2271 -msgid "Current Branch:" -msgstr "Τρέχων Κλάδος:" - -#: git-gui.sh:2292 -msgid "Staged Changes (Will Commit)" -msgstr "Σταδιοποιημένες Αλλαγές (Θα Υποβληθούν)" - -#: git-gui.sh:2312 -msgid "Unstaged Changes" -msgstr "Μη Σταδιοποιημένες Αλλαγές" - -#: git-gui.sh:2362 -msgid "Stage Changed" -msgstr "Σταδιοποίηση Αλλαγών" - -#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182 -msgid "Push" -msgstr "Ώθηση" - -#: git-gui.sh:2408 -msgid "Initial Commit Message:" -msgstr "Αρχικό Μήνυμα Υποβολής:" - -#: git-gui.sh:2409 -msgid "Amended Commit Message:" -msgstr "Διορθωμένο Μήνυμα Υποβολής:" - -#: git-gui.sh:2410 -msgid "Amended Initial Commit Message:" -msgstr "Διορθωμένο Αρχικό Μήνυμα Υποβολής:" - -#: git-gui.sh:2411 -msgid "Amended Merge Commit Message:" -msgstr "Διορθωμένο Μήνυμα Υποβολής Συγχώνευσης:" - -#: git-gui.sh:2412 -msgid "Merge Commit Message:" -msgstr "Μήνυμα Υποβολής Συγχώνευσης:" - -#: git-gui.sh:2413 -msgid "Commit Message:" -msgstr "Μήνυμα Υποβολής:" - -#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73 -msgid "Copy All" -msgstr "Αντιγραφή Όλων" - -#: git-gui.sh:2483 lib/blame.tcl:107 -msgid "File:" -msgstr "Αρχείο:" - -#: git-gui.sh:2589 -msgid "Apply/Reverse Hunk" -msgstr "Εφαρμογή/Αντιστροφή Κομματιού" - -#: git-gui.sh:2595 -msgid "Show Less Context" -msgstr "Προβολή Στενότερου Πλαισίου" - -#: git-gui.sh:2602 -msgid "Show More Context" -msgstr "Προβολή Ευρύτερου Πλαισίου" - -#: git-gui.sh:2610 -msgid "Refresh" -msgstr "Ανανέωση" - -#: git-gui.sh:2631 -msgid "Decrease Font Size" -msgstr "Μείωση Μεγέθους Γραμματοσειράς" - -#: git-gui.sh:2635 -msgid "Increase Font Size" -msgstr "Αύξηση Μεγέθους Γραμματοσειράς" - -#: git-gui.sh:2646 -msgid "Unstage Hunk From Commit" -msgstr "Αποσταδιοποίηση Κομματιού Από Υποβολή" - -#: git-gui.sh:2648 -msgid "Stage Hunk For Commit" -msgstr "Σταδιοποίηση Κομματιού Προς Υποβολή" - -#: git-gui.sh:2667 -msgid "Initializing..." -msgstr "Γίνεται αρχικοποίηση..." - -#: git-gui.sh:2762 -#, 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" -"Οι εξής μεταβλητές περιβάλλοντος μάλλον θα\n" -"αγνοηθούν από πιθανή εκτέλεση υποδιεργασίας Git\n" -"από το %s:\n" -"\n" - -#: git-gui.sh:2792 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Αυτό οφείλεται σε ένα γνωστό θέμα με το\n" -"εκτελέσιμο Tcl που διανέμεται με το Cygwin." - -#: git-gui.sh:2797 -#, 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" -"Ένα καλό υποκατάστατο για το %s\n" -"είναι η τοποθέτηση τιμών για τις ρυθμίσεις\n" -"user.name και user.email στο προσωπικό σας\n" -"αρχείο ~/.gitconfig .\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - ένα γραφικό περιβάλλον για το Git." - -#: lib/blame.tcl:77 -msgid "File Viewer" -msgstr "Εφαρμογή Προβολής Αρχείου" - -#: lib/blame.tcl:81 -msgid "Commit:" -msgstr "Υποβολή:" - -#: lib/blame.tcl:264 -msgid "Copy Commit" -msgstr "Αντιγραφή Υποβολής" - -#: lib/blame.tcl:384 -#, tcl-format -msgid "Reading %s..." -msgstr "Ανάγνωση %s..." - -#: lib/blame.tcl:488 -msgid "Loading copy/move tracking annotations..." -msgstr "Γίνεται φόρτωση σχολίων παρακολούθησης αντιγραφής/μετακίνησης..." - -#: lib/blame.tcl:508 -msgid "lines annotated" -msgstr "γραμμές σχολιασμένες" - -#: lib/blame.tcl:689 -msgid "Loading original location annotations..." -msgstr "Γίνεται φόρτωση σχολίων αρχικής τοποθεσίας..." - -#: lib/blame.tcl:692 -msgid "Annotation complete." -msgstr "Έγινε ολοκλήρωση του σχολιασμού." - -#: lib/blame.tcl:746 -msgid "Loading annotation..." -msgstr "Φόρτωση σχολίου..." - -#: lib/blame.tcl:802 -msgid "Author:" -msgstr "Δημιουργός:" - -#: lib/blame.tcl:806 -msgid "Committer:" -msgstr "Υποβολέας:" - -#: lib/blame.tcl:811 -msgid "Original File:" -msgstr "Αρχικό Αρχείο:" - -#: lib/blame.tcl:925 -msgid "Originally By:" -msgstr "Αρχικά Από:" - -#: lib/blame.tcl:931 -msgid "In File:" -msgstr "Στο Αρχείο:" - -#: lib/blame.tcl:936 -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:282 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171 -#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 -msgid "Cancel" -msgstr "Ακύρωση" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 -msgid "Revision" -msgstr "Αναθεώρηση" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242 -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:371 -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 -#, fuzzy -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:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Γίνεται φόρτωση %s..." - -#: lib/browser.tcl:187 -#, fuzzy -msgid "[Up To Parent]" -msgstr "[Πάνω Προς Γονέα]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Περιήγηση Αρχείων Κλάδου" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:387 -#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484 -#: lib/choose_repository.tcl:987 -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:81 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:323 -msgid "files checked out" -msgstr "αρχεία έχουν εξαχθεί" - -#: 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" -"Αν θέλατε να βρίσκεστε σε κλάδο, δημιουργήστε έναν τώρα αρχίζοντας από 'This " -"Detached Checkout'." - -#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450 -#, 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:163 -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" -"\n" -"Αυτό δε θα έπρεπε να συμβεί. Το %s θα κλείσει και θα εγκαταλείψει τώρα." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Επιλογή" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Οικογένεια Γραμματοσειράς" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Μέγεθος Γραμματοσειράς" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Παράδειγμα Γραμματοσειράς" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Αυτό είναι ένα παράδειγμα κειμένου.\n" -"Αν σας αρέσει αυτό το κείμενο, μπορεί να γίνει δικό σας." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Γραφικό Περιβάλλον Git" - -#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376 -msgid "Create New Repository" -msgstr "Δημιουργία Νέου Αποθετηρίου" - -#: lib/choose_repository.tcl:87 -msgid "New..." -msgstr "Νέο..." - -#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460 -msgid "Clone Existing Repository" -msgstr "Κλωνοποίηση Υπάρχοντος Αποθετηρίου" - -#: lib/choose_repository.tcl:100 -msgid "Clone..." -msgstr "Κλωνοποίηση..." - -#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976 -msgid "Open Existing Repository" -msgstr "Άνοιγμα Υπάρχοντος Αποθετηρίου" - -#: lib/choose_repository.tcl:113 -msgid "Open..." -msgstr "Άνοιγμα..." - -#: lib/choose_repository.tcl:126 -msgid "Recent Repositories" -msgstr "Πρόσφατα Αποθετήρια" - -#: lib/choose_repository.tcl:132 -msgid "Open Recent Repository:" -msgstr "Άνοιγμα Πρόσφατου Αποθετηρίου:" - -#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303 -#: lib/choose_repository.tcl:310 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Αποτυχία δημιουργίας αποθετηρίου %s:" - -#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478 -msgid "Directory:" -msgstr "Φάκελος:" - -#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537 -#: lib/choose_repository.tcl:1011 -msgid "Git Repository" -msgstr "Αποθετήριο Git" - -#: lib/choose_repository.tcl:437 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Ο Φάκελος '%s' υπάρχει ήδη." - -#: lib/choose_repository.tcl:441 -#, tcl-format -msgid "File %s already exists." -msgstr "Το αρχείο %s υπάρχει ήδη." - -#: lib/choose_repository.tcl:455 -msgid "Clone" -msgstr "Κλώνος" - -#: lib/choose_repository.tcl:468 -#, fuzzy -msgid "URL:" -msgstr "" - -#: lib/choose_repository.tcl:489 -msgid "Clone Type:" -msgstr "Τύπος Κλώνου:" - -#: lib/choose_repository.tcl:495 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Τυπικό (Ταχύ, Ημι-Πλεονάζον, Hardlinks)" - -#: lib/choose_repository.tcl:501 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Πλήρες Αντίγραφο (Πιο αργό, Πλεονάζον Αντίγραφο Ασφαλείας)" - -#: lib/choose_repository.tcl:507 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Κοινή Χρήση (Ταχύτατο, Δε Συνιστάται, Κανένα Αντίγραφο Ασφαλείας)" - -#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590 -#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806 -#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Δεν είναι αποθετήριο Git: %s" - -#: lib/choose_repository.tcl:579 -msgid "Standard only available for local repository." -msgstr "\"Τυπικό\" διαθέσιμο μόνο για τοπικό αποθετήριο." - -#: lib/choose_repository.tcl:583 -msgid "Shared only available for local repository." -msgstr "\"Κοινή Χρήση\" διαθέσιμη μόνο για τοπικό αποθετήριο." - -#: lib/choose_repository.tcl:604 -#, tcl-format -msgid "Location %s already exists." -msgstr "Η Τοποθεσία %s υπάρχει ήδη." - -#: lib/choose_repository.tcl:615 -msgid "Failed to configure origin" -msgstr "Αποτυχία ρύθμισης πηγής" - -#: lib/choose_repository.tcl:627 -msgid "Counting objects" -msgstr "Γίνεται καταμέτρηση αντικειμένων" - -#: lib/choose_repository.tcl:628 -#, fuzzy -msgid "buckets" -msgstr "" - -#: lib/choose_repository.tcl:652 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Αδυναμία αντιγραφής αντικειμένων/πληροφοριών/ενναλακτικών: %s" - -#: lib/choose_repository.tcl:688 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Τίποτα προς κλωνοποίηση από το %s." - -#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904 -#: lib/choose_repository.tcl:916 -msgid "The 'master' branch has not been initialized." -msgstr "Ο κλάδος 'master' δεν έχει αρχικοποιηθεί." - -#: lib/choose_repository.tcl:703 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Hardlinks μη διαθέσιμα. Μετάπτωση σε αντιγραφή." - -#: lib/choose_repository.tcl:715 -#, tcl-format -msgid "Cloning from %s" -msgstr "Γίνεται κλωνοποίηση από το %s" - -#: lib/choose_repository.tcl:746 -msgid "Copying objects" -msgstr "Γίνεται αντιγραφή αντικειμένων" - -#: lib/choose_repository.tcl:747 -#, fuzzy -msgid "KiB" -msgstr "" - -#: lib/choose_repository.tcl:771 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Αδυναμία αντιγραφής αντικειμένου: %s" - -#: lib/choose_repository.tcl:781 -msgid "Linking objects" -msgstr "Γίνεται σύνδεση αντικειμένων" - -#: lib/choose_repository.tcl:782 -msgid "objects" -msgstr "αντικείμενα" - -#: lib/choose_repository.tcl:790 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Αδυναμία hardlink αντικειμένου: %s" - -#: lib/choose_repository.tcl:845 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Δε μπόρεσε να γίνει ανάκτηση κλάδων και αντικειμένων. Δείτε την έξοδο " -"κονσόλας για λεπτομέρειες." - -#: lib/choose_repository.tcl:856 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Δε μπόρεσε να γίνει ανάκτηση ετικετών. Δείτε την έξοδο κονσόλας για " -"λεπτομέρειες." - -#: lib/choose_repository.tcl:880 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Δε μπόρεσε να γίνει καθορισμός του HEAD (παρακλαδιού). Δείτε την έξοδο " -"κονσόλας για " -"λεπτομέρειες." - -#: lib/choose_repository.tcl:889 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Αδυναμία εκκαθάρισης %s" - -#: lib/choose_repository.tcl:895 -msgid "Clone failed." -msgstr "Αποτυχία κλωνοποίησης." - -#: lib/choose_repository.tcl:902 -msgid "No default branch obtained." -msgstr "Δεν έγινε ανάκτηση προεπιλεγμένου κλάδου." - -#: lib/choose_repository.tcl:913 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Δε μπόρεσε να επιλυθεί το %s ως υποβολή." - -#: lib/choose_repository.tcl:925 -msgid "Creating working directory" -msgstr "Δημιουργία φακέλου εργασίας" - -#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127 -#: lib/index.tcl:193 -msgid "files" -msgstr "αρχεία" - -#: lib/choose_repository.tcl:955 -msgid "Initial file checkout failed." -msgstr "Η αρχική εξαγωγή αρχείου απέτυχε." - -#: lib/choose_repository.tcl:971 -msgid "Open" -msgstr "Άνοιγμα" - -#: lib/choose_repository.tcl:981 -msgid "Repository:" -msgstr "Αποθετήριο:" - -#: lib/choose_repository.tcl:1031 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Αποτυχία ανοίγματος αποθετηρίου %s:" - -#: lib/choose_rev.tcl:53 -#, fuzzy -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:538 -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:531 -msgid "Updated" -msgstr "Ενημερωμένο" - -#: lib/choose_rev.tcl:559 -#, fuzzy -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 "" -"Δεν υπάρχει κάτι προς διόρθωση.\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 " -"Πρέπει να σταδιοποιήσετε τουλάχιστον 1 αρχείο πριν να κάνετε υποβολή.\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 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:207 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "προειδοποίηση: H Tcl δεν υποστηρίζει την κωδικοποίηση '%s'." - -#: lib/commit.tcl:221 -msgid "Calling pre-commit hook..." -msgstr "Γίνεται κλήση του pre-commit hook..." - -#: lib/commit.tcl:236 -msgid "Commit declined by pre-commit hook." -msgstr "Η υποβολή απορρίφθηκε από το pre-commit hook." - -#: lib/commit.tcl:259 -msgid "Calling commit-msg hook..." -msgstr "Γίνεται κλήση του commit-msg hook..." - -#: lib/commit.tcl:274 -msgid "Commit declined by commit-msg hook." -msgstr "Η υποβολή απορρίφθηκε από το commit-msg hook." - -#: lib/commit.tcl:287 -msgid "Committing changes..." -msgstr "Γίνεται υποβολή των αλλαγών..." - -#: lib/commit.tcl:303 -msgid "write-tree failed:" -msgstr "το write-tree απέτυχε:" - -#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368 -msgid "Commit failed." -msgstr "Η υποβολή απέτυχε." - -#: lib/commit.tcl:321 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Η υποβολή %s δείχνει κατεστραμμένη" - -#: lib/commit.tcl:326 -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:333 -msgid "No changes to commit." -msgstr "Δεν υπάρχουν αλλαγές προς υποβολή." - -#: lib/commit.tcl:347 -msgid "commit-tree failed:" -msgstr "το commit-tree απέτυχε:" - -#: lib/commit.tcl:367 -msgid "update-ref failed:" -msgstr "το update-ref απέτυχε:" - -#: lib/commit.tcl:454 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Δημιουργήθηκε υποβολή %s: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Γίνεται εργασία... Παρακαλώ περιμένετε..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Επιτυχία" - -#: lib/console.tcl:200 -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" - -#: 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" -"\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" -"Θα ξεκινήσει αυτόματα επανανίχνευση για να βρεθούν άλλα αρχεία που μπορεί να " -"βρίσκονται σε ίδια κατάσταση." - -#: 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 "Σφάλμα φόρτωσης διαφοράς:" - -#: lib/diff.tcl:303 -msgid "Failed to unstage selected hunk." -msgstr "Αποτυχία αποσταδιοποίησης επιλεγμένου κομματιού." - -#: lib/diff.tcl:310 -msgid "Failed to stage selected hunk." -msgstr "Αποτυχία σταδιοποίησης επιλεγμένου κομματιού." - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "σφάλμα" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "προειδοποίηση" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Πρέπει να διορθώσετε τα παραπάνω λάθη πριν την υποβολή." - -#: 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:313 -msgid "Ready to commit." -msgstr "Έτοιμο προς υποβολή." - -#: lib/index.tcl:326 -#, tcl-format -msgid "Adding %s" -msgstr "Προσθήκη %s" - -#: lib/index.tcl:381 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Αναίρεση αλλαγών στο αρχείο %s;" - -#: lib/index.tcl:383 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Αναίρεση αλλαγών σε αυτά τα %i αρχεία;" - -#: lib/index.tcl:391 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Όλες οι μη σταδιοποιημένες αλλαγές θα χαθούν οριστικά από την αναίρεση." - -#: lib/index.tcl:394 -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:130 -msgid "Merge completed successfully." -msgstr "Η συγχώνευση ολοκληρώθηκε επιτυχώς." - -#: lib/merge.tcl:132 -msgid "Merge failed. Conflict resolution is required." -msgstr "Η συγχώνευση απέτυχε. Απαιτείται επίλυση συγκρούσεων." - -#: lib/merge.tcl:157 -#, tcl-format -msgid "Merge Into %s" -msgstr "Συγχώνευση με %s" - -#: lib/merge.tcl:176 -msgid "Revision To Merge" -msgstr "Αναθεώρηση Προς Συγχώνευση" - -#: lib/merge.tcl:211 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Δε γίνεται ακύρωση καθώς διορθώνετε.\n" -"\n" -"Πρέπει να τελειώσετε τη διόρθωση αυτής της υποβολής.\n" - -#: lib/merge.tcl:221 -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:227 -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:238 -msgid "Aborting" -msgstr "Γίνεται ακύρωση" - -#: lib/merge.tcl:238 -msgid "files reset" -msgstr "αρχεία που επαναφέρθηκαν" - -#: lib/merge.tcl:265 -msgid "Abort failed." -msgstr "Η ακύρωση απέτυχε." - -#: lib/merge.tcl:267 -msgid "Abort completed. Ready." -msgstr "Η ακύρωση απέτυχε. Έτοιμο." - -#: lib/option.tcl:95 -msgid "Restore Defaults" -msgstr "Επαναφορά Προεπιλογών" - -#: lib/option.tcl:99 -msgid "Save" -msgstr "Αποθήκευση" - -#: lib/option.tcl:109 -#, tcl-format -msgid "%s Repository" -msgstr "%s Αποθετήριο" - -#: lib/option.tcl:110 -msgid "Global (All Repositories)" -msgstr "Ολικό (Όλα τα Αποθετήρια)" - -#: lib/option.tcl:116 -msgid "User Name" -msgstr "Όνομα Χρήστη" - -#: lib/option.tcl:117 -msgid "Email Address" -msgstr "Διεύθυνση Email" - -#: lib/option.tcl:119 -msgid "Summarize Merge Commits" -msgstr "Περίληψη Υποβολών Συγχώνευσης" - -#: lib/option.tcl:120 -msgid "Merge Verbosity" -msgstr "Λεπτομέρεια Συγχώνευσης" - -#: lib/option.tcl:121 -msgid "Show Diffstat After Merge" -msgstr "Προβολή Στατιστικών Διαφοράς Μετά από Συγχώνευση" - -#: lib/option.tcl:123 -msgid "Trust File Modification Timestamps" -msgstr "Εμπιστοσύνη Ημερομηνιών Μετατροπής Αρχείων" - -#: lib/option.tcl:124 -msgid "Prune Tracking Branches During Fetch" -msgstr "Κλάδεμα Κλάδων Παρακολούθησης Κατά Την Ανάκτηση" - -#: lib/option.tcl:125 -msgid "Match Tracking Branches" -msgstr "Συμφωνία Κλάδων Παρακολούθησης" - -#: lib/option.tcl:126 -msgid "Number of Diff Context Lines" -msgstr "Αριθμός Γραμμών Εννοιολογικού Πλαισίου Διαφοράς" - -#: lib/option.tcl:127 -msgid "Commit Message Text Width" -msgstr "Πλάτος Κειμένου Μηνύματος Υποβολής" - -#: lib/option.tcl:128 -msgid "New Branch Name Template" -msgstr "Νέο Πρότυπο Ονόματος Κλάδου" - -#: lib/option.tcl:192 -msgid "Spelling Dictionary:" -msgstr "Λεξικό Ορθογραφίας:" - -#: lib/option.tcl:216 -msgid "Change Font" -msgstr "Αλλαγή Γραμματοσειράς" - -#: lib/option.tcl:220 -#, tcl-format -msgid "Choose %s" -msgstr "Επιλογή %s" - -#: lib/option.tcl:226 -#, fuzzy -msgid "pt." -msgstr "" - -#: lib/option.tcl:240 -msgid "Preferences" -msgstr "Προτιμήσεις" - -#: lib/option.tcl:275 -msgid "Failed to completely save options:" -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 -#, fuzzy -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/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:136 -msgid "Cannot write icon:" -msgstr "Δε μπόρεσε να αποθηκευτεί το εικονίδιο:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Mη υποστηριζόμενος ελεγκτής ορθογραφίας" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Έλεγχος ορθογραφίας μη διαθέσιμος" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Μη έγκυρη ρύθμιση ελέγχου ορθογραφίας" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Γίνεται επαναφορά του λεξικού σε %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Ο ελεγκτής ορθογραφίας απέτυχε σιωπηλά κατά την εκκίνηση" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Μη αναγνωρίσιμος ελεγκτής ορθογραφίας" - -#: lib/spellcheck.tcl:180 -msgid "No Suggestions" -msgstr "Καμία Πρόταση" - -#: lib/spellcheck.tcl:381 -msgid "Unexpected EOF from spell checker" -msgstr "Μη αναμενόμενο τέλος αρχείου από τον ελεγκτή ορθογραφίας" - -#: lib/spellcheck.tcl:385 -msgid "Spell Checker Failed" -msgstr "Αποτυχία Ελεγκτή Ορθογραφίας" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i από %*i %s (%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 "Γίνεται ώθηση %s %s στο %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 "Χρήση ισχνού πακέτου (για αργές συνδέσεις δικτύου)" - -#: lib/transport.tcl:168 -msgid "Include tags" -msgstr "Συμπερίληψη ετικετών" - - diff --git a/third_party/git/git-gui/po/fr.po b/third_party/git/git-gui/po/fr.po deleted file mode 100644 index 0aff18691d16..000000000000 --- a/third_party/git/git-gui/po/fr.po +++ /dev/null @@ -1,2604 +0,0 @@ -# translation of fr.po to French -# Translation of git-gui to French. -# Copyright (C) 2008 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# -# Christian Couder <chriscool@tuxfamily.org>, 2008. -# Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>, 2008. -msgid "" -msgstr "" -"Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-02-02 12:59+0100\n" -"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n" -"Language-Team: French\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: erreur fatale" - -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Police invalide spécifiée dans %s :" - -#: git-gui.sh:779 -msgid "Main Font" -msgstr "Police principale" - -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "Police diff/console" - -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "Impossible de trouver git dans PATH." - -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Impossible de parser la version de Git :" - -#: git-gui.sh:839 -#, 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 "" -"Impossible de déterminer la version de Git.\n" -"\n" -"%s affirme qu'il s'agit de la version '%s'.\n" -"\n" -"%s nécessite au moins Git 1.5.0.\n" -"\n" -"Peut-on considérer que '%s' est en version 1.5.0 ?\n" - -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "Impossible de trouver le répertoire git :" - -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "Impossible d'aller à la racine du répertoire de travail :" - -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "Impossible d'utiliser un dépôt nu (bare) :" - -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "Aucun répertoire de travail" - -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Rafraîchissement du statut des fichiers..." - -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "Recherche de fichiers modifiés..." - -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "Lancement de l'action de préparation du message de commit..." - -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "Commit refusé par l'action de préparation du message de commit." - -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "Prêt." - -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Affiche seulement %s fichiers sur %s." - -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "Non modifié" - -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "Modifié, pas indexé" - -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "Indexé" - -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "Portions indexées" - -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "Indexés, manquant" - -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "Le type de fichier a changé, non indexé" - -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "Le type de fichier a changé, indexé" - -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "Non versionné, non indexé" - -#: git-gui.sh:1928 -msgid "Missing" -msgstr "Manquant" - -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "Indexé pour suppression" - -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "Indexé pour suppression, toujours présent" - -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "Nécessite la résolution d'une fusion" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Lancement de gitk... un instant..." - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "Impossible de trouver gitk dans PATH." - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "Impossible de trouver git gui dans PATH" - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Dépôt" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "Édition" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Branche" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Commit" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Fusionner" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Dépôt distant" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "Outils" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "Explorer la copie de travail" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "Naviguer dans la branche courante" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "Naviguer dans la branche..." - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "Visualiser l'historique de la branche courante" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "Voir l'historique de toutes les branches" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Parcourir l'arborescence de %s" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Voir l'historique de la branche : %s" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Statistiques du dépôt" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Comprimer le dépôt" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "Vérifier le dépôt" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Créer une icône sur le bureau" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Quitter" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "Défaire" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "Refaire" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "Couper" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Copier" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "Coller" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Supprimer" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "Tout sélectionner" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "Créer..." - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "Charger (checkout)..." - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "Renommer..." - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "Supprimer..." - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "Réinitialiser..." - -#: git-gui.sh:2608 -msgid "Done" -msgstr "Effectué" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "Commiter@@verb" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Nouveau commit" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "Corriger dernier commit" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Recharger modifs." - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "Indexer" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "Indexer toutes modifications" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "Désindexer" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "Annuler les modifications" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "Montrer moins de contexte" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "Montrer plus de contexte" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "Signer" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "Fusion locale..." - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "Abandonner fusion..." - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "Ajouter..." - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "Pousser..." - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "Supprimer branche..." - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "Options..." - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "Supprimer..." - -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Aide" - -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "À propos de %s" - -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "Documentation en ligne" - -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Montrer la clé SSH" - -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"erreur fatale : pas d'infos sur le chemin %s : Fichier ou répertoire " -"inexistant" - -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "Branche courante :" - -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Modifs. indexées (pour commit)" - -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "Modifs. non indexées" - -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "Indexer modifs." - -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Pousser" - -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "Message de commit initial :" - -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "Message de commit corrigé :" - -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "Message de commit initial corrigé :" - -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "Message de commit de fusion corrigé :" - -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "Message de commit de fusion :" - -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "Message de commit :" - -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "Copier tout" - -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "Fichier :" - -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "Rafraîchir" - -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "Diminuer la police" - -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "Agrandir la police" - -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Codage des caractères" - -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "Appliquer/Inverser section" - -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "Appliquer/Inverser la ligne" - -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "Lancer l'outil de fusion" - -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "Utiliser la version distante" - -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "Utiliser la version locale" - -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "Revenir à la version de base" - -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "Voir les changments dans le sous-module" - -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Voir l'historique de la branche courante du sous-module" - -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "Voir l'historique de toutes les branches du sous-module" - -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "Démarrer git gui dans le sous-module" - -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "Désindexer la section" - -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "Désindexer la ligne du commit" - -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "Désindexer la ligne" - -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "Indexer la section" - -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "Indexer les lignes" - -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "Indexer la ligne" - -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "Initialisation..." - -#: git-gui.sh:3541 -#, 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 "" -"Des problèmes d'environnement sont possibles.\n" -"\n" -"Les variables d'environnement suivantes seront\n" -"probablement ignorées par tous les\n" -"sous-processus de Git lancés par %s\n" -"\n" - -#: git-gui.sh:3570 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Ceci est dû à un problème connu avec\n" -"le binaire Tcl distribué par Cygwin." - -#: git-gui.sh:3575 -#, 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" -"Un bon remplacement pour %s\n" -"est de mettre les valeurs pour 'user.name' (nom\n" -"de l'utilisateur) et 'user.email' (addresse email\n" -"de l'utilisateur) dans votre fichier '~/.gitconfig'.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - une interface graphique utilisateur pour Git" - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Visionneur de fichier" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Commit :" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Copier commit" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Chercher texte..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Lancer la détection approfondie des copies" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Montrer l'historique" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Blâmer le commit parent" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Lecture de %s..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Chargement des annotations de suivi des copies/déplacements..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "lignes annotées" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Chargement des annotations d'emplacement original" - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Annotation terminée." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Occupé" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Annotation en cours d'exécution." - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Recherche de copie approfondie en cours..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Chargement des annotations..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Auteur :" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Commiteur :" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Fichier original :" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Impossible de trouver le commit HEAD :" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Impossible de trouver le commit parent :" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Impossible d'afficher le parent" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Erreur lors du chargement des différences :" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "À l'origine par :" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "Dans le fichier :" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Copié ou déplacé ici par :" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Charger la branche (checkout)" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Charger (checkout)" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Annuler" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Révision" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Options" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Récupérer la branche de suivi" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Détacher de la branche locale" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Créer une branche" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Créer une nouvelle branche" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "Créer" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Nom de branche" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Nom :" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Trouver nom de branche de suivi" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Révision initiale" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Mettre à jour une branche existante :" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Non" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Mise à jour rectiligne seulement (fast-forward)" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Réinitialiser" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Charger (checkout) après création" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Choisissez une branche de suivi" - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "La branche de suivi %s n'est pas une branche dans le dépôt distant." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Fournissez un nom de branche." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' n'est pas un nom de branche acceptable." - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Supprimer branche" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Supprimer branche locale" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Branches locales" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Supprimer seulement si fusionnée dans :" - -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Toujours (ne pas vérifier les fusions)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Il est difficile de récupérer des branches supprimées.\n" -"\n" -"Supprimer les branches sélectionnées ?" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"La suppression des branches suivantes a échoué :\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Renommer branche" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Renommer" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Branche :" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Nouveau nom :" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Merci de sélectionner une branche à renommer." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "La branche '%s' existe déjà." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Échec pour renommer '%s'." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Lancement..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Visionneur de fichier" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Chargement de %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Jusqu'au parent]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Naviguer dans les fichiers de le branche" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "Naviguer" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Récupération de %s à partir de %s" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "erreur fatale : Impossible de résoudre %s" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Fermer" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "La branche '%s' n'existe pas." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Échec de la configuration simplifiée de git-pull pour '%s'." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"La branche '%s' existe déjà.\n" -"\n" -"Impossible de faire une avance rapide (fast forward) vers %s.\n" -"Une fusion est nécessaire." - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "La stratégie de fusion '%s' n'est pas supportée." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "La mise à jour de '%s' a échoué." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "L'index (staging area) est déjà verrouillé." - -#: lib/checkout_op.tcl:289 -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'état lors de la dernière synchronisation ne correspond plus à l'état du " -"dépôt.\n" -"\n" -"Un autre programme Git a modifié ce dépôt depuis la dernière " -"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir " -"modifier la branche courante.\n" -"\n" -"Cela va être fait tout de suite automatiquement.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Mise à jour du répertoire courant avec '%s'..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "fichiers chargés" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "" -"Chargement de '%s' abandonné (il est nécessaire de fusionner des fichiers)." - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Il est nécessaire de fusionner des fichiers." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Le répertoire de travail reste sur la branche '%s'." - -#: lib/checkout_op.tcl:452 -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 "" -"Vous n'êtes plus sur une branche locale.\n" -"\n" -"Si vous vouliez être sur une branche, créez-en une maintenant en partant de " -"'Cet emprunt détaché'." - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "'%s' chargé." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Réinitialiser '%s' à '%s' va faire perdre les commits suivants :" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Récupérer les commits perdus ne sera peut être pas facile." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Réinitialiser '%s' ?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Visualiser" - -#: lib/checkout_op.tcl:635 -#, 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 "" -"Le changement de la branche courante a échoué.\n" -"\n" -"Le répertoire courant n'est que partiellement modifié. Les fichiers ont été " -"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a " -"échouée.\n" -"\n" -"Cela n'aurait pas dû se produire. %s va abandonner et se terminer." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Sélectionner" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Familles de polices" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Taille de police" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Exemple de police" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Ceci est un texte d'exemple.\n" -"Si vous aimez ce texte, vous pouvez choisir cette police." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "Créer nouveau dépôt" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Nouveau..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "Cloner un dépôt existant" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Cloner..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "Ouvrir un dépôt existant" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Ouvrir..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Dépôts récemment utilisés" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Ouvrir un dépôt récent :" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "La création du dépôt %s a échoué :" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "Répertoire :" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "Dépôt Git" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Le répertoire %s existe déjà." - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "Le fichier %s existe déjà." - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "Cloner" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "Emplacement source :" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "Répertoire cible :" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "Type de clonage :" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (rapide, semi-redondant, liens durs)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Copie complète (plus lent, sauvegarde redondante)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "'%s' n'est pas un dépôt Git." - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Standard n'est disponible que pour un dépôt local." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Partagé n'est disponible que pour un dépôt local." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "L'emplacement %s existe déjà." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "La configuration de l'origine a échoué." - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Décompte des objets" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "paniers" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Impossible de copier 'objects/info/alternates' : %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Il n'y a rien à cloner depuis %s." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "La branche 'master' n'a pas été initialisée." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "" -"Les liens durs ne sont pas supportés. Une copie sera effectuée à la place." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Clonage depuis %s" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Copie des objets" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Impossible de copier l'objet : %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Liaison des objets" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "objets" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Impossible créer un lien dur pour l'objet : %s" - -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Impossible de récupérer les branches et objets. Voir la sortie console pour " -"plus de détails." - -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Impossible de récupérer les marques (tags). Voir la sortie console pour plus " -"de détails." - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Impossible de déterminer HEAD. Voir la sortie console pour plus de détails." - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Impossible de nettoyer %s" - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "Le clonage a échoué." - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "Aucune branche par défaut n'a été obtenue." - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Impossible de résoudre %s comme commit." - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Création du répertoire de travail" - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "fichiers" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Le chargement initial du fichier a échoué." - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "Ouvrir" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "Dépôt :" - -#: lib/choose_repository.tcl:1072 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Impossible d'ouvrir le dépôt %s :" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Cet emprunt détaché" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Expression de révision :" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Branche locale" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Branche de suivi" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Marque (tag)" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Révision invalide : %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Pas de révision sélectionnée." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "L'expression de révision est vide." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Mise à jour:" - -#: lib/choose_rev.tcl:559 -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 "" -"Il n'y a rien à corriger.\n" -"\n" -"Vous allez créer le commit initial. Il n'y a pas de commit avant celui-ci à " -"corriger.\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 "" -"Impossible de corriger pendant une fusion.\n" -"\n" -"Vous êtes actuellement au milieu d'une fusion qui n'a pas été complètement " -"terminée. Vous ne pouvez pas corriger le commit précédent sauf si vous " -"abandonnez la fusion courante.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Erreur lors du chargement des données de commit pour correction :" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Impossible d'obtenir votre identité :" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "GIT_COMMITTER_IDENT invalide :" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "attention : Tcl ne supporte pas le codage '%s'." - -#: lib/commit.tcl:149 -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'état lors de la dernière synchronisation ne correspond plus à l'état du " -"dépôt.\n" -"\n" -"Un autre programme Git a modifié ce dépôt depuis la dernière " -"synchronisation. Une resynshronisation doit être effectuée avant de pouvoir " -"créer un nouveau commit.\n" -"\n" -"Cela va être fait tout de suite automatiquement.\n" - -#: lib/commit.tcl:172 -#, 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 "" -"Des fichiers non fusionnés ne peuvent être commités.\n" -"\n" -"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-" -"commiter le fichier avant de pouvoir commiter.\n" - -#: lib/commit.tcl:180 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Un état de fichier inconnu %s a été détecté.\n" -"\n" -"Le fichier %s ne peut pas être commité par ce programme.\n" - -#: lib/commit.tcl:188 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Pas de modification à commiter.\n" -"\n" -"Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\n" - -#: lib/commit.tcl:203 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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 "" -"Merci de fournir un message de commit.\n" -"\n" -"Un bon message de commit a le format suivant :\n" -"\n" -"- Première ligne : décrire en une phrase ce que vous avez fait.\n" -"- Deuxième ligne : rien.\n" -"- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\n" - -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "Lancement de l'action d'avant-commit..." - -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "Commit refusé par l'action d'avant-commit." - -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Lancement de l'action \"message de commit\"..." - -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Commit refusé par l'action \"message de commit\"." - -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Commit des modifications..." - -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree a échoué :" - -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "Le commit a échoué." - -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Le commit %s semble être corrompu" - -#: lib/commit.tcl:339 -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 "" -"Pas de modification à commiter.\n" -"\n" -"Aucun fichier n'a été modifié par ce commit et il ne s'agit pas d'un commit " -"de fusion.\n" -"\n" -"Une resynchronisation va être lancée tout de suite automatiquement.\n" - -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "Pas de modifications à commiter." - -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree a échoué :" - -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref a échoué :" - -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Commit %s créé : %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Travail en cours... merci de patienter..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Succès" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Erreur : échec de la commande" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Nombre d'objets en fichier particulier" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Espace disque utilisé par les fichiers particuliers" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Nombre d'objets empaquetés" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Nombre de paquets d'objets" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Espace disque utilisé par les objets empaquetés" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Objets empaquetés attendant d'être supprimés" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Fichiers poubelle" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Compression de la base des objets" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Vérification de la base des objets avec fsck-objects" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Ce dépôt comprend actuellement environ %i objets ayant leur fichier " -"particulier.\n" -"\n" -"Pour conserver une performance optimale, il est fortement recommandé de " -"comprimer la base de donnée.\n" -"\n" -"Comprimer la base maintenant ?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Date invalide de Git : %s" - -#: lib/diff.tcl:64 -#, 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 "" -"Aucune différence détectée.\n" -"\n" -"%s ne comporte aucune modification.\n" -"\n" -"La date de modification de ce fichier a été mise à jour par une autre " -"application, mais le contenu du fichier n'a pas changé.\n" -"\n" -"Une resynchronisation va être lancée automatiquement pour trouver d'autres " -"fichiers qui pourraient se trouver dans le même état." - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Chargement des différences de %s..." - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOCAL : supprimé\n" -"DISTANT :\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"DISTANT : supprimé\n" -"LOCAL :\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "LOCAL :\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "DISTANT :\n" - -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "Impossible d'afficher %s" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Erreur lors du chargement du fichier :" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Dépôt Git (sous projet)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* Fichier binaire (pas d'apperçu du contenu)." - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Le fichier non suivi fait %d octets.\n" -"* Seuls les %d premiers octets sont montrés.\n" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Fichier suivi raccourcis ici de %s.\n" -"* Pour voir le fichier entier, utilisez un éditeur externe.\n" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "Échec lors de la désindexation de la section sélectionnée." - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "Échec lors de l'indexation de la section." - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "Échec lors de la désindexation de la ligne sélectionnée." - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "Échec lors de l'indexation de la ligne." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Défaut" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Système (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Autre" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "erreur" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "attention" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Impossible de déverrouiller l'index." - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Erreur de l'index" - -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Échec de la mise à jour de l'index. Une resynchronisation va être lancée " -"automatiquement." - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "Continuer" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Déverrouiller l'index" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Désindexation de : %s" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Prêt à être commité." - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "Ajout de %s" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Annuler les modifications dans le fichier %s ? " - -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Annuler les modifications dans ces %i fichiers ?" - -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Toutes les modifications non-indexées seront définitivement perdues par " -"l'annulation." - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "Ne rien faire" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "Annuler modifications dans fichiers selectionnés" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "Annulation des modifications dans %s" - -#: 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 "" -"Impossible de fusionner pendant une correction.\n" -"\n" -"Vous devez finir de corriger ce commit avant de lancer une quelconque " -"fusion.\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'état lors de la dernière synchronisation ne correspond plus à l'état du " -"dépôt.\n" -"\n" -"Un autre programme Git a modifié ce dépôt depuis la dernière " -"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir " -"fusionner de nouveau.\n" -"\n" -"Cela va être fait tout de suite automatiquement\n" - -#: lib/merge.tcl:45 -#, 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 "" -"Vous êtes au milieu d'une fusion conflictuelle.\n" -"\n" -"Le fichier %s a des conflicts de fusion.\n" -"\n" -"Vous devez les résoudre, puis indexer le fichier, et enfin commiter pour " -"terminer la fusion courante. Seulement à ce moment là sera-t-il possible " -"d'effectuer une nouvelle fusion.\n" - -#: lib/merge.tcl:55 -#, 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 "" -"Vous êtes au milieu d'une modification.\n" -"\n" -"Le fichier %s a été modifié.\n" -"\n" -"Vous devriez terminer le commit courant avant de lancer une fusion. En " -"faisait comme cela, vous éviterez de devoir éventuellement abandonner une " -"fusion ayant échoué.\n" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s de %s" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Fusion de %s et %s..." - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "La fusion s'est faite avec succès." - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "La fusion a echoué. Il est nécessaire de résoudre les conflits." - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Fusion dans %s" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Révision à fusionner" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Impossible d'abandonner en cours de correction.\n" -"\n" -"Vous devez finir de corriger ce commit.\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 "" -"Abandonner la fusion ?\n" -"\n" -"Abandonner la fusion courante entrainera la perte de TOUTES les " -"modifications non commitées.\n" -"\n" -"Abandonner quand même la fusion courante ?" - -#: 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 "" -"Réinitialiser les modifications ?\n" -"\n" -"Réinitialiser les modifications va faire perdre TOUTES les modifications non " -"commitées.\n" -"\n" -"Réinitialiser quand même les modifications courantes ?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Abandon" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "fichiers réinitialisés" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "L'abandon a échoué." - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Abandon teminé. Prêt." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Forcer la résolution à la version de base ?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Forcer la résolution à cette branche ?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Forcer la résolution à l'autre branche ?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Noter que le diff ne montre que les modifications en conflit.\n" -"\n" -"%s sera écrasé.\n" -"\n" -"Cette opération ne peut être inversée qu'en relançant la fusion." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"Le fichier %s semble avoir des conflits non résolus, indexer quand même ?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Ajouter une résolution pour %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Impossible de résoudre la suppression ou de relier des conflits en utilisant " -"un outil" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Le fichier en conflit n'existe pas." - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "'%s' n'est pas un outil graphique pour fusionner des fichiers." - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Outil de fusion '%s' non supporté" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "L'outil de fusion tourne déjà, faut-il le terminer ?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Erreur lors de la récupération des versions :\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Impossible de lancer l'outil de fusion :\n" -"\n" -"%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Lancement de l'outil de fusion..." - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "L'outil de fusion a échoué." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Codage global '%s' invalide" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Codage de dépôt '%s' invalide" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Remettre les valeurs par défaut" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Sauvegarder" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "Dépôt : %s" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Globales (tous les dépôts)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Nom d'utilisateur" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Adresse email" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Résumer les commits de fusion" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Fusion bavarde" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Montrer statistiques de diff après fusion" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Utiliser outil de fusion" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Faire confiance aux dates de modification de fichiers " - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "Purger les branches de suivi pendant la récupération" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Faire correspondre les branches de suivi" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "Annoter les copies seulement sur fichiers modifiés" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Minimum de caratères pour annoter une copie" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Distance de blâme dans l'historique (jours)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Nombre de lignes de contexte dans les diffs" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Largeur du texte de message de commit" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Nouveau modèle de nom de branche" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Codage du contenu des fichiers par défaut" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Modifier" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Dictionnaire d'orthographe :" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Modifier les polices" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Choisir %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Préférences" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "La sauvegarde complète des options a échoué :" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Supprimer un dépôt distant" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Purger de" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Récupérer de" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Pousser vers" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Ajouter un dépôt distant" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Ajouter un nouveau dépôt distant" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Ajouter" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Détails des dépôts distants" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Emplacement :" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Action supplémentaire" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Récupérer immédiatement" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Initialiser un dépôt distant et pousser" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Ne rien faire d'autre maintenant" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Merci de fournir un nom de dépôt distant." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' n'est pas un nom de dépôt distant acceptable." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Échec de l'ajout du dépôt distant '%s' à l'emplacement '%s'." - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "récupérer %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Récupération de %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Pas de méthode connue pour initialiser le dépôt à l'emplacement '%s'." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "pousser %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Mise en place de %s (à %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Supprimer une branche à distance" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Dépôt source" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Branche distante :" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Emplacement arbitraire :" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Branches" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Supprimer seulement si" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Fusionné dans :" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "Une branche est nécessaire pour 'Fusionné dans'." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Les branches suivantes ne sont pas complètement fusionnées dans %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 "" -"Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas " -"récupéré les commits nécessaires. Essayez de récupérer à partir de %s " -"d'abord." - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Merci de sélectionner une ou plusieurs branches à supprimer." - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Suppression des branches de %s" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "Aucun dépôt n'est sélectionné." - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "Synchronisation de %s..." - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Chercher :" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Suivant" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Précédent" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Sensible à la casse" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Impossible d'écrire le raccourci :" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Impossible d'écrire l'icône :" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Vérificateur d'orthographe non supporté" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "La vérification d'orthographe n'est pas disponible" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Configuration de vérification d'orthographe invalide" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Réinitialisation du dictionnaire à %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "La vérification d'orthographe a échoué silencieusement au démarrage" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Vérificateur d'orthographe non reconnu" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Aucune suggestion" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "EOF inattendue envoyée par le vérificateur d'orthographe" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Le vérificateur d'orthographe a échoué" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Aucune clé trouvée." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Clé publique trouvée dans : %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Générer une clé" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Copier dans le presse-papier" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Votre clé publique OpenSSH" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Génération..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Impossible de lancer ssh-keygen :\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "La génération a échoué." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "La génération a réussi, mais aucune clé n'a été trouvée." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Votre clé est dans : %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i de %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Lancer %s nécessite qu'un fichier soit sélectionné." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Êtes-vous sûr de vouloir lancer %s ?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Outil : %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Lancement de : %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "L'outil a terminé avec succès : %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "L'outil a échoué : %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Ajouter un outil" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Ajouter une nouvelle commande d'outil" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Ajouter globalement" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Détails sur l'outil" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Utiliser les séparateurs '/' pour créer un arbre de sous-menus :" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Commande :" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Montrer une boîte de dialogue avant le lancement" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "" -"Demander à l'utilisateur de sélectionner une révision (change $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Demander à l'utilisateur des arguments supplémentaires (change $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Ne pas montrer la fenêtre de sortie des commandes" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Lancer seulement si un diff est sélectionné ($FILENAME non vide)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Merci de fournir un nom pour l'outil." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "L'outil '%s' existe déjà." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Impossible d'ajouter l'outil :\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Supprimer l'outil" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Supprimer des commandes d'outil" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Supprimer" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Le bleu indique des outils locaux au dépôt)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Lancer commande : %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Arguments" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Récupération des dernières modifications de %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "purger à distance %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Nettoyer les branches de suivi supprimées de %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Les modifications sont poussées vers %s" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Dupliquer dans %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Pousse %s %s vers %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Pousser branches" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Branches source" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Dépôt de destination" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Options de transfert" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" -"Forcer l'écrasement d'une branche existante (peut supprimer des " -"modifications)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Utiliser des petits paquets (pour les connexions lentes)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Inclure les marques (tags)" - -#~ msgid "Cannot use funny .git directory:" -#~ msgstr "Impossible d'utiliser le répertoire .git:" - -#~ msgid "Preferences..." -#~ msgstr "Préférences..." - -#~ msgid "Always (Do not perform merge test.)" -#~ msgstr "Toujours (Ne pas faire de test de fusion.)" diff --git a/third_party/git/git-gui/po/git-gui.pot b/third_party/git/git-gui/po/git-gui.pot deleted file mode 100644 index b79ed4e133df..000000000000 --- a/third_party/git/git-gui/po/git-gui.pot +++ /dev/null @@ -1,2666 +0,0 @@ -# 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 <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-08 22:54+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: git-gui.sh:847 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "" - -#: git-gui.sh:901 -msgid "Main Font" -msgstr "" - -#: git-gui.sh:902 -msgid "Diff/Console Font" -msgstr "" - -#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053 -#: git-gui.sh:3212 -msgid "git-gui: fatal error" -msgstr "" - -#: git-gui.sh:918 -msgid "Cannot find git in PATH." -msgstr "" - -#: git-gui.sh:945 -msgid "Cannot parse Git version string:" -msgstr "" - -#: git-gui.sh:970 -#, 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:1267 -msgid "Git directory not found:" -msgstr "" - -#: git-gui.sh:1301 -msgid "Cannot move to top of working directory:" -msgstr "" - -#: git-gui.sh:1309 -msgid "Cannot use bare repository:" -msgstr "" - -#: git-gui.sh:1317 -msgid "No working directory" -msgstr "" - -#: git-gui.sh:1491 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "" - -#: git-gui.sh:1551 -msgid "Scanning for modified files ..." -msgstr "" - -#: git-gui.sh:1629 -msgid "Calling prepare-commit-msg hook..." -msgstr "" - -#: git-gui.sh:1646 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "" - -#: git-gui.sh:1804 lib/browser.tcl:252 -msgid "Ready." -msgstr "" - -#: git-gui.sh:1968 -#, tcl-format -msgid "" -"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." -msgstr "" - -#: git-gui.sh:2091 -msgid "Unmodified" -msgstr "" - -#: git-gui.sh:2093 -msgid "Modified, not staged" -msgstr "" - -#: git-gui.sh:2094 git-gui.sh:2106 -msgid "Staged for commit" -msgstr "" - -#: git-gui.sh:2095 git-gui.sh:2107 -msgid "Portions staged for commit" -msgstr "" - -#: git-gui.sh:2096 git-gui.sh:2108 -msgid "Staged for commit, missing" -msgstr "" - -#: git-gui.sh:2098 -msgid "File type changed, not staged" -msgstr "" - -#: git-gui.sh:2099 git-gui.sh:2100 -msgid "File type changed, old type staged for commit" -msgstr "" - -#: git-gui.sh:2101 -msgid "File type changed, staged" -msgstr "" - -#: git-gui.sh:2102 -msgid "File type change staged, modification not staged" -msgstr "" - -#: git-gui.sh:2103 -msgid "File type change staged, file missing" -msgstr "" - -#: git-gui.sh:2105 -msgid "Untracked, not staged" -msgstr "" - -#: git-gui.sh:2110 -msgid "Missing" -msgstr "" - -#: git-gui.sh:2111 -msgid "Staged for removal" -msgstr "" - -#: git-gui.sh:2112 -msgid "Staged for removal, still present" -msgstr "" - -#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 -#: git-gui.sh:2118 git-gui.sh:2119 -msgid "Requires merge resolution" -msgstr "" - -#: git-gui.sh:2164 -msgid "Couldn't find gitk in PATH" -msgstr "" - -#: git-gui.sh:2210 git-gui.sh:2245 -#, tcl-format -msgid "Starting %s... please wait..." -msgstr "" - -#: git-gui.sh:2224 -msgid "Couldn't find git gui in PATH" -msgstr "" - -#: git-gui.sh:2726 lib/choose_repository.tcl:53 -msgid "Repository" -msgstr "" - -#: git-gui.sh:2727 -msgid "Edit" -msgstr "" - -#: git-gui.sh:2729 lib/choose_rev.tcl:567 -msgid "Branch" -msgstr "" - -#: git-gui.sh:2732 lib/choose_rev.tcl:554 -msgid "Commit@@noun" -msgstr "" - -#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 -msgid "Merge" -msgstr "" - -#: git-gui.sh:2736 lib/choose_rev.tcl:563 -msgid "Remote" -msgstr "" - -#: git-gui.sh:2739 -msgid "Tools" -msgstr "" - -#: git-gui.sh:2748 -msgid "Explore Working Copy" -msgstr "" - -#: git-gui.sh:2763 -msgid "Git Bash" -msgstr "" - -#: git-gui.sh:2772 -msgid "Browse Current Branch's Files" -msgstr "" - -#: git-gui.sh:2776 -msgid "Browse Branch Files..." -msgstr "" - -#: git-gui.sh:2781 -msgid "Visualize Current Branch's History" -msgstr "" - -#: git-gui.sh:2785 -msgid "Visualize All Branch History" -msgstr "" - -#: git-gui.sh:2792 -#, tcl-format -msgid "Browse %s's Files" -msgstr "" - -#: git-gui.sh:2794 -#, tcl-format -msgid "Visualize %s's History" -msgstr "" - -#: git-gui.sh:2799 lib/database.tcl:40 -msgid "Database Statistics" -msgstr "" - -#: git-gui.sh:2802 lib/database.tcl:33 -msgid "Compress Database" -msgstr "" - -#: git-gui.sh:2805 -msgid "Verify Database" -msgstr "" - -#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 -msgid "Create Desktop Icon" -msgstr "" - -#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 -msgid "Quit" -msgstr "" - -#: git-gui.sh:2836 -msgid "Undo" -msgstr "" - -#: git-gui.sh:2839 -msgid "Redo" -msgstr "" - -#: git-gui.sh:2843 git-gui.sh:3461 -msgid "Cut" -msgstr "" - -#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "" - -#: git-gui.sh:2849 git-gui.sh:3467 -msgid "Paste" -msgstr "" - -#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 -#: lib/branch_delete.tcl:28 -msgid "Delete" -msgstr "" - -#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 -msgid "Select All" -msgstr "" - -#: git-gui.sh:2865 -msgid "Create..." -msgstr "" - -#: git-gui.sh:2871 -msgid "Checkout..." -msgstr "" - -#: git-gui.sh:2877 -msgid "Rename..." -msgstr "" - -#: git-gui.sh:2882 -msgid "Delete..." -msgstr "" - -#: git-gui.sh:2887 -msgid "Reset..." -msgstr "" - -#: git-gui.sh:2897 -msgid "Done" -msgstr "" - -#: git-gui.sh:2899 -msgid "Commit@@verb" -msgstr "" - -#: git-gui.sh:2908 git-gui.sh:3400 -msgid "Amend Last Commit" -msgstr "" - -#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 -msgid "Rescan" -msgstr "" - -#: git-gui.sh:2924 -msgid "Stage To Commit" -msgstr "" - -#: git-gui.sh:2930 -msgid "Stage Changed Files To Commit" -msgstr "" - -#: git-gui.sh:2936 -msgid "Unstage From Commit" -msgstr "" - -#: git-gui.sh:2942 lib/index.tcl:521 -msgid "Revert Changes" -msgstr "" - -#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 -msgid "Show Less Context" -msgstr "" - -#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 -msgid "Show More Context" -msgstr "" - -#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 -msgid "Sign Off" -msgstr "" - -#: git-gui.sh:2977 -msgid "Local Merge..." -msgstr "" - -#: git-gui.sh:2982 -msgid "Abort Merge..." -msgstr "" - -#: git-gui.sh:2994 git-gui.sh:3022 -msgid "Add..." -msgstr "" - -#: git-gui.sh:2998 -msgid "Push..." -msgstr "" - -#: git-gui.sh:3002 -msgid "Delete Branch..." -msgstr "" - -#: git-gui.sh:3012 git-gui.sh:3666 -msgid "Options..." -msgstr "" - -#: git-gui.sh:3023 -msgid "Remove..." -msgstr "" - -#: git-gui.sh:3032 lib/choose_repository.tcl:67 -msgid "Help" -msgstr "" - -#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 -#: lib/choose_repository.tcl:70 lib/about.tcl:14 -#, tcl-format -msgid "About %s" -msgstr "" - -#: git-gui.sh:3064 -msgid "Online Documentation" -msgstr "" - -#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 -msgid "Show SSH Key" -msgstr "" - -#: git-gui.sh:3097 git-gui.sh:3229 -msgid "usage:" -msgstr "" - -#: git-gui.sh:3101 git-gui.sh:3233 -msgid "Usage" -msgstr "" - -#: git-gui.sh:3182 lib/blame.tcl:575 -msgid "Error" -msgstr "" - -#: git-gui.sh:3213 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" - -#: git-gui.sh:3246 -msgid "Current Branch:" -msgstr "" - -#: git-gui.sh:3271 -msgid "Unstaged Changes" -msgstr "" - -#: git-gui.sh:3293 -msgid "Staged Changes (Will Commit)" -msgstr "" - -#: git-gui.sh:3367 -msgid "Stage Changed" -msgstr "" - -#: git-gui.sh:3386 lib/transport.tcl:137 -msgid "Push" -msgstr "" - -#: git-gui.sh:3413 -msgid "Initial Commit Message:" -msgstr "" - -#: git-gui.sh:3414 -msgid "Amended Commit Message:" -msgstr "" - -#: git-gui.sh:3415 -msgid "Amended Initial Commit Message:" -msgstr "" - -#: git-gui.sh:3416 -msgid "Amended Merge Commit Message:" -msgstr "" - -#: git-gui.sh:3417 -msgid "Merge Commit Message:" -msgstr "" - -#: git-gui.sh:3418 -msgid "Commit Message:" -msgstr "" - -#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 -msgid "Copy All" -msgstr "" - -#: git-gui.sh:3501 lib/blame.tcl:106 -msgid "File:" -msgstr "" - -#: git-gui.sh:3549 lib/choose_repository.tcl:1100 -msgid "Open" -msgstr "" - -#: git-gui.sh:3629 -msgid "Refresh" -msgstr "" - -#: git-gui.sh:3650 -msgid "Decrease Font Size" -msgstr "" - -#: git-gui.sh:3654 -msgid "Increase Font Size" -msgstr "" - -#: git-gui.sh:3662 lib/blame.tcl:296 -msgid "Encoding" -msgstr "" - -#: git-gui.sh:3673 -msgid "Apply/Reverse Hunk" -msgstr "" - -#: git-gui.sh:3678 -msgid "Apply/Reverse Line" -msgstr "" - -#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805 -msgid "Revert Hunk" -msgstr "" - -#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812 -msgid "Revert Line" -msgstr "" - -#: git-gui.sh:3694 git-gui.sh:3791 -msgid "Undo Last Revert" -msgstr "" - -#: git-gui.sh:3713 -msgid "Run Merge Tool" -msgstr "" - -#: git-gui.sh:3718 -msgid "Use Remote Version" -msgstr "" - -#: git-gui.sh:3722 -msgid "Use Local Version" -msgstr "" - -#: git-gui.sh:3726 -msgid "Revert To Base" -msgstr "" - -#: git-gui.sh:3744 -msgid "Visualize These Changes In The Submodule" -msgstr "" - -#: git-gui.sh:3748 -msgid "Visualize Current Branch History In The Submodule" -msgstr "" - -#: git-gui.sh:3752 -msgid "Visualize All Branch History In The Submodule" -msgstr "" - -#: git-gui.sh:3757 -msgid "Start git gui In The Submodule" -msgstr "" - -#: git-gui.sh:3793 -msgid "Unstage Hunk From Commit" -msgstr "" - -#: git-gui.sh:3797 -msgid "Unstage Lines From Commit" -msgstr "" - -#: git-gui.sh:3798 git-gui.sh:3809 -msgid "Revert Lines" -msgstr "" - -#: git-gui.sh:3800 -msgid "Unstage Line From Commit" -msgstr "" - -#: git-gui.sh:3804 -msgid "Stage Hunk For Commit" -msgstr "" - -#: git-gui.sh:3808 -msgid "Stage Lines For Commit" -msgstr "" - -#: git-gui.sh:3811 -msgid "Stage Line For Commit" -msgstr "" - -#: git-gui.sh:3861 -msgid "Initializing..." -msgstr "" - -#: git-gui.sh:4017 -#, 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:4046 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" - -#: git-gui.sh:4051 -#, 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/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "" - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "" - -#: lib/transport.tcl:6 lib/remote_add.tcl:132 -#, 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 -msgid "fetch all remotes" -msgstr "" - -#: lib/transport.tcl:26 -msgid "Fetching new changes from all remotes" -msgstr "" - -#: lib/transport.tcl:40 -msgid "remote prune all remotes" -msgstr "" - -#: lib/transport.tcl:41 -msgid "Pruning tracking branches deleted from all remotes" -msgstr "" - -#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 -#: lib/remote_add.tcl:162 -#, tcl-format -msgid "push %s" -msgstr "" - -#: lib/transport.tcl:55 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "" - -#: lib/transport.tcl:93 -#, tcl-format -msgid "Mirroring to %s" -msgstr "" - -#: lib/transport.tcl:111 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "" - -#: lib/transport.tcl:132 -msgid "Push Branches" -msgstr "" - -#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34 -#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32 -#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 -#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 -#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178 -msgid "Cancel" -msgstr "" - -#: lib/transport.tcl:147 -msgid "Source Branches" -msgstr "" - -#: lib/transport.tcl:162 -msgid "Destination Repository" -msgstr "" - -#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 -msgid "Remote:" -msgstr "" - -#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 -msgid "Arbitrary Location:" -msgstr "" - -#: lib/transport.tcl:205 -msgid "Transfer Options" -msgstr "" - -#: lib/transport.tcl:207 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" - -#: lib/transport.tcl:211 -msgid "Use thin pack (for slow network connections)" -msgstr "" - -#: lib/transport.tcl:215 -msgid "Include tags" -msgstr "" - -#: lib/transport.tcl:229 -#, tcl-format -msgid "%s (%s): Push" -msgstr "" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "" - -#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 -#: lib/database.tcl:30 -msgid "Close" -msgstr "" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "" - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "" - -#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "" - -#: lib/checkout_op.tcl:229 -#, 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:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "" - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "" - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "" - -#: lib/checkout_op.tcl:289 -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:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "" - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "" - -#: lib/checkout_op.tcl:377 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "" - -#: lib/checkout_op.tcl:378 -msgid "File level merge required." -msgstr "" - -#: lib/checkout_op.tcl:382 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "" - -#: lib/checkout_op.tcl:453 -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:504 lib/checkout_op.tcl:508 -#, tcl-format -msgid "Checked out '%s'." -msgstr "" - -#: lib/checkout_op.tcl:536 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "" - -#: lib/checkout_op.tcl:558 -msgid "Recovering lost commits may not be easy." -msgstr "" - -#: lib/checkout_op.tcl:563 -#, tcl-format -msgid "Reset '%s'?" -msgstr "" - -#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 -msgid "Visualize" -msgstr "" - -#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 -msgid "Reset" -msgstr "" - -#: lib/checkout_op.tcl:636 -#, 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/remote_add.tcl:20 -#, tcl-format -msgid "%s (%s): Add Remote" -msgstr "" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "" - -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "" - -#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 -msgid "Name:" -msgstr "" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "" - -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "" - -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "" - -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "" - -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "" - -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "" - -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "" - -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "" - -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "" - -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "" - -#: lib/remote_add.tcl:163 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "" - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "" - -#: lib/browser.tcl:27 -#, tcl-format -msgid "%s (%s): File Browser" -msgstr "" - -#: lib/browser.tcl:132 lib/browser.tcl:149 -#, tcl-format -msgid "Loading %s..." -msgstr "" - -#: lib/browser.tcl:193 -msgid "[Up To Parent]" -msgstr "" - -#: lib/browser.tcl:275 -#, tcl-format -msgid "%s (%s): Browse Branch Files" -msgstr "" - -#: lib/browser.tcl:282 -msgid "Browse Branch Files" -msgstr "" - -#: lib/browser.tcl:288 lib/choose_repository.tcl:437 -#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533 -#: lib/choose_repository.tcl:1115 -msgid "Browse" -msgstr "" - -#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "" - -#: lib/index.tcl:30 -msgid "Index Error" -msgstr "" - -#: lib/index.tcl:32 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" - -#: lib/index.tcl:43 -msgid "Continue" -msgstr "" - -#: lib/index.tcl:46 -msgid "Unlock Index" -msgstr "" - -#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587 -#: lib/choose_repository.tcl:999 -msgid "files" -msgstr "" - -#: lib/index.tcl:326 -msgid "Unstaging selected files from commit" -msgstr "" - -#: lib/index.tcl:330 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "" - -#: lib/index.tcl:369 -msgid "Ready to commit." -msgstr "" - -#: lib/index.tcl:378 -msgid "Adding selected files" -msgstr "" - -#: lib/index.tcl:382 -#, tcl-format -msgid "Adding %s" -msgstr "" - -#: lib/index.tcl:412 -#, tcl-format -msgid "Stage %d untracked files?" -msgstr "" - -#: lib/index.tcl:420 -msgid "Adding all changed files" -msgstr "" - -#: lib/index.tcl:503 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "" - -#: lib/index.tcl:508 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "" - -#: lib/index.tcl:517 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" - -#: lib/index.tcl:520 lib/index.tcl:563 -msgid "Do Nothing" -msgstr "" - -#: lib/index.tcl:545 -#, tcl-format -msgid "Delete untracked file %s?" -msgstr "" - -#: lib/index.tcl:550 -#, tcl-format -msgid "Delete these %i untracked files?" -msgstr "" - -#: lib/index.tcl:560 -msgid "Files will be permanently deleted." -msgstr "" - -#: lib/index.tcl:564 -msgid "Delete Files" -msgstr "" - -#: lib/index.tcl:586 -msgid "Deleting" -msgstr "" - -#: lib/index.tcl:665 -msgid "Encountered errors deleting files:\n" -msgstr "" - -#: lib/index.tcl:674 -#, tcl-format -msgid "None of the %d selected files could be deleted." -msgstr "" - -#: lib/index.tcl:679 -#, tcl-format -msgid "%d of the %d selected files could not be deleted." -msgstr "" - -#: lib/index.tcl:726 -msgid "Reverting selected files" -msgstr "" - -#: lib/index.tcl:730 -#, tcl-format -msgid "Reverting %s" -msgstr "" - -#: lib/branch_checkout.tcl:16 -#, tcl-format -msgid "%s (%s): Checkout Branch" -msgstr "" - -#: lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "" - -#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 -msgid "Options" -msgstr "" - -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "" - -#: lib/status_bar.tcl:263 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "" - -#: lib/remote.tcl:200 -msgid "Push to" -msgstr "" - -#: lib/remote.tcl:218 -msgid "Remove Remote" -msgstr "" - -#: lib/remote.tcl:223 -msgid "Prune from" -msgstr "" - -#: lib/remote.tcl:228 -msgid "Fetch from" -msgstr "" - -#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264 -msgid "All" -msgstr "" - -#: lib/branch_rename.tcl:15 -#, tcl-format -msgid "%s (%s): Rename Branch" -msgstr "" - -#: lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "" - -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "" - -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "" - -#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 -msgid "Please supply a branch name." -msgstr "" - -#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "" - -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "" - -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "" - -#: lib/choose_font.tcl:55 -msgid "Font Family" -msgstr "" - -#: lib/choose_font.tcl:76 -msgid "Font Size" -msgstr "" - -#: lib/choose_font.tcl:93 -msgid "Font Example" -msgstr "" - -#: lib/choose_font.tcl:105 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "" - -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "" - -#: lib/option.tcl:123 -msgid "Save" -msgstr "" - -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "" - -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "" - -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "" - -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "" - -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "" - -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "" - -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "" - -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "" - -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "" - -#: lib/option.tcl:153 -msgid "Maximum Length of Recent Repositories List" -msgstr "" - -#: lib/option.tcl:154 -msgid "Minimum Letters To Blame Copy On" -msgstr "" - -#: lib/option.tcl:155 -msgid "Blame History Context Radius (days)" -msgstr "" - -#: lib/option.tcl:156 -msgid "Number of Diff Context Lines" -msgstr "" - -#: lib/option.tcl:157 -msgid "Additional Diff Parameters" -msgstr "" - -#: lib/option.tcl:158 -msgid "Commit Message Text Width" -msgstr "" - -#: lib/option.tcl:159 -msgid "New Branch Name Template" -msgstr "" - -#: lib/option.tcl:160 -msgid "Default File Contents Encoding" -msgstr "" - -#: lib/option.tcl:161 -msgid "Warn before committing to a detached head" -msgstr "" - -#: lib/option.tcl:162 -msgid "Staging of untracked files" -msgstr "" - -#: lib/option.tcl:163 -msgid "Show untracked files" -msgstr "" - -#: lib/option.tcl:164 -msgid "Tab spacing" -msgstr "" - -#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282 -#: lib/database.tcl:57 -#, tcl-format -msgid "%s:" -msgstr "" - -#: lib/option.tcl:210 -msgid "Change" -msgstr "" - -#: lib/option.tcl:254 -msgid "Spelling Dictionary:" -msgstr "" - -#: lib/option.tcl:284 -msgid "Change Font" -msgstr "" - -#: lib/option.tcl:288 -#, tcl-format -msgid "Choose %s" -msgstr "" - -#: lib/option.tcl:294 -msgid "pt." -msgstr "" - -#: lib/option.tcl:308 -msgid "Preferences" -msgstr "" - -#: lib/option.tcl:345 -msgid "Failed to completely save options:" -msgstr "" - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "" - -#: lib/tools.tcl:76 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "" - -#: lib/tools.tcl:92 -#, tcl-format -msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "" - -#: lib/tools.tcl:96 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "" - -#: lib/tools.tcl:118 -#, tcl-format -msgid "Tool: %s" -msgstr "" - -#: lib/tools.tcl:119 -#, tcl-format -msgid "Running: %s" -msgstr "" - -#: lib/tools.tcl:158 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "" - -#: lib/tools.tcl:160 -#, tcl-format -msgid "Tool failed: %s" -msgstr "" - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "" - -#: lib/mergetool.tcl:246 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "" - -#: lib/mergetool.tcl:275 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "" - -#: lib/mergetool.tcl:310 -msgid "Merge tool is already running, terminate it?" -msgstr "" - -#: lib/mergetool.tcl:330 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" - -#: lib/mergetool.tcl:350 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" - -#: lib/mergetool.tcl:354 -msgid "Running merge tool..." -msgstr "" - -#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 -msgid "Merge tool failed." -msgstr "" - -#: lib/tools_dlg.tcl:22 -#, tcl-format -msgid "%s (%s): Add Tool" -msgstr "" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "" - -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "" - -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "" - -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "" - -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "" - -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "" - -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "" - -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "" - -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "" - -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "" - -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "" - -#: lib/tools_dlg.tcl:126 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "" - -#: lib/tools_dlg.tcl:148 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" - -#: lib/tools_dlg.tcl:187 -#, tcl-format -msgid "%s (%s): Remove Tool" -msgstr "" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "" - -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "" - -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "" - -#: lib/tools_dlg.tcl:283 -#, tcl-format -msgid "%s (%s):" -msgstr "" - -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "" - -#: lib/search.tcl:48 -msgid "Find:" -msgstr "" - -#: lib/search.tcl:50 -msgid "Next" -msgstr "" - -#: lib/search.tcl:51 -msgid "Prev" -msgstr "" - -#: lib/search.tcl:52 -msgid "RegExp" -msgstr "" - -#: lib/search.tcl:54 -msgid "Case" -msgstr "" - -#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75 -#, tcl-format -msgid "%s (%s): Create Desktop Icon" -msgstr "" - -#: lib/shortcut.tcl:24 lib/shortcut.tcl:65 -msgid "Cannot write shortcut:" -msgstr "" - -#: lib/shortcut.tcl:140 -msgid "Cannot write icon:" -msgstr "" - -#: lib/remote_branch_delete.tcl:29 -#, tcl-format -msgid "%s (%s): Delete Branch Remotely" -msgstr "" - -#: lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "" - -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" -msgstr "" - -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" -msgstr "" - -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" -msgstr "" - -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" -msgstr "" - -#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 -msgid "Always (Do not perform merge checks)" -msgstr "" - -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." -msgstr "" - -#: lib/remote_branch_delete.tcl:185 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" - -#: lib/remote_branch_delete.tcl:190 -#, 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:208 -msgid "Please select one or more branches to delete." -msgstr "" - -#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" - -#: lib/remote_branch_delete.tcl:227 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "" - -#: lib/remote_branch_delete.tcl:300 -msgid "No repository selected." -msgstr "" - -#: lib/remote_branch_delete.tcl:305 -#, tcl-format -msgid "Scanning %s..." -msgstr "" - -#: lib/choose_repository.tcl:45 -msgid "Git Gui" -msgstr "" - -#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 -msgid "Create New Repository" -msgstr "" - -#: lib/choose_repository.tcl:110 -msgid "New..." -msgstr "" - -#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 -msgid "Clone Existing Repository" -msgstr "" - -#: lib/choose_repository.tcl:128 -msgid "Clone..." -msgstr "" - -#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 -msgid "Open Existing Repository" -msgstr "" - -#: lib/choose_repository.tcl:141 -msgid "Open..." -msgstr "" - -#: lib/choose_repository.tcl:154 -msgid "Recent Repositories" -msgstr "" - -#: lib/choose_repository.tcl:164 -msgid "Open Recent Repository:" -msgstr "" - -#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 -#: lib/choose_repository.tcl:345 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "" - -#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 -msgid "Create" -msgstr "" - -#: lib/choose_repository.tcl:432 -msgid "Directory:" -msgstr "" - -#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 -#: lib/choose_repository.tcl:1139 -msgid "Git Repository" -msgstr "" - -#: lib/choose_repository.tcl:487 -#, tcl-format -msgid "Directory %s already exists." -msgstr "" - -#: lib/choose_repository.tcl:491 -#, tcl-format -msgid "File %s already exists." -msgstr "" - -#: lib/choose_repository.tcl:506 -msgid "Clone" -msgstr "" - -#: lib/choose_repository.tcl:519 -msgid "Source Location:" -msgstr "" - -#: lib/choose_repository.tcl:528 -msgid "Target Directory:" -msgstr "" - -#: lib/choose_repository.tcl:538 -msgid "Clone Type:" -msgstr "" - -#: lib/choose_repository.tcl:543 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "" - -#: lib/choose_repository.tcl:548 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "" - -#: lib/choose_repository.tcl:553 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "" - -#: lib/choose_repository.tcl:560 -msgid "Recursively clone submodules too" -msgstr "" - -#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641 -#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864 -#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "" - -#: lib/choose_repository.tcl:630 -msgid "Standard only available for local repository." -msgstr "" - -#: lib/choose_repository.tcl:634 -msgid "Shared only available for local repository." -msgstr "" - -#: lib/choose_repository.tcl:655 -#, tcl-format -msgid "Location %s already exists." -msgstr "" - -#: lib/choose_repository.tcl:666 -msgid "Failed to configure origin" -msgstr "" - -#: lib/choose_repository.tcl:678 -msgid "Counting objects" -msgstr "" - -#: lib/choose_repository.tcl:679 -msgid "buckets" -msgstr "" - -#: lib/choose_repository.tcl:703 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "" - -#: lib/choose_repository.tcl:740 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "" - -#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 -#: lib/choose_repository.tcl:974 -msgid "The 'master' branch has not been initialized." -msgstr "" - -#: lib/choose_repository.tcl:755 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "" - -#: lib/choose_repository.tcl:769 -#, tcl-format -msgid "Cloning from %s" -msgstr "" - -#: lib/choose_repository.tcl:800 -msgid "Copying objects" -msgstr "" - -#: lib/choose_repository.tcl:801 -msgid "KiB" -msgstr "" - -#: lib/choose_repository.tcl:825 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "" - -#: lib/choose_repository.tcl:837 -msgid "Linking objects" -msgstr "" - -#: lib/choose_repository.tcl:838 -msgid "objects" -msgstr "" - -#: lib/choose_repository.tcl:846 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "" - -#: lib/choose_repository.tcl:903 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" - -#: lib/choose_repository.tcl:914 -msgid "Cannot fetch tags. See console output for details." -msgstr "" - -#: lib/choose_repository.tcl:938 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" - -#: lib/choose_repository.tcl:947 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "" - -#: lib/choose_repository.tcl:953 -msgid "Clone failed." -msgstr "" - -#: lib/choose_repository.tcl:960 -msgid "No default branch obtained." -msgstr "" - -#: lib/choose_repository.tcl:971 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "" - -#: lib/choose_repository.tcl:998 -msgid "Creating working directory" -msgstr "" - -#: lib/choose_repository.tcl:1028 -msgid "Initial file checkout failed." -msgstr "" - -#: lib/choose_repository.tcl:1072 -msgid "Cloning submodules" -msgstr "" - -#: lib/choose_repository.tcl:1087 -msgid "Cannot clone submodules." -msgstr "" - -#: lib/choose_repository.tcl:1110 -msgid "Repository:" -msgstr "" - -#: lib/choose_repository.tcl:1159 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "" - -#: lib/blame.tcl:74 -#, tcl-format -msgid "%s (%s): File Viewer" -msgstr "" - -#: lib/blame.tcl:80 -msgid "Commit:" -msgstr "" - -#: lib/blame.tcl:282 -msgid "Copy Commit" -msgstr "" - -#: lib/blame.tcl:286 -msgid "Find Text..." -msgstr "" - -#: lib/blame.tcl:290 -msgid "Goto Line..." -msgstr "" - -#: lib/blame.tcl:299 -msgid "Do Full Copy Detection" -msgstr "" - -#: lib/blame.tcl:303 -msgid "Show History Context" -msgstr "" - -#: lib/blame.tcl:306 -msgid "Blame Parent Commit" -msgstr "" - -#: lib/blame.tcl:468 -#, tcl-format -msgid "Reading %s..." -msgstr "" - -#: lib/blame.tcl:596 -msgid "Loading copy/move tracking annotations..." -msgstr "" - -#: lib/blame.tcl:613 -msgid "lines annotated" -msgstr "" - -#: lib/blame.tcl:815 -msgid "Loading original location annotations..." -msgstr "" - -#: lib/blame.tcl:818 -msgid "Annotation complete." -msgstr "" - -#: lib/blame.tcl:849 -msgid "Busy" -msgstr "" - -#: lib/blame.tcl:850 -msgid "Annotation process is already running." -msgstr "" - -#: lib/blame.tcl:889 -msgid "Running thorough copy detection..." -msgstr "" - -#: lib/blame.tcl:957 -msgid "Loading annotation..." -msgstr "" - -#: lib/blame.tcl:1010 -msgid "Author:" -msgstr "" - -#: lib/blame.tcl:1014 -msgid "Committer:" -msgstr "" - -#: lib/blame.tcl:1019 -msgid "Original File:" -msgstr "" - -#: lib/blame.tcl:1067 -msgid "Cannot find HEAD commit:" -msgstr "" - -#: lib/blame.tcl:1122 -msgid "Cannot find parent commit:" -msgstr "" - -#: lib/blame.tcl:1137 -msgid "Unable to display parent" -msgstr "" - -#: lib/blame.tcl:1138 lib/diff.tcl:345 -msgid "Error loading diff:" -msgstr "" - -#: lib/blame.tcl:1279 -msgid "Originally By:" -msgstr "" - -#: lib/blame.tcl:1285 -msgid "In File:" -msgstr "" - -#: lib/blame.tcl:1290 -msgid "Copied Or Moved Here By:" -msgstr "" - -#: lib/diff.tcl:77 -#, 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:117 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "" - -#: lib/diff.tcl:143 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" - -#: lib/diff.tcl:148 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" - -#: lib/diff.tcl:155 -msgid "LOCAL:\n" -msgstr "" - -#: lib/diff.tcl:158 -msgid "REMOTE:\n" -msgstr "" - -#: lib/diff.tcl:220 lib/diff.tcl:344 -#, tcl-format -msgid "Unable to display %s" -msgstr "" - -#: lib/diff.tcl:221 -msgid "Error loading file:" -msgstr "" - -#: lib/diff.tcl:227 -msgid "Git Repository (subproject)" -msgstr "" - -#: lib/diff.tcl:239 -msgid "* Binary file (not showing content)." -msgstr "" - -#: lib/diff.tcl:244 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" - -#: lib/diff.tcl:250 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" - -#: lib/diff.tcl:583 -msgid "Failed to unstage selected hunk." -msgstr "" - -#: lib/diff.tcl:591 -msgid "Failed to revert selected hunk." -msgstr "" - -#: lib/diff.tcl:594 -msgid "Failed to stage selected hunk." -msgstr "" - -#: lib/diff.tcl:687 -msgid "Failed to unstage selected line." -msgstr "" - -#: lib/diff.tcl:696 -msgid "Failed to revert selected line." -msgstr "" - -#: lib/diff.tcl:700 -msgid "Failed to stage selected line." -msgstr "" - -#: lib/diff.tcl:889 -msgid "Failed to undo last revert." -msgstr "" - -#: lib/sshkey.tcl:34 -msgid "No keys found." -msgstr "" - -#: lib/sshkey.tcl:37 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "" - -#: lib/sshkey.tcl:43 -msgid "Generate Key" -msgstr "" - -#: lib/sshkey.tcl:61 -msgid "Copy To Clipboard" -msgstr "" - -#: lib/sshkey.tcl:75 -msgid "Your OpenSSH Public Key" -msgstr "" - -#: lib/sshkey.tcl:83 -msgid "Generating..." -msgstr "" - -#: lib/sshkey.tcl:89 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" - -#: lib/sshkey.tcl:116 -msgid "Generation failed." -msgstr "" - -#: lib/sshkey.tcl:123 -msgid "Generation succeeded, but no keys found." -msgstr "" - -#: lib/sshkey.tcl:126 -#, tcl-format -msgid "Your key is in: %s" -msgstr "" - -#: lib/branch_create.tcl:23 -#, tcl-format -msgid "%s (%s): Create Branch" -msgstr "" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "" - -#: lib/branch_create.tcl:57 -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:97 -msgid "Checkout After Creation" -msgstr "" - -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "" - -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "" - -#: lib/console.tcl:186 -msgid "Success" -msgstr "" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "" - -#: lib/line.tcl:17 -msgid "Goto Line:" -msgstr "" - -#: lib/line.tcl:23 -msgid "Go" -msgstr "" - -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" -msgstr "" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "" - -#: lib/choose_rev.tcl:72 -msgid "Local Branch" -msgstr "" - -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" -msgstr "" - -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 -msgid "Tag" -msgstr "" - -#: lib/choose_rev.tcl:321 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "" - -#: lib/choose_rev.tcl:342 -msgid "No revision selected." -msgstr "" - -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." -msgstr "" - -#: lib/choose_rev.tcl:537 -msgid "Updated" -msgstr "" - -#: lib/choose_rev.tcl:565 -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:56 -msgid "Error loading commit data for amend:" -msgstr "" - -#: lib/commit.tcl:83 -msgid "Unable to obtain your identity:" -msgstr "" - -#: lib/commit.tcl:88 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "" - -#: lib/commit.tcl:138 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "" - -#: lib/commit.tcl:158 -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:182 -#, 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:190 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" - -#: lib/commit.tcl:198 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" - -#: lib/commit.tcl:213 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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:244 -msgid "Calling pre-commit hook..." -msgstr "" - -#: lib/commit.tcl:259 -msgid "Commit declined by pre-commit hook." -msgstr "" - -#: lib/commit.tcl:278 -msgid "" -"You are about to commit on a detached head. This is a potentially dangerous " -"thing to do because if you switch to another branch you will lose your " -"changes and it can be difficult to retrieve them later from the reflog. You " -"should probably cancel this commit and create a new branch to continue.\n" -" \n" -" Do you really want to proceed with your Commit?" -msgstr "" - -#: lib/commit.tcl:299 -msgid "Calling commit-msg hook..." -msgstr "" - -#: lib/commit.tcl:314 -msgid "Commit declined by commit-msg hook." -msgstr "" - -#: lib/commit.tcl:327 -msgid "Committing changes..." -msgstr "" - -#: lib/commit.tcl:344 -msgid "write-tree failed:" -msgstr "" - -#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 -msgid "Commit failed." -msgstr "" - -#: lib/commit.tcl:362 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "" - -#: lib/commit.tcl:367 -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:374 -msgid "No changes to commit." -msgstr "" - -#: lib/commit.tcl:394 -msgid "commit-tree failed:" -msgstr "" - -#: lib/commit.tcl:421 -msgid "update-ref failed:" -msgstr "" - -#: lib/commit.tcl:514 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "" - -#: lib/branch_delete.tcl:16 -#, tcl-format -msgid "%s (%s): Delete Branch" -msgstr "" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "" - -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "" - -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "" - -#: lib/branch_delete.tcl:131 -#, tcl-format -msgid " - %s:" -msgstr "" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "" - -#: lib/database.tcl:42 -msgid "Number of loose objects" -msgstr "" - -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" -msgstr "" - -#: lib/database.tcl:44 -msgid "Number of packed objects" -msgstr "" - -#: lib/database.tcl:45 -msgid "Number of packs" -msgstr "" - -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" -msgstr "" - -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" -msgstr "" - -#: lib/database.tcl:48 -msgid "Garbage files" -msgstr "" - -#: lib/database.tcl:66 -#, tcl-format -msgid "%s (%s): Database Statistics" -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:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" - -#: lib/error.tcl:20 -#, tcl-format -msgid "%s: error" -msgstr "" - -#: lib/error.tcl:36 -#, tcl-format -msgid "%s: warning" -msgstr "" - -#: lib/error.tcl:80 -#, tcl-format -msgid "%s hook failed:" -msgstr "" - -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." -msgstr "" - -#: lib/error.tcl:116 -#, tcl-format -msgid "%s (%s): error" -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:45 -#, 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:55 -#, 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:108 -#, tcl-format -msgid "%s of %s" -msgstr "" - -#: lib/merge.tcl:126 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "" - -#: lib/merge.tcl:137 -msgid "Merge completed successfully." -msgstr "" - -#: lib/merge.tcl:139 -msgid "Merge failed. Conflict resolution is required." -msgstr "" - -#: lib/merge.tcl:156 -#, tcl-format -msgid "%s (%s): Merge" -msgstr "" - -#: lib/merge.tcl:164 -#, tcl-format -msgid "Merge Into %s" -msgstr "" - -#: lib/merge.tcl:183 -msgid "Revision To Merge" -msgstr "" - -#: lib/merge.tcl:218 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" - -#: lib/merge.tcl:228 -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:234 -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:246 -msgid "Aborting" -msgstr "" - -#: lib/merge.tcl:247 -msgid "files reset" -msgstr "" - -#: lib/merge.tcl:277 -msgid "Abort failed." -msgstr "" - -#: lib/merge.tcl:279 -msgid "Abort completed. Ready." -msgstr "" diff --git a/third_party/git/git-gui/po/glossary/Makefile b/third_party/git/git-gui/po/glossary/Makefile deleted file mode 100644 index 749aa2e7ec1b..000000000000 --- a/third_party/git/git-gui/po/glossary/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -PO_TEMPLATE = git-gui-glossary.pot - -ALL_POFILES = $(wildcard *.po) - -$(PO_TEMPLATE): $(subst .pot,.txt,$(PO_TEMPLATE)) - ./txt-to-pot.sh $< > $@ - -update-po:: git-gui-glossary.pot - $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) diff --git a/third_party/git/git-gui/po/glossary/bg.po b/third_party/git/git-gui/po/glossary/bg.po deleted file mode 100644 index 8b71fad9a590..000000000000 --- a/third_party/git/git-gui/po/glossary/bg.po +++ /dev/null @@ -1,287 +0,0 @@ -# Bulgarian translation of git-gui-glossary po-file. -# Copyright (C) 2012, 2013, 2014 Alexander Shopov <ash@kambanaria.org>. -# This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2012, 2013, 2014. -# -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui-glossary master\n" -"POT-Creation-Date: 2014-01-13 21:39+0200\n" -"PO-Revision-Date: 2014-01-13 21:39+0200\n" -"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" -"Language-Team: Bulgarian <dict@fsa-bg.org>\n" -"Language: bg\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" - -#. "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 "Термин" - -#. "" -msgid "amend" -msgstr "поправям" - -#. "" -msgid "annotate" -msgstr "анотирам" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "клон, разклонение [съществително]" - -#. "" -msgid "branch [verb]" -msgstr "разклонявам [глагол]" - -#. "" -msgid "checkout [noun]" -msgstr "изтегляне [съществително]" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "изтегляне [глагол]" - -#. "" -msgid "clone [verb]" -msgstr "клонирам [глагол]" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "подаване [съществително]" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "подавам [съществително]" - -#. "" -msgid "diff [noun]" -msgstr "разлика/промени [съществително]" - -#. "" -msgid "diff [verb]" -msgstr "изчислявам разлика/промени [глагол]" - -#. "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 "превъртащо/директно/тривиално сливане" - -#. "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 "доставяне" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "парче" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "скеле/индекс/изба" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "сливане/обединяване [съществително]" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "сливам/обединявам [глагол]" - -#. "" -msgid "message" -msgstr "съобщение" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "окастрям" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "издърпвам" - -#. "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 "изтласквам" - -#. "" -msgid "redo" -msgstr "повтарям/правя наново" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "отдалечено хранилище" - -#. "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 "хранилище" - -#. "" -msgid "reset" -msgstr "занулявам/отменям" - -#. "" -msgid "revert" -msgstr "връщам/отменям" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "версия" - -#. "" -msgid "sign off" -msgstr "подписвам" - -#. "" -msgid "staging area" -msgstr "скеле/индекс/изба" - -#. "" -msgid "status" -msgstr "състояние" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "етикет [съществително]" - -#. "" -msgid "tag [verb]" -msgstr "задавам етикет [глагол]" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "следящ клон" - -#. "" -msgid "undo" -msgstr "отменям" - -#. "" -msgid "update" -msgstr "обновявам" - -#. "" -msgid "verify" -msgstr "проверявам" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "работно копие/работно дърво" - -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "предшественик" - -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "преустановявам" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "голо хранилище" - -#. "a parent version of the current file" -msgid "base" -msgstr "родителска версия" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "анотирам/анотиране" - -#. "to select and apply a single commit without merging" -msgid "cherry-pick" -msgstr "отбирам" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child" -msgstr "дете" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "зачиствам" - -#. "a message that gets attached with any commit" -msgid "commit message" -msgstr "съобщение при подаване" - -#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -msgid "descendant" -msgstr "наследник" - -#. "checkout of a revision rather than a some head" -msgid "detached checkout" -msgstr "несвързано изтегляне" - -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "пофайлово сливане" - -#. "the last revision in a branch" -msgid "head" -msgstr "глава/връх (на клон, разработка)" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "кука/автоматичен скрипт" - -#. "the first checkout during a clone operation" -msgid "initial checkout" -msgstr "първоначално изтегляне" - -#. "a branch that resides in the local git repository" -msgid "local branch" -msgstr "локален клон" - -#. "a Git object that is not part of any pack" -msgid "loose object" -msgstr "непакетиран обект" - -#. "a branch called by convention 'master' that exists in a newly created git repository" -msgid "master branch" -msgstr "основен клон" - -#. "a remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "хранилище-източник" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -msgstr "етикет" - -#. "a Git object part of some pack" -msgid "packed object" -msgstr "пакетиран обект" - -#. "a commit that directly precedes the current one in git's graph of commits" -msgid "parent" -msgstr "родител" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -msgstr "журнал на указателите" - -#. "decide which changes from alternative versions of a file should persist in Git" -msgid "resolve (a conflict)" -msgstr "коригирам (конфликт)" - -#. "abandon changes and go to pristine version" -msgid "revert changes" -msgstr "връщане на оригинала" - -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "израз за версия" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage/unstage" -msgstr "(добавяне) към скелето за подаване/изваждане от скелето за подаване" - -#. "temporarily save changes in a stack without committing" -msgid "stash" -msgstr "скатавам промени" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "следен/неследен" diff --git a/third_party/git/git-gui/po/glossary/de.po b/third_party/git/git-gui/po/glossary/de.po deleted file mode 100644 index 4c5f233ee52d..000000000000 --- a/third_party/git/git-gui/po/glossary/de.po +++ /dev/null @@ -1,430 +0,0 @@ -# Translation of git-gui glossary to German -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Christian Stimming <stimming@tuhh.de>, 2007 -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2020-01-26 22:26+0100\n" -"PO-Revision-Date: 2020-02-09 21:22+0100\n" -"Last-Translator: Christian Stimming <stimming@tuhh.de>\n" -"Language-Team: German \n" -"Language: de_DE\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 "" -"Deutsche Übersetzung.\n" -"Git-core glossary:\n" -" https://github.com/ruester/git-po-de/wiki/Translation-Guidelines\n" -"\n" -"Andere deutsche SCM:\n" -" http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://" -"tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po " -"(username=guest, password empty, gut),\n" -" http://msdn.microsoft.com/de-de/library/ms181038(vs.80).aspx (MS Visual " -"Source Safe, kommerziell),\n" -" http://cvsbook.red-bean.com/translations/german/Kap_06.html " -"(mittelmäßig),\n" -" http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/de_DE.po?" -"view=markup (mittelmäßig),\n" -" http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po " -"(username=guest, password empty, schlecht)" - -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "abbrechen" - -#. "" -msgid "amend" -msgstr "nachbessern (ergänzen)" - -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "Vorgänger-Commit" - -#. "" -msgid "annotate" -msgstr "annotieren" - -#. "The person who initially created (authored) a commit" -msgid "author" -msgstr "Autor" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "bloßes Projektarchiv" - -#. "a parent version of the current file" -msgid "base" -msgstr "Ursprung" - -#. "" -msgid "bisect" -msgstr "binäre Suche [noun], binäre Suche benutzen [verb]" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "annotieren" - -#. "" -msgid "blob" -msgstr "Blob" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "Branch" - -#. "" -msgid "branch [verb]" -msgstr "branchen" - -#. "" -msgid "checkout [noun]" -msgstr "" -"Arbeitskopie (Checkout; Erstellung einer Arbeitskopie; Auscheck? Source " -"Safe: Auscheckvorgang)" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "" -"Arbeitskopie erstellen; Branch auschecken [checkout a branch] (umstellen? " -"Source Safe: auschecken)" - -#. "to select and apply a single commit to the current HEAD without merging" -msgid "cherry-pick" -msgstr "cherry-pick (pflücken?)" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child commit" -msgstr "Kind-Commit" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "aufräumen" - -#. "" -msgid "clone [verb]" -msgstr "klonen" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "Commit (Version?)" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "" -"committen (eintragen?, TortoiseSVN: übertragen; Source Safe: einchecken)" - -#. "a message that gets attached with any commit" -msgid "commit message" -msgstr "Commit-Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" - -#. "The person who committed a commit (to the current branch), which might be different than the author." -msgid "committer" -msgstr "Committer" - -#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -msgid "descendant" -msgstr "Nachfolger-Commit" - -#. "checkout of a revision rather than some head" -msgid "detached HEAD" -msgstr "losgelöster HEAD / Branchspitze" - -#. "checkout of a revision rather than some head" -msgid "detached checkout" -msgstr "losgelöster Commit (von Branch losgelöster Commit?)" - -#. "" -msgid "diff [noun]" -msgstr "Vergleich (Diff? Source Safe: Unterschiede)" - -#. "" -msgid "diff [verb]" -msgstr "vergleichen" - -#. "" -msgid "directory" -msgstr "Verzeichnis" - -#. "A fast-forward merge 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" -msgstr "vorspulen" - -#. "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 "anfordern (holen?)" - -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "Datei-basiertes zusammenführen" - -#. "" -msgid "file" -msgstr "Datei" - -#. "the last revision in a branch" -msgid "head" -msgstr "HEAD / Branchspitze" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "Hook (in der dt. Informatik wohl als Einschubmethode bezeichnet)" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "Patch-Block (Kontext?)" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "" -"Bereitstellung (sofern der git index gemeint ist. In git-gui sowieso: " -"staging area)" - -#. "the first checkout during a clone operation" -msgid "initial checkout" -msgstr "Erstellen der Arbeitskopie, auschecken" - -#. "The very first commit in a repository" -msgid "initial commit" -msgstr "Allererster Commit" - -#. "a branch that resides in the local git repository" -msgid "local branch" -msgstr "Lokaler Branch" - -#. "a Git object that is not part of any pack" -msgid "loose object" -msgstr "loses Objekt" - -#. "a branch called by convention 'master' that exists in a newly created git repository" -msgid "master branch" -msgstr "Master-Branch" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "Zusammenführung" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "zusammenführen" - -#. "" -msgid "message" -msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" - -#. "a remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "origin" - -#. "" -msgid "orphan commit" -msgstr "verwaister Commit" - -#. "" -msgid "orphan reference" -msgstr "verwaiste Referenz" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -msgstr "Pack-Datei" - -#. "the process of creating a pack file" -msgid "pack [verb]" -msgstr "Pack-Datei erstellen" - -#. "a Git object part of some pack" -msgid "packed object" -msgstr "gepacktes Objekt" - -#. "a commit that directly precedes the current one in git's graph of commits" -msgid "parent commit" -msgstr "Eltern-Commit" - -msgid "patch" -msgstr "Patch" - -#. "The path to a file" -msgid "path" -msgstr "Pfad" - -#. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "veraltete Branches entfernen (aufräumen?, entfernen?)" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "" -"übernehmen (pull? ziehen? Vorsicht: zusammenführen = merge, aber pull kann " -"auch rebase bewirken)" - -#. "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 "versenden (ausliefern? hochladen? verschicken? schieben?)" - -#. "The process of rebasing one set of commits on top of another branch's head" -msgid "rebase [noun]" -msgstr "der Rebase (das Umpflanzen)" - -#. "Re-apply one set of commits on top of another branch's head. Contrary to merge." -msgid "rebase [verb]" -msgstr "rebase (umpflanzen)" - -#. "" -msgid "redo" -msgstr "wiederholen" - -#. "" -msgid "reference" -msgstr "Referenz" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -msgstr "Commit-Log, »reflog«" - -msgid "refmap" -msgstr "Refmap" - -#. "" -msgid "refspec" -msgstr "Refspec" - -#. "The adjective for anything which is outside of the current (local) repository" -msgid "remote [adj]" -msgstr "Extern (Andere?, Gegenseite?, Entfernte?, Server?)" - -#. "A branch in any other ('remote') repository" -msgid "remote branch" -msgstr "Externer branch" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote repository" -msgstr "Externes Repository" - -#. "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 "Repository" - -#. "" -msgid "reset" -msgstr "umsetzen (reset to commit), Änderungen verwerfen (reset to HEAD)" - -#. "decide which changes from alternative versions of a file should persist in Git" -msgid "resolve (a conflict)" -msgstr "auflösen (einen Konflikt)" - -#. "abandon changes and go to pristine version" -msgid "revert changes" -msgstr "" -"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also " -"mit neuem commit; umkehren?)" - -#. "" -msgid "revert" -msgstr "" -"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also " -"mit neuem commit; umkehren?)" - -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "Version Regexp-Ausdruck" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "" -"Version (aber was macht das Wort revision hier im Git?? TortoiseSVN: " -"Revision; Source Safe: Version)" - -#. "" -msgid "sign off" -msgstr "abzeichnen (signieren? gegenzeichnen?, freizeichnen?)" - -#. "see: staging area. In some areas of git this is called 'index'." -msgid "stage [noun], index" -msgstr "Bereitstellung" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage [verb]" -msgstr "bereitstellen" - -#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." -msgid "staging area" -msgstr "Bereitstellung" - -#. "The place (stack) where changes can be temporarily saved without committing" -msgid "stash [noun]" -msgstr "der Stash" - -#. "temporarily save changes in a stack without committing" -msgid "stash [verb]" -msgstr "in Stash speichern; \"stash\" benutzen" - -#. "" -msgid "status" -msgstr "Status" - -#. "" -msgid "submodule" -msgstr "Submodul (Untermodul?)" - -#. "A ref pointing to some commit object. In other words: A label on a specific commit." -msgid "tag [noun]" -msgstr "Tag (Markierung?)" - -#. "The process of creating a tag at a specific commit object" -msgid "tag [verb]" -msgstr "taggen (markieren?)" - -#. "The person who created a tag" -msgid "tagger" -msgstr "Tag-Ersteller (Markierungs-Ersteller?)" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "versioniert/unversioniert" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "Tracking-Branch (Verfolgungsbranch? Übernahmebranch?)" - -#. "" -msgid "trailer" -msgstr "Anhang" - -#. "1. tree object, 2. directory tree" -msgid "tree" -msgstr "1. Baum-Objekt, 2. Verzeichnisbaum" - -#. "" -msgid "undo" -msgstr "rückgängig" - -#. "Remove content of files from the staging area again so that it will not be part of the next commit" -msgid "unstage" -msgstr "aus Bereitstellung herausnehmen" - -#. "Retrieving the temporarily saved changes back again from the stash" -msgid "unstash [verb]" -msgstr "aus Stash zurückladen" - -#. "" -msgid "update" -msgstr "aktualisieren" - -#. "" -msgid "upstream branch" -msgstr "Upstream-Branch" - -#. "" -msgid "verify" -msgstr "überprüfen" - -#. "The tree of actual checked out files." -msgid "working directory, working copy, working tree" -msgstr "Arbeitskopie" diff --git a/third_party/git/git-gui/po/glossary/el.po b/third_party/git/git-gui/po/glossary/el.po deleted file mode 100644 index 1d3cc818d5ef..000000000000 --- a/third_party/git/git-gui/po/glossary/el.po +++ /dev/null @@ -1,171 +0,0 @@ -# Translation of git-gui glossary to Greek -# Copyright (C) 2009 Jimmy Angelakos -# This file is distributed under the same license as the git-gui package. -# Jimmy Angelakos <vyruss@hellug.gr>, 2009. -msgid "" -msgstr "" -"Project-Id-Version: git-gui-glossary\n" -"POT-Creation-Date: 2008-01-07 21:20+0100\n" -"PO-Revision-Date: 2009-06-23 20:41+0300\n" -"Last-Translator: Jimmy Angelakos <vyruss@hellug.gr>\n" -"Language-Team: Greek <i18n@lists.hellug.gr>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\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 "" - -#. "" -msgid "amend" -msgstr "διόρθωση" - -#. "" -msgid "annotate" -msgstr "σχολιασμός" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "κλάδος [αντικείμενο]" - -#. "" -msgid "branch [verb]" -msgstr "διακλάδωση [ενέργεια]" - -#. "" -msgid "checkout [noun]" -msgstr "εξαγωγή [αντικείμενο]" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "εξαγωγή [ενέργεια]" - -#. "" -msgid "clone [verb]" -msgstr "κλωνοποίηση [ενέργεια]" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "υποβολή [αντικείμενο] " - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "υποβολή [ενέργεια]" - -#. "" -msgid "diff [noun]" -msgstr "διαφορά [αντικείμενο] " - -#. "" -msgid "diff [verb]" -msgstr "διαφορά [ενέργεια]" - -#. "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 "συγχώνευση επιτάχυνσης" - -#. "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 "ανάκτηση" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "κομμάτι" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "ευρετήριο (στο git-gui: περιοχή σταδιοποίησης)" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "συγχώνευση [αντικείμενο]" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "συγχώνευση [ενέργεια]" - -#. "" -msgid "message" -msgstr "μήνυμα" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "κλάδεμα" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "λήψη" - -#. "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 "ώθηση" - -#. "" -msgid "redo" -msgstr "ξανά" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "απομακρυσμένο" - -#. "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 "αποθετήριο" - -#. "" -msgid "reset" -msgstr "επαναφορά" - -#. "" -msgid "revert" -msgstr "αναίρεση" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "αναθεώρηση" - -#. "" -#, fuzzy -msgid "sign off" -msgstr "αποσύνδεση" - -#. "" -msgid "staging area" -msgstr "περιοχή σταδιοποίησης" - -#. "" -msgid "status" -msgstr "κατάσταση" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "ετικέτα [αντικείμενο]" - -#. "" -msgid "tag [verb]" -msgstr "ετικέτα [ενέργεια]" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "κλάδος παρακολούθησης" - -#. "" -msgid "undo" -msgstr "αναίρεση" - -#. "" -msgid "update" -msgstr "ενημέρωση" - -#. "" -msgid "verify" -msgstr "επαλήθευση" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "αντίγραφο εργασίας" - - diff --git a/third_party/git/git-gui/po/glossary/fr.po b/third_party/git/git-gui/po/glossary/fr.po deleted file mode 100644 index 27c006abb2ad..000000000000 --- a/third_party/git/git-gui/po/glossary/fr.po +++ /dev/null @@ -1,166 +0,0 @@ -# translation of fr.po to French -# Translation of git-gui glossary to French -# Copyright (C) 2008 Shawn Pearce, et al. -# -# Christian Couder <chriscool@tuxfamily.org>, 2008. -msgid "" -msgstr "" -"Project-Id-Version: fr\n" -"POT-Creation-Date: 2008-01-15 21:04+0100\n" -"PO-Revision-Date: 2008-01-15 21:17+0100\n" -"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n" -"Language-Team: French\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\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 "" - -#. "" -msgid "amend" -msgstr "corriger" - -#. "" -msgid "annotate" -msgstr "annoter" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "branche" - -#. "" -msgid "branch [verb]" -msgstr "créer une branche" - -#. "" -msgid "checkout [noun]" -msgstr "emprunt" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "emprunter" - -#. "" -msgid "clone [verb]" -msgstr "cloner" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "commit" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "commiter" - -#. "" -msgid "diff [noun]" -msgstr "différence" - -#. "" -msgid "diff [verb]" -msgstr "comparer" - -#. "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 "fusion par avance rapide" - -#. "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 "récupérer" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "pré-commit" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "fusion" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "fusionner" - -#. "" -msgid "message" -msgstr "message" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "nettoyer" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "tirer" - -#. "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 "pousser" - -#. "" -msgid "redo" -msgstr "refaire" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "référentiel distant" - -#. "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 "référentiel" - -#. "" -msgid "reset" -msgstr "réinitialiser" - -#. "" -msgid "revert" -msgstr "inverser" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "révision" - -#. "" -msgid "sign off" -msgstr "signer" - -#. "" -msgid "staging area" -msgstr "pré-commit" - -#. "" -msgid "status" -msgstr "état" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "marque" - -#. "" -msgid "tag [verb]" -msgstr "marquer" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "branche de suivi" - -#. "" -msgid "undo" -msgstr "défaire" - -#. "" -msgid "update" -msgstr "mise à jour" - -#. "" -msgid "verify" -msgstr "vérifier" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "copie de travail, arborescence de travail" - diff --git a/third_party/git/git-gui/po/glossary/git-gui-glossary.pot b/third_party/git/git-gui/po/glossary/git-gui-glossary.pot deleted file mode 100644 index 4e66e0da3a9c..000000000000 --- a/third_party/git/git-gui/po/glossary/git-gui-glossary.pot +++ /dev/null @@ -1,398 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-01-26 22:26+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\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 "" - -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "" - -#. "" -msgid "amend" -msgstr "" - -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "" - -#. "" -msgid "annotate" -msgstr "" - -#. "The person who initially created (authored) a commit" -msgid "author" -msgstr "" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "" - -#. "a parent version of the current file" -msgid "base" -msgstr "" - -#. "" -msgid "bisect" -msgstr "" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "" - -#. "" -msgid "blob" -msgstr "" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "" - -#. "" -msgid "branch [verb]" -msgstr "" - -#. "" -msgid "checkout [noun]" -msgstr "" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "" - -#. "to select and apply a single commit to the current HEAD without merging" -msgid "cherry-pick" -msgstr "" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child commit" -msgstr "" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "" - -#. "" -msgid "clone [verb]" -msgstr "" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "" - -#. "a message that gets attached with any commit" -msgid "commit message" -msgstr "" - -#. "The person who committed a commit (to the current branch), which might be different than the author." -msgid "committer" -msgstr "" - -#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -msgid "descendant" -msgstr "" - -#. "checkout of a revision rather than some head" -msgid "detached HEAD" -msgstr "" - -#. "checkout of a revision rather than some head" -msgid "detached checkout" -msgstr "" - -#. "" -msgid "diff [noun]" -msgstr "" - -#. "" -msgid "diff [verb]" -msgstr "" - -#. "" -msgid "directory" -msgstr "" - -#. "A fast-forward merge 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" -msgstr "" - -#. "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 "" - -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "" - -#. "" -msgid "file" -msgstr "" - -#. "the last revision in a branch" -msgid "head" -msgstr "" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "" - -#. "the first checkout during a clone operation" -msgid "initial checkout" -msgstr "" - -#. "The very first commit in a repository" -msgid "initial commit" -msgstr "" - -#. "a branch that resides in the local git repository" -msgid "local branch" -msgstr "" - -#. "a Git object that is not part of any pack" -msgid "loose object" -msgstr "" - -#. "a branch called by convention 'master' that exists in a newly created git repository" -msgid "master branch" -msgstr "" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "" - -#. "" -msgid "message" -msgstr "" - -#. "a remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "" - -#. "" -msgid "orphan commit" -msgstr "" - -#. "" -msgid "orphan reference" -msgstr "" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -msgstr "" - -#. "the process of creating a pack file" -msgid "pack [verb]" -msgstr "" - -#. "a Git object part of some pack" -msgid "packed object" -msgstr "" - -#. "a commit that directly precedes the current one in git's graph of commits" -msgid "parent commit" -msgstr "" - -msgid "patch" "" -msgstr "" - -#. "The path to a file" -msgid "path" -msgstr "" - -#. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "" - -#. "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 "" - -#. "The process of rebasing one set of commits on top of another branch's head" -msgid "rebase [noun]" -msgstr "" - -#. "Re-apply one set of commits on top of another branch's head. Contrary to merge." -msgid "rebase [verb]" -msgstr "" - -#. "" -msgid "redo" -msgstr "" - -#. "" -msgid "reference" -msgstr "" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -msgstr "" - -msgid "refmap" "" -msgstr "" - -#. "" -msgid "refspec" -msgstr "" - -#. "The adjective for anything which is outside of the current (local) repository" -msgid "remote [adj]" -msgstr "" - -#. "A branch in any other ('remote') repository" -msgid "remote branch" -msgstr "" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote repository" -msgstr "" - -#. "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 "" - -#. "" -msgid "reset" -msgstr "" - -#. "decide which changes from alternative versions of a file should persist in Git" -msgid "resolve (a conflict)" -msgstr "" - -#. "abandon changes and go to pristine version" -msgid "revert changes" -msgstr "" - -#. "" -msgid "revert" -msgstr "" - -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "" - -#. "" -msgid "sign off" -msgstr "" - -#. "see: staging area. In some areas of git this is called 'index'." -msgid "stage [noun], index" -msgstr "" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage [verb]" -msgstr "" - -#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." -msgid "staging area" -msgstr "" - -#. "The place (stack) where changes can be temporarily saved without committing" -msgid "stash [noun]" -msgstr "" - -#. "temporarily save changes in a stack without committing" -msgid "stash [verb]" -msgstr "" - -#. "" -msgid "status" -msgstr "" - -#. "" -msgid "submodule" -msgstr "" - -#. "A ref pointing to some commit object. In other words: A label on a specific commit." -msgid "tag [noun]" -msgstr "" - -#. "The process of creating a tag at a specific commit object" -msgid "tag [verb]" -msgstr "" - -#. "The person who created a tag" -msgid "tagger" -msgstr "" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "" - -#. "" -msgid "trailer" -msgstr "" - -#. "1. tree object, 2. directory tree" -msgid "tree" -msgstr "" - -#. "" -msgid "undo" -msgstr "" - -#. "Remove content of files from the staging area again so that it will not be part of the next commit" -msgid "unstage" -msgstr "" - -#. "Retrieving the temporarily saved changes back again from the stash" -msgid "unstash [verb]" -msgstr "" - -#. "" -msgid "update" -msgstr "" - -#. "" -msgid "upstream branch" -msgstr "" - -#. "" -msgid "verify" -msgstr "" - -#. "The tree of actual checked out files." -msgid "working directory, working copy, working tree" -msgstr "" - diff --git a/third_party/git/git-gui/po/glossary/git-gui-glossary.txt b/third_party/git/git-gui/po/glossary/git-gui-glossary.txt deleted file mode 100644 index 48b9f10e57d3..000000000000 --- a/third_party/git/git-gui/po/glossary/git-gui-glossary.txt +++ /dev/null @@ -1,96 +0,0 @@ -"English Term (Dear translator: This file will never be visible to the user!)" "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.)" -"abort" "prematurely stop and abandon an operation" -"amend" "" -"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -"annotate" "" -"author" "The person who initially created (authored) a commit" -"bare repository" "a repository with only .git directory, without working directory" -"base" "a parent version of the current file" -"bisect" "" -"blame" "get the authors responsible for each line in a file" -"blob" "" -"branch [noun]" "A 'branch' is an active line of development." -"branch [verb]" "" -"checkout [noun]" "" -"checkout [verb]" "The action of updating the working tree to a revision which was stored in the object database." -"cherry-pick" "to select and apply a single commit to the current HEAD without merging" -"child commit" "a commit that directly succeeds the current one in git's graph of commits" -"cleanup" "clean the state of the git repository, often after manually stopped operation" -"clone [verb]" "" -"commit [noun]" "A single point in the git history." -"commit [verb]" "The action of storing a new snapshot of the project's state in the git history." -"commit message" "a message that gets attached with any commit" -"committer" "The person who committed a commit (to the current branch), which might be different than the author." -"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -"detached HEAD" "checkout of a revision rather than some head" -"detached checkout" "checkout of a revision rather than some head" -"diff [noun]" "" -"diff [verb]" "" -"directory" "" -"fast-forward" "A fast-forward merge 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." -"fetch" "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." -"file level merging" "any merge strategy that works on a file by file basis" -"file" "" -"head" "the last revision in a branch" -"hook" "script that gets executed automatically on some event" -"hunk" "One context of consecutive lines in a whole patch, which consists of many such hunks" -"index (in git-gui: staging area)" "A collection of files. The index is a stored version of your working tree." -"initial checkout" "the first checkout during a clone operation" -"initial commit" "The very first commit in a repository" -"local branch" "a branch that resides in the local git repository" -"loose object" "a Git object that is not part of any pack" -"master branch" "a branch called by convention 'master' that exists in a newly created git repository" -"merge [noun]" "A successful merge results in the creation of a new commit representing the result of the merge." -"merge [verb]" "To bring the contents of another branch into the current branch." -"message" "" -"origin" "a remote called by convention 'origin' that the current git repository has been cloned from" -"orphan commit" "" -"orphan reference" "" -"pack [noun]" "a file containing many git objects packed together" -"pack [verb]" "the process of creating a pack file" -"packed object" "a Git object part of some pack" -"parent commit" "a commit that directly precedes the current one in git's graph of commits" -"patch" "" -"path" "The path to a file" -"prune" "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -"pull" "Pulling a branch means to fetch it and merge it." -"push" "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?)" -"rebase [noun]" "The process of rebasing one set of commits on top of another branch's head" -"rebase [verb]" "Re-apply one set of commits on top of another branch's head. Contrary to merge." -"redo" "" -"reference" "" -"reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -"refmap" "" -"refspec" "" -"remote [adj]" "The adjective for anything which is outside of the current (local) repository" -"remote branch" "A branch in any other ('remote') repository" -"remote repository" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -"repository" "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?)" -"reset" "" -"resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git" -"revert changes" "abandon changes and go to pristine version" -"revert" "" -"revision expression" "expression that signifies a revision in git" -"revision" "A particular state of files and directories which was stored in the object database." -"sign off" "" -"stage [noun], index" "see: staging area. In some areas of git this is called 'index'." -"stage [verb]" "add some content of files and directories to the staging area in preparation for a commit" -"staging area" "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." -"stash [noun]" "The place (stack) where changes can be temporarily saved without committing" -"stash [verb]" "temporarily save changes in a stack without committing" -"status" "" -"submodule" "" -"tag [noun]" "A ref pointing to some commit object. In other words: A label on a specific commit." -"tag [verb]" "The process of creating a tag at a specific commit object" -"tagger" "The person who created a tag" -"tracked/untracked" "file whose content is tracked/not tracked by git" -"tracking branch" "A regular git branch that is used to follow changes from another repository." -"trailer" "" -"tree" "1. tree object, 2. directory tree" -"undo" "" -"unstage" "Remove content of files from the staging area again so that it will not be part of the next commit" -"unstash [verb]" "Retrieving the temporarily saved changes back again from the stash" -"update" "" -"upstream branch" "" -"verify" "" -"working directory, working copy, working tree" "The tree of actual checked out files." diff --git a/third_party/git/git-gui/po/glossary/it.po b/third_party/git/git-gui/po/glossary/it.po deleted file mode 100644 index bb46b48d6b84..000000000000 --- a/third_party/git/git-gui/po/glossary/it.po +++ /dev/null @@ -1,184 +0,0 @@ -# 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 <stimming@tuhh.de>, 2007 -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\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 <barra_cuda@katamail.com>\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)?" - -#. "" -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 <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -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}?" - -#. "" -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 --git a/third_party/git/git-gui/po/glossary/pt_br.po b/third_party/git/git-gui/po/glossary/pt_br.po deleted file mode 100644 index eb039b2b4952..000000000000 --- a/third_party/git/git-gui/po/glossary/pt_br.po +++ /dev/null @@ -1,169 +0,0 @@ -# Translation of git-gui to Brazilian Portuguese -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git-gui package. -# -# Alexandre Erwin Ittner <alexandre@ittner.com.br>, 2010. -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-09-18 11:09-0300\n" -"Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n" -"Language-Team: Brazilian Portuguese <>\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 "" - -#. "" -msgid "amend" -msgstr "corrigir" - -#. "" -msgid "annotate" -msgstr "anotar" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "ramo" - -#. "" -msgid "branch [verb]" -msgstr "ramificar" - -#. "" -msgid "checkout [noun]" -msgstr "checkout" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "efetuar checkout" - -#. "" -msgid "clone [verb]" -msgstr "clonar" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "revisão" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "salvar revisão" - -#. "" -msgid "diff [noun]" -msgstr "diff" - -#. "" -msgid "diff [verb]" -msgstr "comparar" - -#. "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 "mesclagem rápida" - -#. "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 "receber" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "trecho" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "índice" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "mesclagem" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "mesclar" - -#. "" -msgid "message" -msgstr "descrição da revisão" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "limpar" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "receber e mesclar" - -#. "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 "enviar" - -#. "" -msgid "redo" -msgstr "refazer" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote" -msgstr "repositório 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 "repositório" - -#. "" -msgid "reset" -msgstr "descartar, redefinir" - -#. "" -msgid "revert" -msgstr "reverter" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "revisão" - -#. "" -msgid "sign off" -msgstr "assinar embaixo" - -#. "" -msgid "staging area" -msgstr "???" - -#. "" -msgid "status" -msgstr "status" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "etiqueta" - -#. "" -msgid "tag [verb]" -msgstr "marcar etiqueta" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "ramo de rastreamento" - -#. "" -msgid "undo" -msgstr "desfazer" - -#. "" -msgid "update" -msgstr "atualizar" - -#. "" -msgid "verify" -msgstr "verificar" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "cópia de trabalho, árvore de trabalho" diff --git a/third_party/git/git-gui/po/glossary/pt_pt.po b/third_party/git/git-gui/po/glossary/pt_pt.po deleted file mode 100644 index adc3b542a610..000000000000 --- a/third_party/git/git-gui/po/glossary/pt_pt.po +++ /dev/null @@ -1,293 +0,0 @@ -# Portuguese translations for git-gui glossary. -# Copyright (C) 2016 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Vasco Almeida <vascomalmeida@sapo.pt>, 2016. -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2016-05-06 10:22+0000\n" -"PO-Revision-Date: 2016-05-06 12:32+0000\n" -"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" -"Language-Team: Portuguese\n" -"Language: pt\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" -"X-Generator: Virtaal 0.7.1\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 "" -"Outro SCM em português:\n" -"http://svn.code.sf.net/p/tortoisesvn/code/trunk/Languages/pt/TortoiseUI.po e " -"\n" -"http://svn.code.sf.net/p/tortoisesvn/code/trunk/Languages/pt/TortoiseDoc.po\n" -" em html: https://tortoisesvn.net/docs/release/TortoiseSVN_pt/index.html\n" -"\n" -"https://translations.launchpad.net/tortoisehg (medíocre)" - -#. "" -msgid "amend" -msgstr "emendar" - -#. "" -msgid "annotate" -msgstr "anotar" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "ramo" - -#. "" -msgid "branch [verb]" -msgstr "criar ramo" - -#. "" -msgid "checkout [noun]" -msgstr "extração" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "extrair" - -#. "" -msgid "clone [verb]" -msgstr "clonar" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "commit" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "submeter" - -#. "" -msgid "diff [noun]" -msgstr "diferenças" - -#. "" -msgid "diff [verb]" -msgstr "mostrar diferenças" - -#. "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 "integração por avanço rápido" - -#. "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 "obter" - -#. "One context of consecutive lines in a whole patch, which consists of many such hunks" -msgid "hunk" -msgstr "excerto" - -#. "A collection of files. The index is a stored version of your working tree." -msgid "index (in git-gui: staging area)" -msgstr "índice" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "integração" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "integrar" - -#. "" -msgid "message" -msgstr "mensagem" - -#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." -msgid "prune" -msgstr "podar" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "puxar" - -#. "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 "publicar" - -#. "" -msgid "redo" -msgstr "refazer" - -#. "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 "repositório" - -#. "" -msgid "reset" -msgstr "repor" - -#. "" -msgid "revert" -msgstr "reverter" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "revisão" - -#. "" -msgid "sign off" -msgstr "assinar por baixo" - -#. "" -msgid "staging area" -msgstr "área de estágio" - -#. "" -msgid "status" -msgstr "estado" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "tag" - -#. "" -msgid "tag [verb]" -msgstr "criar tag" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "ramo de monitorização" - -#. "" -msgid "undo" -msgstr "desfazer" - -#. "" -msgid "update" -msgstr "atualizar" - -#. "" -msgid "verify" -msgstr "verificar" - -#. "The tree of actual checked out files." -msgid "working copy, working tree" -msgstr "cópia de trabalho, árvore de trabalho" - -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "antecessor" - -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "abortar" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "repositório nu" - -#. "a parent version of the current file" -msgid "base" -msgstr "base" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "culpar" - -#. "to select and apply a single commit without merging" -msgid "cherry-pick" -msgstr "efetuar cherry-pick (escolher-a-dedo?, selecionar?)" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child" -msgstr "filho" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "limpar" - -#. "a message that gets attached with any commit" -msgid "commit message" -msgstr "mensagem de commit" - -#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -msgid "descendant" -msgstr "descendente" - -#. "checkout of a revision rather than a some head" -msgid "detached checkout" -msgstr "extração destacada" - -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "integração ao nível de ficheiros" - -#. "the last revision in a branch" -msgid "head" -msgstr "cabeça" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "gancho" - -#. "the first checkout during a clone operation" -msgid "initial checkout" -msgstr "extração inicial" - -#. "a branch that resides in the local git repository" -msgid "local branch" -msgstr "ramo local" - -#. "a Git object that is not part of any pack" -msgid "loose object" -msgstr "objeto solto" - -#. "a branch called by convention 'master' that exists in a newly created git repository" -msgid "master branch" -msgstr "ramo mestre" - -#. "a remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "origem" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -msgstr "pacote" - -#. "a Git object part of some pack" -msgid "packed object" -msgstr "objeto compactado" - -#. "a commit that directly precedes the current one in git's graph of commits" -msgid "parent" -msgstr "pai" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -msgstr "reflog" - -#. "decide which changes from alternative versions of a file should persist in Git" -msgid "resolve (a conflict)" -msgstr "resolver (um conflito)" - -#. "abandon changes and go to pristine version" -msgid "revert changes" -msgstr "reverter alterações" - -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "expressão de revisão" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage/unstage" -msgstr "preparar/retirar" - -#. "temporarily save changes in a stack without committing" -msgid "stash" -msgstr "empilhar" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "controlado/não controlado" diff --git a/third_party/git/git-gui/po/glossary/txt-to-pot.sh b/third_party/git/git-gui/po/glossary/txt-to-pot.sh deleted file mode 100755 index 8249915d3c6c..000000000000 --- a/third_party/git/git-gui/po/glossary/txt-to-pot.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# This is a very, _very_, simple script to convert a tab-separated -# .txt file into a .pot/.po. -# Its not clever but it took me 2 minutes to write :) -# Michael Twomey <michael.twomey@ireland.sun.com> -# 23 March 2001 -# with slight GnuCash modifications by Christian Stimming <stimming@tuhh.de> -# 19 Aug 2001, 23 Jul 2007 - -#check args -if [ $# -eq 0 ] -then - cat <<! -Usage: $(basename $0) git-gui-glossary.txt > git-gui-glossary.pot -! - exit 1; -fi - -GLOSSARY_CSV="$1"; - -if [ ! -f "$GLOSSARY_CSV" ] -then - echo "Can't find $GLOSSARY_CSV."; - exit 1; -fi - -cat <<! -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: $(date +'%Y-%m-%d %H:%M%z')\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" - -! - -#Yes this is the most simple awk script you've ever seen :) -awk -F'\t' '{if ($2 != "") print "#. "$2; print "msgid "$1; print "msgstr \"\"\n"}' \ -$GLOSSARY_CSV diff --git a/third_party/git/git-gui/po/glossary/zh_cn.po b/third_party/git/git-gui/po/glossary/zh_cn.po deleted file mode 100644 index 158835b5c1c9..000000000000 --- a/third_party/git/git-gui/po/glossary/zh_cn.po +++ /dev/null @@ -1,170 +0,0 @@ -# Translation of git-gui glossary to Simplified Chinese -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Xudong Guan <xudong.guan@gmail.com> and the zh-kernel.org mailing list, 2007 -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui glossary\n" -"PO-Revision-Date: 2007-07-23 22:07+0200\n" -"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n" -"Language-Team: Simplified Chinese \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 "注：这个文件是为了帮助翻译人员统一名词术语。最终用户不会关心这个文件。" - -#. "" -#. amend指用户修改最近一次commit的操作，修订？修改？修正？ -#. [WANG Cong]: 根据我的了解，这个词似乎翻译成“修订”多一些。“修正”也可以，“修改”再次之。 -#. [ZHANG Le]: 修订，感觉一般指对一些大型出版物的大规模升级，比如修订新华字典 -# 修正，其实每次amend的结果也不一定就是最后结果，说不定还需要修改。所以不 -# 如就叫修改 -msgid "amend" -msgstr "修订" - -#. "" -#. git annotate 文件名：用来标注文件的每一行在什么时候被谁最后修改。 -#. [WANG Cong]: "标记"一般是mark。;) -#. [ZHANG Le]: 标注，或者干脆用原意：注解，或注释 -msgid "annotate" -msgstr "标注" - -#. "A 'branch' is an active line of development." -msgid "branch [noun]" -msgstr "分支" - -#. "" -msgid "branch [verb]" -msgstr "建立分支" - -#. "" -#. [WANG Cong]: 网上有人翻译成“检出”，我感觉更好一些，毕竟把check的意思翻译出来了。 -#. [ZHNAG Le]: 提取吧，提取分支／版本 -#. [rae l]: 签出。subversion软件中的大多词汇已有翻译，既然git与subversion同是SCM管理，可以参考同类软件的翻译也不错。 -msgid "checkout [noun]" -msgstr "签出" - -#. "The action of updating the working tree to a revision which was stored in the object database." -msgid "checkout [verb]" -msgstr "签出" - -#. "A single point in the git history." -msgid "commit [noun]" -msgstr "提交" - -#. "The action of storing a new snapshot of the project's state in the git history." -msgid "commit [verb]" -msgstr "提交" - -#. "" -#. 差异？差别？ -#. [ZHANG Le]: 个人感觉差别更加中性一些 -msgid "diff [noun]" -msgstr "差别" - -#. "" -msgid "diff [verb]" -msgstr "比较" - -#. "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 "快进式合并" - -#. "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." -#. 获取？取得？下载？更新？注意和update的区分 -msgid "fetch" -msgstr "获取" - -#. "A collection of files. The index is a stored version of your working tree." -#. index是working tree和repository之间的缓存 -msgid "index (in git-gui: staging area)" -msgstr "工作缓存？" - -#. "A successful merge results in the creation of a new commit representing the result of the merge." -msgid "merge [noun]" -msgstr "合并" - -#. "To bring the contents of another branch into the current branch." -msgid "merge [verb]" -msgstr "合并" - -#. "" -#. message是指commit中的文字信息 -msgid "message" -msgstr "描述" - -#. "Pulling a branch means to fetch it and merge it." -msgid "pull" -msgstr "获取＋合并" - -#. "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 "推入" - -#. "" -msgid "redo" -msgstr "重做" - -#. "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 "仓库" - -#. "" -msgid "reset" -msgstr "重置" - -#. "" -msgid "revert" -msgstr "恢复" - -#. "A particular state of files and directories which was stored in the object database." -msgid "revision" -msgstr "版本" - -#. "" -msgid "sign off" -msgstr "签名" - -#. "" -#. 似乎是git-gui里面显示的本次提交的文件清单区域 -msgid "staging area" -msgstr "提交暂存区" - -#. "" -msgid "status" -msgstr "状态" - -#. "A ref pointing to a tag or commit object" -msgid "tag [noun]" -msgstr "标签" - -#. "" -msgid "tag [verb]" -msgstr "添加标签" - -#. "A regular git branch that is used to follow changes from another repository." -msgid "tracking branch" -msgstr "跟踪分支" - -#. "" -msgid "undo" -msgstr "撤销" - -#. "" -msgid "update" -msgstr "更新。注意和fetch的区分" - -#. "" -msgid "verify" -msgstr "验证" - -#. "The tree of actual checked out files." -#. "工作副本？工作区域？工作目录" -#. [LI Yang]: 当前副本， 当前源码树？ -msgid "working copy, working tree" -msgstr "工作副本，工作源码树" diff --git a/third_party/git/git-gui/po/hu.po b/third_party/git/git-gui/po/hu.po deleted file mode 100644 index d106dadac89b..000000000000 --- a/third_party/git/git-gui/po/hu.po +++ /dev/null @@ -1,2602 +0,0 @@ -# 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 <vmiklos@frugalware.org>, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui-i 18n\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-08 08:31-0800\n" -"PO-Revision-Date: 2008-12-10 15:00+0100\n" -"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\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:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 -#: git-gui.sh:866 -msgid "git-gui: fatal error" -msgstr "git-gui: végzetes hiba" - -#: git-gui.sh:689 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Érvénytelen font lett megadva itt: %s:" - -#: git-gui.sh:723 -msgid "Main Font" -msgstr "Fő betűtípus" - -#: git-gui.sh:724 -msgid "Diff/Console Font" -msgstr "Diff/konzol betűtípus" - -#: git-gui.sh:738 -msgid "Cannot find git in PATH." -msgstr "A git nem található a PATH-ban." - -#: git-gui.sh:765 -msgid "Cannot parse Git version string:" -msgstr "Nem értelmezhető a Git verzió sztring:" - -#: git-gui.sh:783 -#, 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:1062 -msgid "Git directory not found:" -msgstr "A Git könyvtár nem található:" - -#: git-gui.sh:1069 -msgid "Cannot move to top of working directory:" -msgstr "Nem lehet a munkakönyvtár tetejére lépni:" - -#: git-gui.sh:1076 -msgid "Cannot use funny .git directory:" -msgstr "Nem használható vicces .git könyvtár:" - -#: git-gui.sh:1081 -msgid "No working directory" -msgstr "Nincs munkakönyvtár" - -#: git-gui.sh:1247 lib/checkout_op.tcl:305 -msgid "Refreshing file status..." -msgstr "A fájlok státuszának frissítése..." - -#: git-gui.sh:1303 -msgid "Scanning for modified files ..." -msgstr "Módosított fájlok keresése ..." - -#: git-gui.sh:1367 -msgid "Calling prepare-commit-msg hook..." -msgstr "A prepare-commit-msg hurok meghívása..." - -#: git-gui.sh:1384 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "A commitot megakadályozta a prepare-commit-msg hurok." - -#: git-gui.sh:1542 lib/browser.tcl:246 -msgid "Ready." -msgstr "Kész." - -#: git-gui.sh:1819 -msgid "Unmodified" -msgstr "Nem módosított" - -#: git-gui.sh:1821 -msgid "Modified, not staged" -msgstr "Módosított, de nem kiválasztott" - -#: git-gui.sh:1822 git-gui.sh:1830 -msgid "Staged for commit" -msgstr "Kiválasztva commitolásra" - -#: git-gui.sh:1823 git-gui.sh:1831 -msgid "Portions staged for commit" -msgstr "Részek kiválasztva commitolásra" - -#: git-gui.sh:1824 git-gui.sh:1832 -msgid "Staged for commit, missing" -msgstr "Kiválasztva commitolásra, hiányzó" - -#: git-gui.sh:1826 -msgid "File type changed, not staged" -msgstr "Fájl típus megváltozott, nem kiválasztott" - -#: git-gui.sh:1827 -msgid "File type changed, staged" -msgstr "A fájltípus megváltozott, kiválasztott" - -#: git-gui.sh:1829 -msgid "Untracked, not staged" -msgstr "Nem követett, nem kiválasztott" - -#: git-gui.sh:1834 -msgid "Missing" -msgstr "Hiányzó" - -#: git-gui.sh:1835 -msgid "Staged for removal" -msgstr "Kiválasztva eltávolításra" - -#: git-gui.sh:1836 -msgid "Staged for removal, still present" -msgstr "Kiválasztva eltávolításra, jelenleg is elérhető" - -#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 -#: git-gui.sh:1842 git-gui.sh:1843 -msgid "Requires merge resolution" -msgstr "Merge feloldás szükséges" - -#: git-gui.sh:1878 -msgid "Starting gitk... please wait..." -msgstr "A gitk indítása... várjunk..." - -#: git-gui.sh:1887 -msgid "Couldn't find gitk in PATH" -msgstr "A gitk nem található a PATH-ban." - -#: git-gui.sh:2280 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Repó" - -#: git-gui.sh:2281 -msgid "Edit" -msgstr "Szerkesztés" - -#: git-gui.sh:2283 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Branch" - -#: git-gui.sh:2286 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Commit@@főnév" - -#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Merge" - -#: git-gui.sh:2290 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Távoli" - -#: git-gui.sh:2293 -msgid "Tools" -msgstr "Eszközök" - -#: git-gui.sh:2302 -msgid "Explore Working Copy" -msgstr "Munkamásolat felfedezése" - -#: git-gui.sh:2307 -msgid "Browse Current Branch's Files" -msgstr "A jelenlegi branch fájljainak böngészése" - -#: git-gui.sh:2311 -msgid "Browse Branch Files..." -msgstr "A branch fájljainak böngészése..." - -#: git-gui.sh:2316 -msgid "Visualize Current Branch's History" -msgstr "A jelenlegi branch történetének vizualizálása" - -#: git-gui.sh:2320 -msgid "Visualize All Branch History" -msgstr "Az összes branch történetének vizualizálása" - -#: git-gui.sh:2327 -#, tcl-format -msgid "Browse %s's Files" -msgstr "A(z) %s branch fájljainak böngészése" - -#: git-gui.sh:2329 -#, tcl-format -msgid "Visualize %s's History" -msgstr "A(z) %s branch történetének vizualizálása" - -#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Adatbázis statisztikák" - -#: git-gui.sh:2337 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Adatbázis tömörítése" - -#: git-gui.sh:2340 -msgid "Verify Database" -msgstr "Adatbázis ellenőrzése" - -#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 -msgid "Create Desktop Icon" -msgstr "Asztal ikon létrehozása" - -#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Kilépés" - -#: git-gui.sh:2371 -msgid "Undo" -msgstr "Visszavonás" - -#: git-gui.sh:2374 -msgid "Redo" -msgstr "Mégis" - -#: git-gui.sh:2378 git-gui.sh:2937 -msgid "Cut" -msgstr "Kivágás" - -#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Másolás" - -#: git-gui.sh:2384 git-gui.sh:2943 -msgid "Paste" -msgstr "Beillesztés" - -#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Törlés" - -#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71 -msgid "Select All" -msgstr "Mindent kiválaszt" - -#: git-gui.sh:2400 -msgid "Create..." -msgstr "Létrehozás..." - -#: git-gui.sh:2406 -msgid "Checkout..." -msgstr "Checkout..." - -#: git-gui.sh:2412 -msgid "Rename..." -msgstr "Átnevezés..." - -#: git-gui.sh:2417 -msgid "Delete..." -msgstr "Törlés..." - -#: git-gui.sh:2422 -msgid "Reset..." -msgstr "Visszaállítás..." - -#: git-gui.sh:2432 -msgid "Done" -msgstr "Kész" - -#: git-gui.sh:2434 -msgid "Commit@@verb" -msgstr "Commit@@ige" - -#: git-gui.sh:2443 git-gui.sh:2878 -msgid "New Commit" -msgstr "Új commit" - -#: git-gui.sh:2451 git-gui.sh:2885 -msgid "Amend Last Commit" -msgstr "Utolsó commit javítása" - -#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Keresés újra" - -#: git-gui.sh:2467 -msgid "Stage To Commit" -msgstr "Kiválasztás commitolásra" - -#: git-gui.sh:2473 -msgid "Stage Changed Files To Commit" -msgstr "Módosított fájlok kiválasztása commitolásra" - -#: git-gui.sh:2479 -msgid "Unstage From Commit" -msgstr "Commitba való kiválasztás visszavonása" - -#: git-gui.sh:2484 lib/index.tcl:410 -msgid "Revert Changes" -msgstr "Változtatások visszaállítása" - -#: git-gui.sh:2491 git-gui.sh:3083 -msgid "Show Less Context" -msgstr "Kevesebb környezet mutatása" - -#: git-gui.sh:2495 git-gui.sh:3087 -msgid "Show More Context" -msgstr "Több környezet mutatása" - -#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961 -msgid "Sign Off" -msgstr "Aláír" - -#: git-gui.sh:2518 -msgid "Local Merge..." -msgstr "Helyi merge..." - -#: git-gui.sh:2523 -msgid "Abort Merge..." -msgstr "Merge megszakítása..." - -#: git-gui.sh:2535 git-gui.sh:2575 -msgid "Add..." -msgstr "Hozzáadás..." - -#: git-gui.sh:2539 -msgid "Push..." -msgstr "Push..." - -#: git-gui.sh:2543 -msgid "Delete Branch..." -msgstr "Branch törlése..." - -#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Névjegy: %s" - -#: git-gui.sh:2557 -msgid "Preferences..." -msgstr "Beállítások..." - -#: git-gui.sh:2565 git-gui.sh:3129 -msgid "Options..." -msgstr "Opciók..." - -#: git-gui.sh:2576 -msgid "Remove..." -msgstr "Eltávolítás..." - -#: git-gui.sh:2585 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Segítség" - -#: git-gui.sh:2611 -msgid "Online Documentation" -msgstr "Online dokumentáció" - -#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "SSH kulcs mutatása" - -#: git-gui.sh:2721 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"végzetes hiba: nem érhető el a(z) %s útvonal: Nincs ilyen fájl vagy könyvtár" - -#: git-gui.sh:2754 -msgid "Current Branch:" -msgstr "Jelenlegi branch:" - -#: git-gui.sh:2775 -msgid "Staged Changes (Will Commit)" -msgstr "Kiválasztott változtatások (commitolva lesz)" - -#: git-gui.sh:2795 -msgid "Unstaged Changes" -msgstr "Kiválasztatlan változtatások" - -#: git-gui.sh:2845 -msgid "Stage Changed" -msgstr "Változtatások kiválasztása" - -#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Push" - -#: git-gui.sh:2899 -msgid "Initial Commit Message:" -msgstr "Kezdeti commit üzenet:" - -#: git-gui.sh:2900 -msgid "Amended Commit Message:" -msgstr "Javító commit üzenet:" - -#: git-gui.sh:2901 -msgid "Amended Initial Commit Message:" -msgstr "Kezdeti javító commit üzenet:" - -#: git-gui.sh:2902 -msgid "Amended Merge Commit Message:" -msgstr "Javító merge commit üzenet:" - -#: git-gui.sh:2903 -msgid "Merge Commit Message:" -msgstr "Merge commit üzenet:" - -#: git-gui.sh:2904 -msgid "Commit Message:" -msgstr "Commit üzenet:" - -#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73 -msgid "Copy All" -msgstr "Összes másolása" - -#: git-gui.sh:2977 lib/blame.tcl:104 -msgid "File:" -msgstr "Fájl:" - -#: git-gui.sh:3092 -msgid "Refresh" -msgstr "Frissítés" - -#: git-gui.sh:3113 -msgid "Decrease Font Size" -msgstr "Font méret csökkentése" - -#: git-gui.sh:3117 -msgid "Increase Font Size" -msgstr "Fönt méret növelése" - -#: git-gui.sh:3125 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Kódolás" - -#: git-gui.sh:3136 -msgid "Apply/Reverse Hunk" -msgstr "Hunk alkalmazása/visszaállítása" - -#: git-gui.sh:3141 -msgid "Apply/Reverse Line" -msgstr "Sor alkalmazása/visszaállítása" - -#: git-gui.sh:3151 -msgid "Run Merge Tool" -msgstr "Merge eszköz futtatása" - -#: git-gui.sh:3156 -msgid "Use Remote Version" -msgstr "Távoli verzió használata" - -#: git-gui.sh:3160 -msgid "Use Local Version" -msgstr "Helyi verzió használata" - -#: git-gui.sh:3164 -msgid "Revert To Base" -msgstr "Visszaállítás az alaphoz" - -#: git-gui.sh:3183 -msgid "Unstage Hunk From Commit" -msgstr "Hunk törlése commitból" - -#: git-gui.sh:3184 -msgid "Unstage Line From Commit" -msgstr "A sor kiválasztásának törlése" - -#: git-gui.sh:3186 -msgid "Stage Hunk For Commit" -msgstr "Hunk kiválasztása commitba" - -#: git-gui.sh:3187 -msgid "Stage Line For Commit" -msgstr "Sor kiválasztása commitba" - -#: git-gui.sh:3210 -msgid "Initializing..." -msgstr "Inicializálás..." - -#: git-gui.sh:3315 -#, 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:3345 -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:3350 -#, 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:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - egy grafikus felület a Githez." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Fájl néző" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Commit:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Commit másolása" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Szöveg keresése..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Teljes másolat-érzékelés bekapcsolása" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Történeti környezet mutatása" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Szülő commit vizsgálata" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "A(z) %s olvasása..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "A másolást/átnevezést követő annotációk betöltése..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "sor annotálva" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Az eredeti hely annotációk betöltése..." - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Az annotáció kész." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Elfoglalt" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Az annotációs folyamat már fut." - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Futtatás másolás-érzékelésen keresztül..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Az annotáció betöltése..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Szerző:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Commiter:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Eredeti fájl:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Nem található a HEAD commit:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Nem található a szülő commit:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Nem lehet megjeleníteni a szülőt" - -#: lib/blame.tcl:1091 lib/diff.tcl:297 -msgid "Error loading diff:" -msgstr "Hiba a diff betöltése közben:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "Eredeti szerző:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "Ebben a fájlban:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -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:282 -#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Mégsem" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Revízió" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -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:377 -msgid "Create" -msgstr "Létrehozás" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Branch neve" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -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:536 -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: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:201 -#, 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:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "A(z) %s betöltése..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Fel a szülőhöz]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "A branch fájljainak böngészése" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:394 -#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 -#: lib/choose_repository.tcl:995 -msgid "Browse" -msgstr "Böngészés" - -#: lib/checkout_op.tcl:84 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "A(z) %s letöltése innen: %s" - -#: lib/checkout_op.tcl:132 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "végzetes: Nem lehet feloldani a következőt: %s" - -#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Bezárás" - -#: lib/checkout_op.tcl:174 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "A(z) '%s' branch nem létezik." - -#: lib/checkout_op.tcl:193 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "" -"Nem sikerült beállítani az egyszerűsített git-pull-t a(z) '%s' számára." - -#: lib/checkout_op.tcl:228 -#, 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:242 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "A(z) '%s' merge strategy nem támogatott." - -#: lib/checkout_op.tcl:261 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Nem sikerült frissíteni a következőt: '%s'." - -#: lib/checkout_op.tcl:273 -msgid "Staging area (index) is already locked." -msgstr "A kiválasztási terület (index) már zárolva van." - -#: lib/checkout_op.tcl:288 -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:344 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "A munkkönyvtár frissiítése a következőre: '%s'..." - -#: lib/checkout_op.tcl:345 -msgid "files checked out" -msgstr "fájl frissítve" - -#: lib/checkout_op.tcl:375 -#, 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:376 -msgid "File level merge required." -msgstr "Fájlszintű merge-ölés szükséges." - -#: lib/checkout_op.tcl:380 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Jelenleg a(z) '%s' branchen." - -#: lib/checkout_op.tcl:451 -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:468 lib/checkout_op.tcl:472 -#, tcl-format -msgid "Checked out '%s'." -msgstr "'%s' kifejtve." - -#: lib/checkout_op.tcl:500 -#, 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:522 -msgid "Recovering lost commits may not be easy." -msgstr "Az elveszett commitok helyreállítása nem biztos, hogy egyszerű." - -#: lib/checkout_op.tcl:527 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Visszaállítjuk a következőt: '%s'?" - -#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Vizualizálás" - -#: lib/checkout_op.tcl:600 -#, 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 -msgid "Select" -msgstr "Kiválaszt" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Font család" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Font méret" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Font példa" - -#: lib/choose_font.tcl:103 -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:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 -msgid "Create New Repository" -msgstr "Új repó létrehozása" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Új..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 -msgid "Clone Existing Repository" -msgstr "Létező repó másolása" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Másolás..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 -msgid "Open Existing Repository" -msgstr "Létező könyvtár megnyitása" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Meggyitás..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Legutóbbi repók" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Legutóbbi repók megnyitása:" - -#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 -#: lib/choose_repository.tcl:316 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Nem sikerült letrehozni a(z) %s repót:" - -#: lib/choose_repository.tcl:387 -msgid "Directory:" -msgstr "Könyvtár:" - -#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 -#: lib/choose_repository.tcl:1017 -msgid "Git Repository" -msgstr "Git repó" - -#: lib/choose_repository.tcl:442 -#, tcl-format -msgid "Directory %s already exists." -msgstr "A(z) '%s' könyvtár már létezik." - -#: lib/choose_repository.tcl:446 -#, tcl-format -msgid "File %s already exists." -msgstr "A(z) '%s' fájl már létezik." - -#: lib/choose_repository.tcl:460 -msgid "Clone" -msgstr "Bezárás" - -#: lib/choose_repository.tcl:473 -msgid "Source Location:" -msgstr "Forrás helye:" - -#: lib/choose_repository.tcl:484 -msgid "Target Directory:" -msgstr "Cél könyvtár:" - -#: lib/choose_repository.tcl:496 -msgid "Clone Type:" -msgstr "Másolás típusa:" - -#: lib/choose_repository.tcl:502 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Általános (Gyors, félig-redundáns, hardlinkek)" - -#: lib/choose_repository.tcl:508 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Teljes másolás (Lassabb, redundáns biztonsági mentés)" - -#: lib/choose_repository.tcl:514 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Megosztott (Leggyorsabb, nem ajánlott, nincs mentés)" - -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 -#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 -#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Nem Git repó: %s" - -#: lib/choose_repository.tcl:586 -msgid "Standard only available for local repository." -msgstr "A standard csak helyi repókra érhető el." - -#: lib/choose_repository.tcl:590 -msgid "Shared only available for local repository." -msgstr "A megosztott csak helyi repókra érhető el." - -#: lib/choose_repository.tcl:611 -#, tcl-format -msgid "Location %s already exists." -msgstr "A(z) '%s' hely már létezik." - -#: lib/choose_repository.tcl:622 -msgid "Failed to configure origin" -msgstr "Nem sikerült beállítani az origint" - -#: lib/choose_repository.tcl:634 -msgid "Counting objects" -msgstr "Objektumok számolása" - -#: lib/choose_repository.tcl:635 -msgid "buckets" -msgstr "vödrök" - -#: lib/choose_repository.tcl:659 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Nem sikerült másolni az objects/info/alternates-t: %s" - -#: lib/choose_repository.tcl:695 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Semmi másolni való nincs innen: %s" - -#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 -#: lib/choose_repository.tcl:923 -msgid "The 'master' branch has not been initialized." -msgstr "A 'master' branch nincs inicializálva." - -#: lib/choose_repository.tcl:710 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Nem érhetőek el hardlinkek. Másolás használata." - -#: lib/choose_repository.tcl:722 -#, tcl-format -msgid "Cloning from %s" -msgstr "Másolás innen: %s" - -#: lib/choose_repository.tcl:753 -msgid "Copying objects" -msgstr "Objektumok másolása" - -#: lib/choose_repository.tcl:754 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:778 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Nem sikerült másolni az objektumot: %s" - -#: lib/choose_repository.tcl:788 -msgid "Linking objects" -msgstr "Objektumok összefűzése" - -#: lib/choose_repository.tcl:789 -msgid "objects" -msgstr "objektum" - -#: lib/choose_repository.tcl:797 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Nem sikerült hardlinkelni az objektumot: %s" - -#: lib/choose_repository.tcl:852 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Nem sikerült letölteni a branch-eket és az objektumokat. Bővebben a " -"konzolos kimenetben." - -#: lib/choose_repository.tcl:863 -msgid "Cannot fetch tags. See console output for details." -msgstr "Nem sikerült letölteni a tageket. Bővebben a konzolos kimenetben." - -#: lib/choose_repository.tcl:887 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Nem sikerült megállapítani a HEAD-et. Bővebben a konzolos kimenetben." - -#: lib/choose_repository.tcl:896 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Nem sikerült tiszítani: %s." - -#: lib/choose_repository.tcl:902 -msgid "Clone failed." -msgstr "A másolás nem sikerült." - -#: lib/choose_repository.tcl:909 -msgid "No default branch obtained." -msgstr "Nincs alapértelmezett branch." - -#: lib/choose_repository.tcl:920 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Nem sikerült felöldani a(z) %s objektumot commitként." - -#: lib/choose_repository.tcl:932 -msgid "Creating working directory" -msgstr "Munkakönyvtár létrehozása" - -#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 -#: lib/index.tcl:196 -msgid "files" -msgstr "fájl" - -#: lib/choose_repository.tcl:962 -msgid "Initial file checkout failed." -msgstr "A kezdeti fájl-kibontás sikertelen." - -#: lib/choose_repository.tcl:978 -msgid "Open" -msgstr "Megnyitás" - -#: lib/choose_repository.tcl:988 -msgid "Repository:" -msgstr "Repó:" - -#: lib/choose_repository.tcl:1037 -#, tcl-format -msgid "Failed to open repository %s:" -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:538 -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:531 -msgid "Updated" -msgstr "Frissítve" - -#: lib/choose_rev.tcl:559 -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 "" -"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:48 -msgid "Error loading commit data for amend:" -msgstr "Hiba a javítandó commit adat betöltése közben:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Nem sikerült megállapítani az azonosítót:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Érvénytelen GIT_COMMITTER_IDENT:" - -#: lib/commit.tcl:132 -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:155 -#, 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:163 -#, 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:171 -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:186 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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:210 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "figyelmeztetés: a Tcl nem támogatja a(z) '%s' kódolást." - -#: lib/commit.tcl:226 -msgid "Calling pre-commit hook..." -msgstr "A pre-commit hurok meghívása..." - -#: lib/commit.tcl:241 -msgid "Commit declined by pre-commit hook." -msgstr "A commitot megakadályozta a pre-commit hurok. " - -#: lib/commit.tcl:264 -msgid "Calling commit-msg hook..." -msgstr "A commit-msg hurok meghívása..." - -#: lib/commit.tcl:279 -msgid "Commit declined by commit-msg hook." -msgstr "A commiot megakadályozta a commit-msg hurok." - -#: lib/commit.tcl:292 -msgid "Committing changes..." -msgstr "A változtatások commitolása..." - -#: lib/commit.tcl:308 -msgid "write-tree failed:" -msgstr "a write-tree sikertelen:" - -#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373 -msgid "Commit failed." -msgstr "A commit nem sikerült." - -#: lib/commit.tcl:326 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "A(z) %s commit sérültnek tűnik" - -#: lib/commit.tcl:331 -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:338 -msgid "No changes to commit." -msgstr "Nincs commitolandó változtatás." - -#: lib/commit.tcl:352 -msgid "commit-tree failed:" -msgstr "a commit-tree sikertelen:" - -#: lib/commit.tcl:372 -msgid "update-ref failed:" -msgstr "az update-ref sikertelen:" - -#: lib/commit.tcl:460 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Létrejött a %s commit: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Munka folyamatban.. Várjunk..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Siker" - -#: lib/console.tcl:200 -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 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Érvénytelen dátum a Git-től: %s" - -#: lib/diff.tcl:59 -#, 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:99 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "A(z) %s diff-jének betöltése..." - -#: lib/diff.tcl:120 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"HELYI: törölve\n" -"TÁVOLI:\n" - -#: lib/diff.tcl:125 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"TÁVOLI: törölve\n" -"HELYI:\n" - -#: lib/diff.tcl:132 -msgid "LOCAL:\n" -msgstr "HELYI:\n" - -#: lib/diff.tcl:135 -msgid "REMOTE:\n" -msgstr "TÁVOLI:\n" - -#: lib/diff.tcl:197 lib/diff.tcl:296 -#, tcl-format -msgid "Unable to display %s" -msgstr "Nem lehet megjeleníteni a következőt: %s" - -#: lib/diff.tcl:198 -msgid "Error loading file:" -msgstr "Hiba a fájl betöltése közben:" - -#: lib/diff.tcl:205 -msgid "Git Repository (subproject)" -msgstr "Git repó (alprojekt)" - -#: lib/diff.tcl:217 -msgid "* Binary file (not showing content)." -msgstr "* Bináris fájl (tartalom elrejtése)." - -#: lib/diff.tcl:222 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Nem követett fájl %d bájttal.\n" -"* Csak az első %d bájt mutatása.\n" - -#: lib/diff.tcl:228 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Nem követett fájlt levágta a(z) %s.\n" -"* A teljes tartalom megjelenítéséhez használjunk külső szövegszerkesztőt.\n" - -#: lib/diff.tcl:436 -msgid "Failed to unstage selected hunk." -msgstr "Nem visszavonni a hunk kiválasztását." - -#: lib/diff.tcl:443 -msgid "Failed to stage selected hunk." -msgstr "Nem sikerült kiválasztani a hunkot." - -#: lib/diff.tcl:509 -msgid "Failed to unstage selected line." -msgstr "Nem sikerült visszavonni a sor kiválasztását." - -#: lib/diff.tcl:517 -msgid "Failed to stage selected line." -msgstr "Nem sikerült kiválasztani a sort." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Alapértelmezés" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Rendszer (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Más" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "hiba" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "figyelmeztetés" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Ki kell javítanunk a fenti hibákat commit előtt." - -#: 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:287 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "A(z) %s commitba való kiválasztásának visszavonása" - -#: lib/index.tcl:326 -msgid "Ready to commit." -msgstr "Commitolásra kész." - -#: lib/index.tcl:339 -#, tcl-format -msgid "Adding %s" -msgstr "A(z) %s hozzáadása..." - -#: lib/index.tcl:396 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Visszaállítja a változtatásokat a(z) %s fájlban?" - -#: lib/index.tcl:398 -#, 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:406 -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:409 -msgid "Do Nothing" -msgstr "Ne csináljunk semmit" - -#: lib/index.tcl:427 -msgid "Reverting selected files" -msgstr "A kiválasztott fájlok visszaállítása" - -#: lib/index.tcl:431 -#, tcl-format -msgid "Reverting %s" -msgstr "%s visszaállítása" - -#: 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:45 -#, 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:55 -#, 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:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s / %s" - -#: lib/merge.tcl:120 -#, 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:239 -msgid "files reset" -msgstr "fájl visszaállítva" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "A félbeszakítás nem sikerült." - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "A megkeszakítás befejeződött. Kész." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Feloldás erőltetése az alap verzióhoz?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Feloldás erőltetése ehhez a branch-hez?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Feloldás erőltetése a másik branch-hez?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Megjegyzés: csak az ütköző különbségek látszanak.\n" -"\n" -"A(z) %s felül lesz írva.\n" -"\n" -"Ez a művelet csak a merge újraindításával lesz visszavonható." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"A(z) %s fájl nem feloldott ütközéseket tartalmaz, mégis legyen kiválasztva?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Feloldás hozzáadása a(z) %s számára" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "Nem lehet feloldani törlési vagy link ütközést egy eszközzel" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "A konfiklus-fájl nem létezik." - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Nem GUI merge eszköz: %s" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "A(z) '%s' merge eszköz nem támogatott" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "A merge eszköz már fut, le legyen állítva?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Hiba a verziók kinyerése közben:\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"A merge eszköz indítása sikertelen:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "A merge eszköz futtatása..." - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "A merge eszköz nem sikerült." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Érvénytelen globális kódolás '%s'" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Érvénytelen repó kódolás '%s'" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Alapértelmezés visszaállítása" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Mentés" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "%s Repó" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Globális (minden repó)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Felhasználónév" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Email cím" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "A merge commitok összegzése" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Merge beszédesség" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Diffstat mutatása merge után" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Merge eszköz használata" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "A fájl módosítási dátumok megbízhatóak" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "A követő branchek eltávolítása letöltés alatt" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "A követő branchek egyeztetése" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "A blame másolás bekapcsolása csak megváltozott fájlokra" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Minimum betűszám blame másolás-érzékeléshez" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Blame történet környezet sugár (napokban)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "A diff környezeti sorok száma" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Commit üzenet szövegének szélessége" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Új branch név sablon" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Alapértelmezett fájltartalom-kódolás" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Megváltoztatás" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Helyesírás-ellenőrző szótár:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Betűtípus megváltoztatása" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "%s választása" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Beállítások" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Nem sikerült teljesen elmenteni a beállításokat:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Remote eltávolítása" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Törlés innen" - -# tcl-format -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Letöltés innen" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Push ide" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Remote hozzáadása" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Új remote hozzáadása" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Hozzáadás" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Remote részletei" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Hely:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Következő művelet" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Letöltés most" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Távoli repó inicializálása és push" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Ne csináljunk semmit" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Adjunk megy egy remote nevet." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "A(z) '%s' nem egy elfogadható remote név." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Nem sikerült a(t) '%s' remote hozzáadása innen: '%s'." - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "a(z) %s letöltése" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "A(z) %s letöltése" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Nem tudni, hogy hogy kell a(z) '%s' helyen repót inicializálni." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "%s push-olása" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "A(z) %s beállítása itt: %s" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -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:134 -msgid "Remote:" -msgstr "Távoli:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Önkényes hely:" - -#: 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 -#, 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:\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/search.tcl:21 -msgid "Find:" -msgstr "Keresés:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Következő" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Előző" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Kisbetű-nagybetű számít" - -#: 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/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Nem támogatott helyesírás-ellenőrző" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "A helyesírás-ellenőrzés nem elérhető" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Érvénytelen a helyesírás-ellenőrző beállítása" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Szótár visszaállítása a következőre: %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "A helyesírás-ellenőrő indítása sikertelen" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Ismeretlen helyesírás-ellenőrző" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Nincs javaslat" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Nem várt EOF a helyesírás-ellenőrzőtől" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "A helyesírás-ellenőrzés sikertelen" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Nincsenek kulcsok." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Nyilvános kulcs található ebben: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Kulcs generálása" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Másolás vágólapra" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Az OpenSSH publikus kulcsunk" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Generálás..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Az ssh-keygen indítása sikertelen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "A generálás nem sikerült." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "A generálás sikeres, de egy kulcs se található." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "A kulcsunk itt van: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i / %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "A(z) %s futtatása egy kiválasztott fájlt igényel." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Biztos benne, hogy futtatni kívánja: %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Eszköz: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Futtatás: %s..." - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Az eszköz sikeresen befejeződött: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Az eszköz sikertelen: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Eszköz hozzáadása" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Új eszköz-parancs hozzáadása" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Globális hozzáadás" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Eszköz részletei" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Használjunk '/' szeparátorokat almenü-fa létrehozásához:" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Parancs:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Parancsablak mutatása futtatás előtt" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "" -"Megkéri a felhasználót, hogy válasszon ki egy revíziót (a $REVISION-t " -"állítja)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Megkérdezi a felhasználót további argumentumokért (a $ARGS-ot állítja)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Ne mutassa a parancs kimeneti ablakát" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Futtatás csak ha egy diff ki van választva (a $FILENAME nem üres)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Adjunk meg egy eszköz nevet." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "A(z) '%s' eszköz már létezik." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Az eszköz nem hozzáadható:\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Eszköz eltávolítása" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Eszköz parancsok eltávolítása" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Eltávolítás" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Kék jelzi a repó-specifikus eszközöket)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Parancs futtatása: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Argumentumok" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: 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 "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:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Változások pusholása ide: %s" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Tükrözés a következő helyre: %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Pusholás: %s %s, ide: %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Branchek pusholása" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Forrás branchek" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Cél repó" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Átviteli opciók" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "" -"Létező branch felülírásának erőltetése (lehet, hogy el fog dobni " -"változtatásokat)" - -#: lib/transport.tcl:175 -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:179 -msgid "Include tags" -msgstr "Tageket is" - -#~ 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" - -#~ msgid "Apple" -#~ msgstr "Apple" - -#~ msgid "URL:" -#~ msgstr "URL:" - -#~ msgid "Delete Remote Branch" -#~ msgstr "Távoli branch törlése" - -#~ msgid "Not connected to aspell" -#~ msgstr "Nincs kapcsolat az aspellhez" - -#~ 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 Existing To Commit" -#~ msgstr "Hozzáadás létező commithoz" - -#~ 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 --git a/third_party/git/git-gui/po/it.po b/third_party/git/git-gui/po/it.po deleted file mode 100644 index 1bd8b8e04f71..000000000000 --- a/third_party/git/git-gui/po/it.po +++ /dev/null @@ -1,2591 +0,0 @@ -# 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 <paolo.ciarrocchi@gmail.com>, 2007 -# Michele Ballabio <barra_cuda@katamail.com>, 2007. -# -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-01-28 10:04+0100\n" -"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" -"Language-Team: Italian <tp@lists.linux.it>\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:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: errore grave" - -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Caratteri non validi specificati in %s:" - -#: git-gui.sh:779 -msgid "Main Font" -msgstr "Caratteri principali" - -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "Caratteri per confronti e terminale" - -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "Impossibile trovare git nel PATH" - -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Impossibile determinare la versione di Git:" - -#: git-gui.sh:839 -#, 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" -"\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:1128 -msgid "Git directory not found:" -msgstr "Non trovo la directory di git: " - -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "Impossibile spostarsi sulla directory principale del progetto:" - -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "Impossibile usare un archivio senza directory di lavoro:" - -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "Nessuna directory di lavoro" - -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Controllo dello stato dei file in corso..." - -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "Ricerca di file modificati in corso..." - -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "Avvio prepare-commit-msg hook..." - -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "Revisione rifiutata dal prepare-commit-msg hook." - -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "Pronto." - -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Saranno mostrati solo %s file su %s." - -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "Non modificato" - -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "Modificato, non preparato per una nuova revisione" - -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "Preparato per una nuova revisione" - -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "Parti preparate per una nuova revisione" - -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "Preparato per una nuova revisione, mancante" - -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "Tipo di file modificato, non preparato per una nuova revisione" - -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "Tipo di file modificato, preparato per una nuova revisione" - -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "Non tracciato, non preparato per una nuova revisione" - -#: git-gui.sh:1928 -msgid "Missing" -msgstr "Mancante" - -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "Preparato per la rimozione" - -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "Preparato alla rimozione, ancora presente" - -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "Richiede risoluzione dei conflitti" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Avvio di gitk... attendere..." - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "Impossibile trovare gitk nel PATH" - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "Impossibile trovare git gui nel PATH" - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Archivio" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "Modifica" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Ramo" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Revisione" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Fusione (Merge)" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Remoto" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "Accessori" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "Esplora copia di lavoro" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "Esplora i file del ramo attuale" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "Esplora i file del ramo..." - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "Visualizza la cronologia del ramo attuale" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "Visualizza la cronologia di tutti i rami" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Esplora i file di %s" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Visualizza la cronologia di %s" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Statistiche dell'archivio" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Comprimi l'archivio" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "Verifica l'archivio" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Crea icona desktop" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Esci" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "Annulla" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "Ripeti" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "Taglia" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Copia" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "Incolla" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Elimina" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "Seleziona tutto" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "Crea..." - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "Attiva..." - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "Rinomina" - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "Elimina..." - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "Ripristina..." - -#: git-gui.sh:2608 -msgid "Done" -msgstr "Fatto" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "Nuova revisione" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Nuova revisione" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "Correggi l'ultima revisione" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Analizza nuovamente" - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "Prepara per una nuova revisione" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "Prepara i file modificati per una nuova revisione" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "Annulla preparazione" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "Annulla modifiche" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "Mostra meno contesto" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "Mostra più contesto" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "Sign Off" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "Fusione locale..." - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "Interrompi fusione..." - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "Aggiungi..." - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "Propaga..." - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "Elimina ramo..." - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "Opzioni..." - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "Rimuovi..." - -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Aiuto" - -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Informazioni su %s" - -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "Documentazione sul web" - -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Mostra chave SSH" - -#: git-gui.sh:2893 -#, 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:2926 -msgid "Current Branch:" -msgstr "Ramo attuale:" - -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Modifiche preparate (saranno nella nuova revisione)" - -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "Modifiche non preparate" - -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "Prepara modificati" - -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Propaga (Push)" - -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "Messaggio di revisione iniziale:" - -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "Messaggio di revisione corretto:" - -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "Messaggio iniziale di revisione corretto:" - -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "Messaggio di fusione corretto:" - -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "Messaggio di fusione:" - -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "Messaggio di revisione:" - -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "Copia tutto" - -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "File:" - -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "Rinfresca" - -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "Diminuisci dimensione caratteri" - -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "Aumenta dimensione caratteri" - -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Codifica" - -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "Applica/Inverti sezione" - -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "Applica/Inverti riga" - -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "Avvia programma esterno per la risoluzione dei conflitti" - -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "Usa versione remota" - -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "Usa versione locale" - -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "Ritorna alla revisione comune" - -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "Visualizza queste modifiche nel sottomodulo" - -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Visualizza la cronologia del ramo attuale nel sottomodulo" - -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "Visualizza la cronologia di tutti i rami nel sottomodulo" - -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "Avvia git gui nel sottomodulo" - -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "Annulla preparazione della sezione per una nuova revisione" - -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "Annulla preparazione delle linee per una nuova revisione" - -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "Annulla preparazione della linea per una nuova revisione" - -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "Prepara sezione per una nuova revisione" - -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "Prepara linee per una nuova revisione" - -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "Prepara linea per una nuova revisione" - -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "Inizializzazione..." - -#: git-gui.sh:3541 -#, 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:3570 -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:3575 -#, 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:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - un'interfaccia grafica per Git." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Mostra file" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Revisione:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Copia revisione" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Trova testo..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Ricerca accurata delle copie" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Mostra contesto nella cronologia" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Annota la revisione precedente" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Lettura di %s..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Caricamento annotazioni per copie/spostamenti..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "linee annotate" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Caricamento annotazioni per posizione originaria..." - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Annotazione completata." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Occupato" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Il processo di annotazione è già in corso." - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Ricerca accurata delle copie in corso..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Caricamento annotazioni..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Autore:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Revisione creata da:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "File originario:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Impossibile trovare la revisione HEAD:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Impossibile trovare la revisione precedente:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Impossibile visualizzare la revisione precedente" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Errore nel caricamento delle differenze:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "In origine da:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "Nel file:" - -#: lib/blame.tcl:1242 -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:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Annulla" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Revisione" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -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:381 -msgid "Create" -msgstr "Crea" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Nome del ramo" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -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:571 -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 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Sempre (non verificare le fusioni)" - -#: 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 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Ripristinare rami cancellati è difficile.\n" -"\n" -"Cancellare i rami selezionati?" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"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:202 -#, 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:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Caricamento %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Directory superiore]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Esplora i file del ramo" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "Esplora" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Recupero %s da %s" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "errore grave: impossibile risolvere %s" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Chiudi" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Il ramo '%s' non esiste." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Impossibile configurare git-pull semplificato per '%s'." - -#: lib/checkout_op.tcl:229 -#, 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:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "La strategia di fusione '%s' non è supportata." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Impossibile aggiornare '%s'." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "" -"L'area di preparazione per una nuova revisione (indice) è già bloccata." - -#: lib/checkout_op.tcl:289 -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 " -"attuale.\n" -"\n" -"La nuova analisi comincerà ora.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Aggiornamento della directory di lavoro a '%s' in corso..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "file presenti nella directory di lavoro" - -#: lib/checkout_op.tcl:376 -#, 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:377 -msgid "File level merge required." -msgstr "E' richiesta una fusione a livello file." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Si rimarrà sul ramo '%s'." - -#: lib/checkout_op.tcl:452 -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:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Attivazione di '%s' completata." - -#: lib/checkout_op.tcl:535 -#, 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:557 -msgid "Recovering lost commits may not be easy." -msgstr "Ricomporre le revisioni perdute potrebbe non essere semplice." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Ripristinare '%s'?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Visualizza" - -#: lib/checkout_op.tcl:635 -#, 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 "" -"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:74 -msgid "Font Size" -msgstr "Dimensione caratteri" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Esempio caratteri" - -#: lib/choose_font.tcl:103 -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, scegli questo carattere." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "Crea nuovo archivio" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Nuovo..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "Clona archivio esistente" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Clona..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "Apri archivio esistente" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Apri..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Archivi recenti" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Apri archivio recente:" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Impossibile creare l'archivio %s:" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "Directory:" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "Archivio Git" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "La directory %s esiste già." - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "Il file %s esiste già." - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "Clona" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "Posizione sorgente:" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "Directory di destinazione:" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "Tipo di clone:" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (veloce, semi-ridondante, con hardlink)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Copia completa (più lento, backup ridondante)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Shared (il più veloce, non raccomandato, nessun backup)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "%s non è un archivio Git." - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Standard è disponibile solo per archivi locali." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Shared è disponibile solo per archivi locali." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "Il file/directory %s esiste già." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "Impossibile configurare origin" - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Calcolo oggetti" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Impossibile copiare oggetti/info/alternate: %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Niente da clonare da %s." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "Il ramo 'master' non è stato inizializzato." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Impossibile utilizzare gli hardlink. Si ricorrerà alla copia." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Clonazione da %s" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Copia degli oggetti" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Impossibile copiare oggetto: %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Collegamento oggetti" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "oggetti" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Hardlink impossibile sull'oggetto: %s" - -#: lib/choose_repository.tcl:858 -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:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Impossibile recuperare le etichette. Controllare i dettagli forniti dalla " -"console." - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Impossibile determinare HEAD. Controllare i dettagli forniti dalla console." - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Impossibile ripulire %s" - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "Clonazione non riuscita." - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "Non è stato trovato un ramo predefinito." - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Impossibile risolvere %s come una revisione." - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Creazione directory di lavoro" - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "file" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Attivazione iniziale non riuscita." - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "Apri" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "Archivio:" - -#: lib/choose_repository.tcl:1072 -#, 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:538 -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:531 -msgid "Updated" -msgstr "Aggiornato" - -#: lib/choose_rev.tcl:559 -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" - -#: 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:48 -msgid "Error loading commit data for amend:" -msgstr "Errore durante il caricamento dei dati della revisione da correggere:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Impossibile ottenere la tua identità:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "GIT_COMMITTER_IDENT non valida:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "attenzione: Tcl non supporta la codifica '%s'." - -#: lib/commit.tcl:149 -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:172 -#, 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:180 -#, 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:188 -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" - -#: lib/commit.tcl:203 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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 "" -"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:234 -msgid "Calling pre-commit hook..." -msgstr "Avvio pre-commit hook..." - -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "Revisione rifiutata dal pre-commit hook." - -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Avvio commit-msg hook..." - -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Revisione rifiutata dal commit-msg hook." - -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Archiviazione modifiche..." - -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree non riuscito:" - -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "Impossibile creare una nuova revisione." - -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "La revisione %s sembra essere danneggiata" - -#: lib/commit.tcl:339 -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:346 -msgid "No changes to commit." -msgstr "Nessuna modifica per la nuova revisione." - -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree non riuscito:" - -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref non riuscito:" - -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Creata revisione %s: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Elaborazione in corso... attendere..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Successo" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -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:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\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.\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:64 -#, 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:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Caricamento delle differenze di %s..." - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOCALE: cancellato\n" -"REMOTO:\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"REMOTO: cancellato\n" -"LOCALE:\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "LOCALE:\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "REMOTO:\n" - -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "Impossibile visualizzare %s" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Errore nel caricamento del file:" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Archivio Git (sottoprogetto)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* File binario (il contenuto non sarà mostrato)." - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Il file non tracciato è di %d byte.\n" -"* Saranno visualizzati solo i primi %d byte.\n" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* %s non visualizza completamente questo file non tracciato.\n" -"* Per visualizzare il file completo, usare un programma esterno.\n" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "Impossibile rimuovere la sezione scelta dalla nuova revisione." - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "Impossibile preparare la sezione scelta per una nuova revisione." - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "Impossibile rimuovere la riga scelta dalla nuova revisione." - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "Impossibile preparare la riga scelta per una nuova revisione." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Predefinito" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Codifica di sistema (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Altro" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "errore" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "attenzione" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "" -"Bisogna correggere gli errori suddetti prima di creare una nuova revisione." - -#: 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:17 -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:28 -msgid "Continue" -msgstr "Continua" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Sblocca l'accesso all'indice" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "%s non farà parte della prossima revisione" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Pronto per creare una nuova revisione." - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "Aggiunta di %s in corso" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Annullare le modifiche nel file %s?" - -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Annullare le modifiche in questi %i file?" - -#: lib/index.tcl:408 -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:411 -msgid "Do Nothing" -msgstr "Non fare niente" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "Annullo le modifiche nei file selezionati" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "Annullo le modifiche in %s" - -#: 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:45 -#, 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 attuale. Solo a questo punto potrai " -"iniziare un'altra fusione.\n" - -#: lib/merge.tcl:55 -#, 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 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:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s di %s" - -#: lib/merge.tcl:120 -#, 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 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 attuale causerà la perdita di *TUTTE* le " -"modifiche non ancora presenti nell'archivio.\n" -"\n" -"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 attuale 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 attuali?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Interruzione" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "ripristino file" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "Interruzione non riuscita." - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Interruzione completata. Pronto." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Imporre la risoluzione alla revisione comune?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Imporre la risoluzione al ramo attuale?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Imporre la risoluzione all'altro ramo?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Si stanno mostrando solo le modifiche con conflitti.\n" -"\n" -"%s sarà sovrascritto.\n" -"\n" -"Questa operazione può essere modificata solo ricominciando la fusione." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"Il file %s sembra contenere conflitti non risolti, preparare per la prossima " -"revisione?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "" -"La risoluzione dei conflitti per %s è preparata per la prossima revisione" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Non è possibile risolvere i conflitti per cancellazioni o link con un " -"programma esterno" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Non esiste un file con conflitti." - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "'%s' non è una GUI per la risoluzione dei conflitti." - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Il programma '%s' non è supportato" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "La risoluzione dei conflitti è già avviata, terminarla?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Errore: revisione non trovata:\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Impossibile avviare la risoluzione dei conflitti:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Avvio del programma per la risoluzione dei conflitti in corso..." - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "Risoluzione dei conflitti non riuscita." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "" -"La codifica dei caratteri '%s' specificata per tutti gli archivi non è valida" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "" -"La codifica dei caratteri '%s' specificata per l'archivio attuale non è " -"valida" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Ripristina valori predefiniti" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Salva" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "Archivio di %s" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Tutti gli archivi" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Nome utente" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Indirizzo Email" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Riepilogo nelle revisioni di fusione" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Prolissità della fusione" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Mostra statistiche delle differenze dopo la fusione" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Programma da utilizzare per la risoluzione dei conflitti" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Fidati delle date di modifica dei file" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "" -"Effettua potatura dei duplicati locali di rami remoti durante il recupero" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Appaia duplicati locali di rami remoti" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "Ricerca copie solo nei file modificati" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Numero minimo di lettere che attivano la ricerca delle copie" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Giorni di contesto nella cronologia delle annotazioni" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Numero di linee di contesto nelle differenze" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Larghezza del messaggio di revisione" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Modello per il nome di un nuovo ramo" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Codifica predefinita per il contenuto dei file" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Cambia" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Lingua dizionario:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Cambia caratteri" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Scegli %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Preferenze" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Impossibile salvare completamente le opzioni:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Rimuovi archivio remoto" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Effettua potatura da" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Recupera da" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Propaga verso" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Aggiungi archivio remoto" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Aggiungi nuovo archivio remoto" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Aggiungi" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Dettagli sull'archivio remoto" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Posizione:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Altra azione" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Recupera subito" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Inizializza l'archivio remoto e propaga" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Non fare altro" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Inserire un nome per l'archivio remoto." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' non è utilizzabile come nome di archivio remoto." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Impossibile aggiungere l'archivio remoto '%s' posto in '%s'." - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "recupera da %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Recupero %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Impossibile inizializzare l'archivio posto in '%s'." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "propaga verso %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Imposto %s (in %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Elimina ramo remoto" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Da archivio" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Remoto:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Posizione specifica:" - -#: 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: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 "" -"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:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Cancellazione rami da %s" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "Nessun archivio selezionato." - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "Analisi in corso %s..." - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Trova:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Succ" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Prec" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Distingui maiuscole" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Impossibile scrivere shortcut:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Impossibile scrivere icona:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Correttore ortografico non supportato" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Correzione ortografica indisponibile" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "La configurazione del correttore ortografico non è valida" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Il dizionario è stato reimpostato su %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Il correttore ortografico ha riportato un errore all'avvio" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Correttore ortografico non riconosciuto" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Nessun suggerimento" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Il correttore ortografico ha mandato un EOF inaspettato" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Errore nel correttore ortografico" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Chiavi non trovate." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Chiave pubblica trovata in: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Crea chiave" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Copia negli appunti" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "La tua chiave pubblica OpenSSH" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Creazione chiave in corso..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Impossibile avviare ssh-keygen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "Errore durante la creazione della chiave." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "La chiave è stata creata con successo, ma non è stata trovata." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "La chiave è in: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%1$s ... %6$s: %2$*i di %4$*i (%7$3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Bisogna selezionare un file prima di eseguire %s." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Vuoi davvero eseguire %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Accessorio: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Eseguo: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Il programma esterno è terminato con successo: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Il programma esterno ha riportato un errore: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Aggiungi accessorio" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Aggiungi un nuovo comando" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Aggiungi per tutti gli archivi" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Dettagli sull'accessorio" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Utilizza il separatore '/' per creare un albero di sottomenu:" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Comando:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Mostra una finestra di dialogo prima dell'avvio" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Chiedi all'utente di scegliere una revisione (imposta $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Chiedi all'utente di fornire argomenti aggiuntivi (imposta $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Non mostrare la finestra di comando" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Avvia solo se è selezionata una differenza ($FILENAME non è vuoto)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Bisogna dare un nome all'accessorio." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "L'accessorio '%s' esiste già." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Impossibile aggiungere l'accessorio:\n" -"\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Rimuovi accessorio" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Rimuovi i comandi accessori" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Rimuovi" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Il colore blu indica accessori per l'archivio locale)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Avvia il comando: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Argomenti" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: 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:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Propagazione modifiche a %s" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Mirroring verso %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Propagazione %s %s a %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Propaga rami" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Rami di origine" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Archivio di destinazione" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Opzioni di trasferimento" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Sovrascrivi ramo esistente (alcune modifiche potrebbero essere perse)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Utilizza 'thin pack' (per connessioni lente)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Includi etichette" diff --git a/third_party/git/git-gui/po/ja.po b/third_party/git/git-gui/po/ja.po deleted file mode 100644 index 2f61153ab9ff..000000000000 --- a/third_party/git/git-gui/po/ja.po +++ /dev/null @@ -1,2685 +0,0 @@ -# Translation of git-gui to Japanese -# Copyright (C) 2007 Shawn Pearce -# This file is distributed under the same license as the git-gui package. -# -# しらいし ななこ <nanako3@bluebottle.com>, 2007. -# Satoshi Yasushima <s.yasushima@gmail.com>, 2016. -# KIDANI Akito <a.kid.1985@gmail.com>, 2019. -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-27 17:52+0900\n" -"PO-Revision-Date: 2019-10-13 23:20+0900\n" -"Last-Translator: KIDANI Akito <a.kid.1985@gmail.com>\n" -"Language-Team: Japanese\n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: git-gui.sh:861 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "%s に無効なフォントが指定されています:" - -#: git-gui.sh:915 -msgid "Main Font" -msgstr "主フォント" - -#: git-gui.sh:916 -msgid "Diff/Console Font" -msgstr "diff/コンソール・フォント" - -#: git-gui.sh:931 git-gui.sh:945 git-gui.sh:958 git-gui.sh:1048 git-gui.sh:1067 -#: git-gui.sh:3125 -msgid "git-gui: fatal error" -msgstr "git-gui: 致命的なエラー" - -#: git-gui.sh:932 -msgid "Cannot find git in PATH." -msgstr "PATH 中に git が見つかりません" - -#: git-gui.sh:959 -msgid "Cannot parse Git version string:" -msgstr "Git バージョン名が理解できません:" - -#: git-gui.sh:984 -#, 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:1281 -msgid "Git directory not found:" -msgstr "Git ディレクトリが見つかりません:" - -#: git-gui.sh:1315 -msgid "Cannot move to top of working directory:" -msgstr "作業ディレクトリの最上位に移動できません" - -#: git-gui.sh:1323 -msgid "Cannot use bare repository:" -msgstr "裸のリポジトリは使えません:" - -#: git-gui.sh:1331 -msgid "No working directory" -msgstr "作業ディレクトリがありません" - -#: git-gui.sh:1503 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "ファイル状態を更新しています…" - -#: git-gui.sh:1563 -msgid "Scanning for modified files ..." -msgstr "変更されたファイルをスキャンしています…" - -#: git-gui.sh:1639 -msgid "Calling prepare-commit-msg hook..." -msgstr "prepare-commit-msg フックを実行中・・・" - -#: git-gui.sh:1656 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "prepare-commit-msg フックがコミットを拒否しました" - -#: git-gui.sh:1814 lib/browser.tcl:252 -msgid "Ready." -msgstr "準備完了" - -#: git-gui.sh:1978 -#, tcl-format -msgid "" -"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." -msgstr "" -"表示可能な限界 (gui.maxfilesdisplayed = %s) に達しため、全体で%s個のファイル" -"を表示できません" - -#: git-gui.sh:2101 -msgid "Unmodified" -msgstr "変更無し" - -#: git-gui.sh:2103 -msgid "Modified, not staged" -msgstr "変更あり、コミット未予定" - -#: git-gui.sh:2104 git-gui.sh:2116 -msgid "Staged for commit" -msgstr "コミット予定済" - -#: git-gui.sh:2105 git-gui.sh:2117 -msgid "Portions staged for commit" -msgstr "部分的にコミット予定済" - -#: git-gui.sh:2106 git-gui.sh:2118 -msgid "Staged for commit, missing" -msgstr "コミット予定済、ファイル無し" - -#: git-gui.sh:2108 -msgid "File type changed, not staged" -msgstr "ファイル型変更、コミット未予定" - -#: git-gui.sh:2109 git-gui.sh:2110 -msgid "File type changed, old type staged for commit" -msgstr "ファイル型変更、旧型コミット予定済" - -#: git-gui.sh:2111 -msgid "File type changed, staged" -msgstr "ファイル型変更、コミット予定済" - -#: git-gui.sh:2112 -msgid "File type change staged, modification not staged" -msgstr "ファイル型変更コミット予定済、変更コミット未予定" - -#: git-gui.sh:2113 -msgid "File type change staged, file missing" -msgstr "ファイル型変更コミット予定済、ファイル無し" - -#: git-gui.sh:2115 -msgid "Untracked, not staged" -msgstr "管理外、コミット未予定" - -#: git-gui.sh:2120 -msgid "Missing" -msgstr "ファイル無し" - -#: git-gui.sh:2121 -msgid "Staged for removal" -msgstr "削除予定済" - -#: git-gui.sh:2122 -msgid "Staged for removal, still present" -msgstr "削除予定済、ファイル未削除" - -#: git-gui.sh:2124 git-gui.sh:2125 git-gui.sh:2126 git-gui.sh:2127 -#: git-gui.sh:2128 git-gui.sh:2129 -msgid "Requires merge resolution" -msgstr "要マージ解決" - -#: git-gui.sh:2164 -msgid "Starting gitk... please wait..." -msgstr "gitk を起動中…お待ち下さい…" - -#: git-gui.sh:2176 -msgid "Couldn't find gitk in PATH" -msgstr "PATH 中に gitk が見つかりません" - -#: git-gui.sh:2235 -msgid "Couldn't find git gui in PATH" -msgstr "PATH 中に git gui が見つかりません" - -#: git-gui.sh:2654 lib/choose_repository.tcl:41 -msgid "Repository" -msgstr "リポジトリ" - -#: git-gui.sh:2655 -msgid "Edit" -msgstr "編集" - -#: git-gui.sh:2657 lib/choose_rev.tcl:567 -msgid "Branch" -msgstr "ブランチ" - -#: git-gui.sh:2660 lib/choose_rev.tcl:554 -msgid "Commit@@noun" -msgstr "コミット" - -#: git-gui.sh:2663 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 -msgid "Merge" -msgstr "マージ" - -#: git-gui.sh:2664 lib/choose_rev.tcl:563 -msgid "Remote" -msgstr "リモート" - -#: git-gui.sh:2667 -msgid "Tools" -msgstr "ツール" - -#: git-gui.sh:2676 -msgid "Explore Working Copy" -msgstr "ワーキングコピーをブラウズ" - -#: git-gui.sh:2682 -msgid "Git Bash" -msgstr "" - -#: git-gui.sh:2692 -msgid "Browse Current Branch's Files" -msgstr "現在のブランチのファイルを見る" - -#: git-gui.sh:2696 -msgid "Browse Branch Files..." -msgstr "ブランチのファイルを見る…" - -#: git-gui.sh:2701 -msgid "Visualize Current Branch's History" -msgstr "現在のブランチの履歴を見る" - -#: git-gui.sh:2705 -msgid "Visualize All Branch History" -msgstr "全てのブランチの履歴を見る" - -#: git-gui.sh:2712 -#, tcl-format -msgid "Browse %s's Files" -msgstr "ブランチ %s のファイルを見る" - -#: git-gui.sh:2714 -#, tcl-format -msgid "Visualize %s's History" -msgstr "ブランチ %s の履歴を見る" - -#: git-gui.sh:2719 lib/database.tcl:40 lib/database.tcl:66 -msgid "Database Statistics" -msgstr "データベース統計" - -#: git-gui.sh:2722 lib/database.tcl:33 -msgid "Compress Database" -msgstr "データベース圧縮" - -#: git-gui.sh:2725 -msgid "Verify Database" -msgstr "データベース検証" - -#: git-gui.sh:2732 git-gui.sh:2736 git-gui.sh:2740 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "デスクトップ・アイコンを作る" - -#: git-gui.sh:2748 lib/choose_repository.tcl:193 lib/choose_repository.tcl:201 -msgid "Quit" -msgstr "終了" - -#: git-gui.sh:2756 -msgid "Undo" -msgstr "元に戻す" - -#: git-gui.sh:2759 -msgid "Redo" -msgstr "やり直し" - -#: git-gui.sh:2763 git-gui.sh:3368 -msgid "Cut" -msgstr "切り取り" - -#: git-gui.sh:2766 git-gui.sh:3371 git-gui.sh:3445 git-gui.sh:3530 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "コピー" - -#: git-gui.sh:2769 git-gui.sh:3374 -msgid "Paste" -msgstr "貼り付け" - -#: git-gui.sh:2772 git-gui.sh:3377 lib/remote_branch_delete.tcl:39 -#: lib/branch_delete.tcl:28 -msgid "Delete" -msgstr "削除" - -#: git-gui.sh:2776 git-gui.sh:3381 git-gui.sh:3534 lib/console.tcl:71 -msgid "Select All" -msgstr "全て選択" - -#: git-gui.sh:2785 -msgid "Create..." -msgstr "作成…" - -#: git-gui.sh:2791 -msgid "Checkout..." -msgstr "チェックアウト" - -#: git-gui.sh:2797 -msgid "Rename..." -msgstr "名前変更…" - -#: git-gui.sh:2802 -msgid "Delete..." -msgstr "削除…" - -#: git-gui.sh:2807 -msgid "Reset..." -msgstr "リセット…" - -#: git-gui.sh:2817 -msgid "Done" -msgstr "完了" - -#: git-gui.sh:2819 -msgid "Commit@@verb" -msgstr "コミット" - -#: git-gui.sh:2828 git-gui.sh:3309 -msgid "New Commit" -msgstr "新規コミット" - -#: git-gui.sh:2836 git-gui.sh:3316 -msgid "Amend Last Commit" -msgstr "最新コミットを訂正" - -#: git-gui.sh:2846 git-gui.sh:3270 lib/remote_branch_delete.tcl:101 -msgid "Rescan" -msgstr "再スキャン" - -#: git-gui.sh:2852 -msgid "Stage To Commit" -msgstr "コミット予定する" - -#: git-gui.sh:2858 -msgid "Stage Changed Files To Commit" -msgstr "変更されたファイルをコミット予定" - -#: git-gui.sh:2864 -msgid "Unstage From Commit" -msgstr "コミットから降ろす" - -#: git-gui.sh:2870 lib/index.tcl:442 -msgid "Revert Changes" -msgstr "変更を元に戻す" - -#: git-gui.sh:2878 git-gui.sh:3581 git-gui.sh:3612 -msgid "Show Less Context" -msgstr "文脈を少なく" - -#: git-gui.sh:2882 git-gui.sh:3585 git-gui.sh:3616 -msgid "Show More Context" -msgstr "文脈を多く" - -#: git-gui.sh:2889 git-gui.sh:3283 git-gui.sh:3392 -msgid "Sign Off" -msgstr "署名" - -#: git-gui.sh:2905 -msgid "Local Merge..." -msgstr "ローカル・マージ…" - -#: git-gui.sh:2910 -msgid "Abort Merge..." -msgstr "マージ中止…" - -#: git-gui.sh:2922 git-gui.sh:2950 -msgid "Add..." -msgstr "追加" - -#: git-gui.sh:2926 -msgid "Push..." -msgstr "プッシュ…" - -#: git-gui.sh:2930 -msgid "Delete Branch..." -msgstr "ブランチ削除..." - -#: git-gui.sh:2940 git-gui.sh:3563 -msgid "Options..." -msgstr "オプション…" - -#: git-gui.sh:2951 -msgid "Remove..." -msgstr "削除..." - -#: git-gui.sh:2960 lib/choose_repository.tcl:55 -msgid "Help" -msgstr "ヘルプ" - -#: git-gui.sh:2964 git-gui.sh:2968 lib/about.tcl:14 -#: lib/choose_repository.tcl:49 lib/choose_repository.tcl:58 -#, tcl-format -msgid "About %s" -msgstr "%s について" - -#: git-gui.sh:2992 -msgid "Online Documentation" -msgstr "オンライン・ドキュメント" - -#: git-gui.sh:2995 lib/choose_repository.tcl:52 lib/choose_repository.tcl:61 -msgid "Show SSH Key" -msgstr "SSH キーを表示" - -#: git-gui.sh:3014 git-gui.sh:3146 -msgid "Usage" -msgstr "使い方" - -#: git-gui.sh:3095 lib/blame.tcl:573 -msgid "Error" -msgstr "エラー" - -#: git-gui.sh:3126 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま" -"せん" - -#: git-gui.sh:3159 -msgid "Current Branch:" -msgstr "現在のブランチ" - -#: git-gui.sh:3185 -msgid "Staged Changes (Will Commit)" -msgstr "ステージングされた（コミット予定済の）変更" - -#: git-gui.sh:3205 -msgid "Unstaged Changes" -msgstr "コミット予定に入っていない変更" - -#: git-gui.sh:3276 -msgid "Stage Changed" -msgstr "変更をコミット予定に入れる" - -#: git-gui.sh:3295 lib/transport.tcl:137 lib/transport.tcl:229 -msgid "Push" -msgstr "プッシュ" - -#: git-gui.sh:3330 -msgid "Initial Commit Message:" -msgstr "最初のコミットメッセージ:" - -#: git-gui.sh:3331 -msgid "Amended Commit Message:" -msgstr "訂正したコミットメッセージ:" - -#: git-gui.sh:3332 -msgid "Amended Initial Commit Message:" -msgstr "訂正した最初のコミットメッセージ:" - -#: git-gui.sh:3333 -msgid "Amended Merge Commit Message:" -msgstr "訂正したマージコミットメッセージ:" - -#: git-gui.sh:3334 -msgid "Merge Commit Message:" -msgstr "マージコミットメッセージ:" - -#: git-gui.sh:3335 -msgid "Commit Message:" -msgstr "コミットメッセージ:" - -#: git-gui.sh:3384 git-gui.sh:3538 lib/console.tcl:73 -msgid "Copy All" -msgstr "全てコピー" - -#: git-gui.sh:3408 lib/blame.tcl:105 -msgid "File:" -msgstr "ファイル:" - -#: git-gui.sh:3526 -msgid "Refresh" -msgstr "再読み込み" - -#: git-gui.sh:3547 -msgid "Decrease Font Size" -msgstr "フォントを小さく" - -#: git-gui.sh:3551 -msgid "Increase Font Size" -msgstr "フォントを大きく" - -#: git-gui.sh:3559 lib/blame.tcl:294 -msgid "Encoding" -msgstr "エンコーディング" - -#: git-gui.sh:3570 -msgid "Apply/Reverse Hunk" -msgstr "パッチを適用/取り消す" - -#: git-gui.sh:3575 -msgid "Apply/Reverse Line" -msgstr "パッチ行を適用/取り消す" - -#: git-gui.sh:3594 -msgid "Run Merge Tool" -msgstr "マージツールを起動" - -#: git-gui.sh:3599 -msgid "Use Remote Version" -msgstr "リモートの方を採用" - -#: git-gui.sh:3603 -msgid "Use Local Version" -msgstr "ローカルの方を採用" - -#: git-gui.sh:3607 -msgid "Revert To Base" -msgstr "ベース版を採用" - -#: git-gui.sh:3625 -msgid "Visualize These Changes In The Submodule" -msgstr "サブモジュール内のこれらの変更を見る" - -#: git-gui.sh:3629 -msgid "Visualize Current Branch History In The Submodule" -msgstr "サブモジュール内で現在のブランチの履歴を見る" - -#: git-gui.sh:3633 -msgid "Visualize All Branch History In The Submodule" -msgstr "サブモジュール内で全てのブランチの履歴を見る" - -#: git-gui.sh:3638 -msgid "Start git gui In The Submodule" -msgstr "サブモジュール内でgit guiを起動する" - -#: git-gui.sh:3673 -msgid "Unstage Hunk From Commit" -msgstr "パッチをコミット予定から外す" - -#: git-gui.sh:3675 -msgid "Unstage Lines From Commit" -msgstr "コミット予定から行を外す" - -#: git-gui.sh:3677 -msgid "Unstage Line From Commit" -msgstr "コミット予定から行を外す" - -#: git-gui.sh:3680 -msgid "Stage Hunk For Commit" -msgstr "パッチをコミット予定に加える" - -#: git-gui.sh:3682 -msgid "Stage Lines For Commit" -msgstr "パッチ行をコミット予定に加える" - -#: git-gui.sh:3684 -msgid "Stage Line For Commit" -msgstr "パッチ行をコミット予定に加える" - -#: git-gui.sh:3709 -msgid "Initializing..." -msgstr "初期化しています…" - -#: git-gui.sh:3852 -#, 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:3881 -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:3886 -#, 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/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:45 -#, 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:55 -#, 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:108 -#, tcl-format -msgid "%s of %s" -msgstr "%2$s の %1$s ブランチ" - -#: lib/merge.tcl:122 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "%s と %s をマージ中・・・" - -#: lib/merge.tcl:133 -msgid "Merge completed successfully." -msgstr "マージが完了しました" - -#: lib/merge.tcl:135 -msgid "Merge failed. Conflict resolution is required." -msgstr "マージが失敗しました。衝突の解決が必要です。" - -#: lib/merge.tcl:160 -#, tcl-format -msgid "Merge Into %s" -msgstr "%s にマージ" - -#: lib/merge.tcl:166 lib/checkout_op.tcl:567 lib/tools_dlg.tcl:336 -msgid "Visualize" -msgstr "可視化" - -#: lib/merge.tcl:174 lib/remote_branch_delete.tcl:43 lib/branch_delete.tcl:34 -#: lib/checkout_op.tcl:579 lib/branch_rename.tcl:32 lib/tools_dlg.tcl:41 -#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/option.tcl:127 -#: lib/transport.tcl:141 lib/choose_font.tcl:45 lib/branch_checkout.tcl:30 -#: lib/browser.tcl:292 lib/remote_add.tcl:34 lib/branch_create.tcl:37 -msgid "Cancel" -msgstr "中止" - -#: lib/merge.tcl:179 -msgid "Revision To Merge" -msgstr "マージするリビジョン" - -#: lib/merge.tcl:214 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"訂正中には中止できません。\n" -"\n" -"まず今のコミット訂正を完了させて下さい。\n" - -#: lib/merge.tcl:224 -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:230 -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:241 -msgid "Aborting" -msgstr "中断しています" - -#: lib/merge.tcl:241 -msgid "files reset" -msgstr "リセットしたファイル" - -#: lib/merge.tcl:269 -msgid "Abort failed." -msgstr "中断に失敗しました。" - -#: lib/merge.tcl:271 -msgid "Abort completed. Ready." -msgstr "中断完了。" - -#: lib/error.tcl:20 lib/error.tcl:116 -msgid "error" -msgstr "エラー" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "警告" - -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." -msgstr "コミットする前に、以上のエラーを修正して下さい" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Git から出た無効な日付: %s" - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "デフォールト" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "システム (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "その他" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "リモートブランチ削除" - -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" -msgstr "元のリポジトリ" - -#: lib/remote_branch_delete.tcl:51 lib/transport.tcl:165 -msgid "Remote:" -msgstr "リモート:" - -#: lib/remote_branch_delete.tcl:72 lib/transport.tcl:187 -msgid "Arbitrary Location:" -msgstr "任意の位置:" - -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" -msgstr "ブランチ" - -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" -msgstr "条件付で削除" - -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" -msgstr "マージ先:" - -#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 -msgid "Always (Do not perform merge checks)" -msgstr "無条件（マージ検査をしない）" - -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." -msgstr "'マージ先' にはブランチが必要です。" - -#: lib/remote_branch_delete.tcl:185 -#, 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:190 -#, 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:208 -msgid "Please select one or more branches to delete." -msgstr "削除するブランチを選択して下さい。" - -#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"削除したブランチを回復するのは困難です。\n" -"\n" -"選択したブランチを削除して良いですか？" - -#: lib/remote_branch_delete.tcl:227 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "%s からブランチを削除しています。" - -#: lib/remote_branch_delete.tcl:300 -msgid "No repository selected." -msgstr "リポジトリが選択されていません。" - -#: lib/remote_branch_delete.tcl:305 -#, tcl-format -msgid "Scanning %s..." -msgstr "%s をスキャンしています…" - -#: lib/branch_delete.tcl:16 -msgid "Delete Branch" -msgstr "ブランチ削除" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "ローカル・ブランチを削除" - -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "ローカル・ブランチ" - -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "マージ済みの時のみ削除" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "以下のブランチは %s に完全にマージされていません:" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"以下のブランチを削除できません:\n" -"%s" - -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" -msgstr "分離されたチェックアウト" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "リビジョン式:" - -#: lib/choose_rev.tcl:72 -msgid "Local Branch" -msgstr "ローカル・ブランチ" - -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" -msgstr "トラッキング・ブランチ" - -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 -msgid "Tag" -msgstr "タグ" - -#: lib/choose_rev.tcl:321 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "無効なリビジョン: %s" - -#: lib/choose_rev.tcl:342 -msgid "No revision selected." -msgstr "リビジョンが未選択です。" - -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." -msgstr "リビジョン式が空です。" - -#: lib/choose_rev.tcl:537 -msgid "Updated" -msgstr "更新しました" - -#: lib/choose_rev.tcl:565 -msgid "URL" -msgstr "URL" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "実行中…お待ち下さい…" - -#: lib/console.tcl:81 lib/checkout_op.tcl:146 lib/database.tcl:30 -#: lib/sshkey.tcl:55 -msgid "Close" -msgstr "閉じる" - -#: lib/console.tcl:186 -msgid "Success" -msgstr "成功" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "エラー: コマンドが失敗しました" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "%2$s から %1$s をフェッチしています" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "致命的エラー: %s を解決できません" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "ブランチ'%s'は存在しません。" - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "'%s' に簡易 git-pull を設定できませんでした" - -#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "'%s'というブランチは既に存在します。" - -#: lib/checkout_op.tcl:229 -#, 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:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "'%s' マージ戦略はサポートされていません。" - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "'%s' の更新に失敗しました。" - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "インデックスは既にロックされています。" - -#: lib/checkout_op.tcl:289 -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:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "作業ディレクトリを '%s' に更新しています…" - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "チェックアウトされたファイル" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "'%s' のチェックアウトを中止しました（ファイル毎のマージが必要です）。" - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "ファイル毎のマージが必要です。" - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "ブランチ '%s' に滞まります。" - -#: lib/checkout_op.tcl:452 -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:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "'%s' をチェックアウトしました" - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "'%s' を '%s' にリセットすると、以下のコミットが失なわれます:" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "失なわれたコミットを回復するのは簡単ではありません。" - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "'%s' をリセットしますか？" - -#: lib/checkout_op.tcl:571 lib/branch_create.tcl:85 -msgid "Reset" -msgstr "リセット" - -#: lib/checkout_op.tcl:635 -#, 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/blame.tcl:73 -msgid "File Viewer" -msgstr "ファイルピューワ" - -#: lib/blame.tcl:79 -msgid "Commit:" -msgstr "コミット:" - -#: lib/blame.tcl:280 -msgid "Copy Commit" -msgstr "コミットをコピー" - -#: lib/blame.tcl:284 -msgid "Find Text..." -msgstr "テキストを検索" - -#: lib/blame.tcl:288 -msgid "Goto Line..." -msgstr "指定行に移動…" - -#: lib/blame.tcl:297 -msgid "Do Full Copy Detection" -msgstr "コピー検知" - -#: lib/blame.tcl:301 -msgid "Show History Context" -msgstr "文脈を見せる" - -#: lib/blame.tcl:304 -msgid "Blame Parent Commit" -msgstr "親コミットを注釈" - -#: lib/blame.tcl:466 -#, tcl-format -msgid "Reading %s..." -msgstr "%s を読んでいます…" - -#: lib/blame.tcl:594 -msgid "Loading copy/move tracking annotations..." -msgstr "コピー・移動追跡データを読んでいます…" - -#: lib/blame.tcl:614 -msgid "lines annotated" -msgstr "行を注釈しました" - -#: lib/blame.tcl:806 -msgid "Loading original location annotations..." -msgstr "元位置行の注釈データを読んでいます…" - -#: lib/blame.tcl:809 -msgid "Annotation complete." -msgstr "注釈完了しました" - -#: lib/blame.tcl:839 -msgid "Busy" -msgstr "実行中" - -#: lib/blame.tcl:840 -msgid "Annotation process is already running." -msgstr "すでに blame プロセスを実行中です。" - -#: lib/blame.tcl:879 -msgid "Running thorough copy detection..." -msgstr "コピー検知を実行中…" - -#: lib/blame.tcl:947 -msgid "Loading annotation..." -msgstr "注釈を読み込んでいます…" - -#: lib/blame.tcl:1000 -msgid "Author:" -msgstr "作者:" - -#: lib/blame.tcl:1004 -msgid "Committer:" -msgstr "コミット者:" - -#: lib/blame.tcl:1009 -msgid "Original File:" -msgstr "元ファイル" - -#: lib/blame.tcl:1057 -msgid "Cannot find HEAD commit:" -msgstr "HEAD コミットが見つかりません" - -#: lib/blame.tcl:1112 -msgid "Cannot find parent commit:" -msgstr "親コミットが見つかりません:" - -#: lib/blame.tcl:1127 -msgid "Unable to display parent" -msgstr "親を表示できません" - -#: lib/blame.tcl:1128 lib/diff.tcl:356 -msgid "Error loading diff:" -msgstr "diff を読む際のエラーです:" - -#: lib/blame.tcl:1269 -msgid "Originally By:" -msgstr "原作者:" - -#: lib/blame.tcl:1275 -msgid "In File:" -msgstr "ファイル:" - -#: lib/blame.tcl:1280 -msgid "Copied Or Moved Here By:" -msgstr "複写・移動者:" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "Git のグラフィカルUI git-gui" - -#: lib/choose_repository.tcl:33 -msgid "Git Gui" -msgstr "Git GUI" - -#: lib/choose_repository.tcl:92 lib/choose_repository.tcl:412 -msgid "Create New Repository" -msgstr "新しいリポジトリを作る" - -#: lib/choose_repository.tcl:98 -msgid "New..." -msgstr "新規…" - -#: lib/choose_repository.tcl:105 lib/choose_repository.tcl:496 -msgid "Clone Existing Repository" -msgstr "既存リポジトリを複製する" - -#: lib/choose_repository.tcl:116 -msgid "Clone..." -msgstr "複製…" - -#: lib/choose_repository.tcl:123 lib/choose_repository.tcl:1064 -msgid "Open Existing Repository" -msgstr "既存リポジトリを開く" - -#: lib/choose_repository.tcl:129 -msgid "Open..." -msgstr "開く…" - -#: lib/choose_repository.tcl:142 -msgid "Recent Repositories" -msgstr "最近使ったリポジトリ" - -#: lib/choose_repository.tcl:148 -msgid "Open Recent Repository:" -msgstr "最近使ったリポジトリを開く" - -#: lib/choose_repository.tcl:316 lib/choose_repository.tcl:323 -#: lib/choose_repository.tcl:330 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "リポジトリ %s を作製できません:" - -#: lib/choose_repository.tcl:407 lib/branch_create.tcl:33 -msgid "Create" -msgstr "作成" - -#: lib/choose_repository.tcl:417 -msgid "Directory:" -msgstr "ディレクトリ:" - -#: lib/choose_repository.tcl:422 lib/choose_repository.tcl:509 -#: lib/choose_repository.tcl:518 lib/choose_repository.tcl:1074 -#: lib/browser.tcl:288 -msgid "Browse" -msgstr "ブラウズ" - -#: lib/choose_repository.tcl:447 lib/choose_repository.tcl:573 -#: lib/choose_repository.tcl:1098 -msgid "Git Repository" -msgstr "GIT リポジトリ" - -#: lib/choose_repository.tcl:472 -#, tcl-format -msgid "Directory %s already exists." -msgstr "ディレクトリ '%s' は既に存在します。" - -#: lib/choose_repository.tcl:476 -#, tcl-format -msgid "File %s already exists." -msgstr "ファイル '%s' は既に存在します。" - -#: lib/choose_repository.tcl:491 -msgid "Clone" -msgstr "複製" - -#: lib/choose_repository.tcl:504 -msgid "Source Location:" -msgstr "ソースの位置" - -#: lib/choose_repository.tcl:513 -msgid "Target Directory:" -msgstr "先ディレクトリ:" - -#: lib/choose_repository.tcl:523 -msgid "Clone Type:" -msgstr "複製方式:" - -#: lib/choose_repository.tcl:528 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "標準(高速・中冗長度・ハードリンク)" - -#: lib/choose_repository.tcl:533 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "全複写(低速・冗長バックアップ)" - -#: lib/choose_repository.tcl:538 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "共有(最高速・非推奨・バックアップ無し)" - -#: lib/choose_repository.tcl:545 -msgid "Recursively clone submodules too" -msgstr "サブモジュールも再帰的に複製する" - -#: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626 -#: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842 -#: lib/choose_repository.tcl:1104 lib/choose_repository.tcl:1112 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Git リポジトリではありません: %s" - -#: lib/choose_repository.tcl:615 -msgid "Standard only available for local repository." -msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。" - -#: lib/choose_repository.tcl:619 -msgid "Shared only available for local repository." -msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。" - -#: lib/choose_repository.tcl:640 -#, tcl-format -msgid "Location %s already exists." -msgstr "'%s' は既に存在します。" - -#: lib/choose_repository.tcl:651 -msgid "Failed to configure origin" -msgstr "origin を設定できませんでした" - -#: lib/choose_repository.tcl:663 -msgid "Counting objects" -msgstr "オブジェクトを数えています" - -#: lib/choose_repository.tcl:664 -msgid "buckets" -msgstr "バケツ" - -#: lib/choose_repository.tcl:688 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "objects/info/alternates を複写できません: %s" - -#: lib/choose_repository.tcl:724 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "%s から複製する内容はありません" - -#: lib/choose_repository.tcl:726 lib/choose_repository.tcl:940 -#: lib/choose_repository.tcl:952 -msgid "The 'master' branch has not been initialized." -msgstr "'master' ブランチが初期化されていません" - -#: lib/choose_repository.tcl:739 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "ハードリンクが作れないので、コピーします" - -#: lib/choose_repository.tcl:751 -#, tcl-format -msgid "Cloning from %s" -msgstr "%s から複製しています" - -#: lib/choose_repository.tcl:782 -msgid "Copying objects" -msgstr "オブジェクトを複写しています" - -#: lib/choose_repository.tcl:783 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:807 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "オブジェクトを複写できません: %s" - -#: lib/choose_repository.tcl:817 -msgid "Linking objects" -msgstr "オブジェクトを連結しています" - -#: lib/choose_repository.tcl:818 -msgid "objects" -msgstr "オブジェクト" - -#: lib/choose_repository.tcl:826 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "オブジェクトをハードリンクできません: %s" - -#: lib/choose_repository.tcl:881 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい" - -#: lib/choose_repository.tcl:892 -msgid "Cannot fetch tags. See console output for details." -msgstr "タグを取得できません。コンソール出力を見て下さい" - -#: lib/choose_repository.tcl:916 -msgid "Cannot determine HEAD. See console output for details." -msgstr "HEAD を確定できません。コンソール出力を見て下さい" - -#: lib/choose_repository.tcl:925 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "%s を掃除できません" - -#: lib/choose_repository.tcl:931 -msgid "Clone failed." -msgstr "複写に失敗しました。" - -#: lib/choose_repository.tcl:938 -msgid "No default branch obtained." -msgstr "デフォールト・ブランチが取得されませんでした" - -#: lib/choose_repository.tcl:949 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "%s をコミットとして解釈できません" - -#: lib/choose_repository.tcl:961 -msgid "Creating working directory" -msgstr "作業ディレクトリを作成しています" - -#: lib/choose_repository.tcl:962 lib/index.tcl:70 lib/index.tcl:136 -#: lib/index.tcl:207 -msgid "files" -msgstr "ファイル" - -#: lib/choose_repository.tcl:981 -msgid "Cannot clone submodules." -msgstr "サブモジュールが複製できません。" - -#: lib/choose_repository.tcl:990 -msgid "Cloning submodules" -msgstr "サブモジュールを複製しています" - -#: lib/choose_repository.tcl:1015 -msgid "Initial file checkout failed." -msgstr "初期チェックアウトに失敗しました" - -#: lib/choose_repository.tcl:1059 -msgid "Open" -msgstr "開く" - -#: lib/choose_repository.tcl:1069 -msgid "Repository:" -msgstr "リポジトリ:" - -#: lib/choose_repository.tcl:1118 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "リポジトリ %s を開けません:" - -#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "ブランチの名前変更" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "名前変更" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "ブランチ:" - -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "新しい名前:" - -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "名前を変更するブランチを選んで下さい。" - -#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 -msgid "Please supply a branch name." -msgstr "ブランチ名を指定して下さい。" - -#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' はブランチ名に使えません。" - -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "'%s'の名前変更に失敗しました。" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "ショートカットが書けません:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "アイコンが書けません:" - -#: lib/search.tcl:48 -msgid "Find:" -msgstr "検索:" - -#: lib/search.tcl:50 -msgid "Next" -msgstr "次" - -#: lib/search.tcl:51 -msgid "Prev" -msgstr "前" - -#: lib/search.tcl:52 -msgid "RegExp" -msgstr "正規表現" - -#: lib/search.tcl:54 -msgid "Case" -msgstr "大文字小文字を区別" - -#: lib/status_bar.tcl:87 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%1$s ... %4$*i %6$s 中の %2$*i (%7$3i%%)" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "ツールの追加" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "新規ツールコマンドの追加" - -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "全体に追加" - -#: lib/tools_dlg.tcl:37 lib/remote_add.tcl:30 -msgid "Add" -msgstr "追加" - -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "ツールの詳細" - -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "'/' でサブメニューを区切ります:" - -#: lib/tools_dlg.tcl:51 lib/remote_add.tcl:41 lib/branch_create.tcl:44 -msgid "Name:" -msgstr "名前:" - -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "コマンド:" - -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "起動する前にダイアログを表示" - -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "ユーザにコミットを一つ選ばせる ($REVISION にセットします)" - -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "ユーザに他の引数を追加させる ($ARGS にセットします)" - -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "コマンドからの出力ウィンドウを見せない" - -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "パッチが選ばれているときだけ動かす($FILENAME が空でない)" - -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "ツール名を指定して下さい。" - -#: lib/tools_dlg.tcl:126 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "ツール '%s' は既に存在します。" - -#: lib/tools_dlg.tcl:148 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"ツールを追加できません:\n" -"%s" - -#: lib/tools_dlg.tcl:187 -msgid "Remove Tool" -msgstr "ツールの削除" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "ツールコマンドの削除" - -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "削除" - -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "(青色はローカルレポジトリのツールです)" - -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "コマンドを起動: %s" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "引数" - -#: lib/tools_dlg.tcl:321 lib/branch_checkout.tcl:35 lib/browser.tcl:297 -msgid "Revision" -msgstr "リビジョン" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "OK" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "ファイルを選択してから %s を起動してください。" - -#: lib/tools.tcl:91 -#, tcl-format -msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "本当にファイル \"%2$s\"で %1$s を起動しますか?" - -#: lib/tools.tcl:95 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "本当に %s を起動しますか?" - -#: lib/tools.tcl:116 -#, tcl-format -msgid "Tool: %s" -msgstr "ツール: %s" - -#: lib/tools.tcl:117 -#, tcl-format -msgid "Running: %s" -msgstr "実行中: %s" - -#: lib/tools.tcl:155 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "ツールが完了しました: %s" - -#: lib/tools.tcl:157 -#, tcl-format -msgid "Tool failed: %s" -msgstr "ツールが失敗しました: %s" - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "共通の版を使いますか?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "自分の側の版を使いますか?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "相手制の版を使いますか?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"競合する変更点だけが表示されていることに注意してください。\n" -"\n" -"%s は上書きされます。\n" -"\n" -"やり直すにはマージ全体をやり直してください。" - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"ファイル %s には解決していない競合部分がまだあるようですが、いいですか?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "%s への解決をステージします" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "ツールでは削除やリンク競合は扱えません" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "競合ファイルは存在しません。" - -#: lib/mergetool.tcl:246 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "GUI マージツールではありません: %s" - -#: lib/mergetool.tcl:275 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "マージツール '%s' はサポートしていません" - -#: lib/mergetool.tcl:310 -msgid "Merge tool is already running, terminate it?" -msgstr "マージツールはすでに起動しています。終了しますか?" - -#: lib/mergetool.tcl:330 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"版の取り出し時にエラーが出ました:\n" -"%s" - -#: lib/mergetool.tcl:350 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"マージツールが起動できません:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:354 -msgid "Running merge tool..." -msgstr "マージツールを実行しています..." - -#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 -msgid "Merge tool failed." -msgstr "マージツールが失敗しました。" - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "全体エンコーディングに 無効な %s が指定されています" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "リポジトリエンコーディングに 無効な %s が指定されています" - -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "既定値に戻す" - -#: lib/option.tcl:123 -msgid "Save" -msgstr "保存" - -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "%s リポジトリ" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "大域（全てのリポジトリ）" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "ユーザ名" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "電子メールアドレス" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "マージコミットの要約" - -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "マージの冗長度" - -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "マージ後に diffstat を表示" - -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "マージツールを使用" - -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "ファイル変更時刻を信頼する" - -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "フェッチ中にトラッキングブランチを刈る" - -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "トラッキングブランチを合わせる" - -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "diff と注釈に textconv を使う" - -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "変更されたファイルのみコピー検知を行なう" - -#: lib/option.tcl:153 -msgid "Maximum Length of Recent Repositories List" -msgstr "最近使ったリポジトリ一覧の上限" - -#: lib/option.tcl:154 -msgid "Minimum Letters To Blame Copy On" -msgstr "コピーを検知する最少文字数" - -#: lib/option.tcl:155 -msgid "Blame History Context Radius (days)" -msgstr "注釈する履歴半径（日数）" - -#: lib/option.tcl:156 -msgid "Number of Diff Context Lines" -msgstr "diff の文脈行数" - -#: lib/option.tcl:157 -msgid "Additional Diff Parameters" -msgstr "diff の追加引数" - -#: lib/option.tcl:158 -msgid "Commit Message Text Width" -msgstr "コミットメッセージのテキスト幅" - -#: lib/option.tcl:159 -msgid "New Branch Name Template" -msgstr "新しいブランチ名のテンプレート" - -#: lib/option.tcl:160 -msgid "Default File Contents Encoding" -msgstr "ファイル内容のデフォールトエンコーディング" - -#: lib/option.tcl:161 -msgid "Warn before committing to a detached head" -msgstr "分離 HEAD のコミット前に警告する" - -#: lib/option.tcl:162 -msgid "Staging of untracked files" -msgstr "管理外のファイルをコミット予定する" - -#: lib/option.tcl:163 -msgid "Show untracked files" -msgstr "管理外のファイルを表示する" - -#: lib/option.tcl:164 -msgid "Tab spacing" -msgstr "タブ幅" - -#: lib/option.tcl:210 -msgid "Change" -msgstr "変更" - -#: lib/option.tcl:254 -msgid "Spelling Dictionary:" -msgstr "スペルチェック辞書" - -#: lib/option.tcl:284 -msgid "Change Font" -msgstr "フォントを変更" - -#: lib/option.tcl:288 -#, tcl-format -msgid "Choose %s" -msgstr "%s を選択" - -#: lib/option.tcl:294 -msgid "pt." -msgstr "ポイント" - -#: lib/option.tcl:308 -msgid "Preferences" -msgstr "設定" - -#: lib/option.tcl:310 lib/branch_checkout.tcl:39 lib/branch_create.tcl:69 -msgid "Options" -msgstr "オプション" - -#: lib/option.tcl:345 -msgid "Failed to completely save options:" -msgstr "完全にオプションを保存できません:" - -#: lib/database.tcl:42 -msgid "Number of loose objects" -msgstr "ばらばらなオブジェクトの数" - -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" -msgstr "ばらばらなオブジェクトの使用するディスク量" - -#: lib/database.tcl:44 -msgid "Number of packed objects" -msgstr "パックされたオブジェクトの数" - -#: lib/database.tcl:45 -msgid "Number of packs" -msgstr "パックの数" - -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" -msgstr "パックされたオブジェクトの使用するディスク量" - -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" -msgstr "パックに存在するので捨てて良いオブジェクトの数" - -#: lib/database.tcl:48 -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:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"このリポジトリにはおおよそ %i 個の個別オブジェクトがあります\n" -"\n" -"最適な性能を保つために、データベースを圧縮することを推奨します\n" -"\n" -"データベースを圧縮しますか？" - -#: lib/transport.tcl:6 lib/remote_add.tcl:132 -#, 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 -msgid "fetch all remotes" -msgstr "すべてのリモートを取得" - -#: lib/transport.tcl:26 -msgid "Fetching new changes from all remotes" -msgstr "すべてのリモートから新しい変更をフェッチしています" - -#: lib/transport.tcl:40 -msgid "remote prune all remotes" -msgstr "リモート刈込 すべてのリモート" - -#: lib/transport.tcl:41 -msgid "Pruning tracking branches deleted from all remotes" -msgstr "すべてのリモートから削除されたトラッキング・ブランチを刈っています" - -#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 -#: lib/remote_add.tcl:162 -#, tcl-format -msgid "push %s" -msgstr "%s をプッシュ" - -#: lib/transport.tcl:55 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "%s へ変更をプッシュしています" - -#: lib/transport.tcl:93 -#, tcl-format -msgid "Mirroring to %s" -msgstr "%s へミラーしています" - -#: lib/transport.tcl:111 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "%3$s へ %1$s %2$s をプッシュしています" - -#: lib/transport.tcl:132 -msgid "Push Branches" -msgstr "ブランチをプッシュ" - -#: lib/transport.tcl:147 -msgid "Source Branches" -msgstr "元のブランチ" - -#: lib/transport.tcl:162 -msgid "Destination Repository" -msgstr "送り先リポジトリ" - -#: lib/transport.tcl:205 -msgid "Transfer Options" -msgstr "通信オプション" - -#: lib/transport.tcl:207 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "既存ブランチを上書き(変更を破棄する可能性があります)" - -#: lib/transport.tcl:211 -msgid "Use thin pack (for slow network connections)" -msgstr "Thin Pack を使う（遅いネットワーク接続）" - -#: lib/transport.tcl:215 -msgid "Include tags" -msgstr "タグを含める" - -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "選択" - -#: lib/choose_font.tcl:55 -msgid "Font Family" -msgstr "フォント・ファミリー" - -#: lib/choose_font.tcl:76 -msgid "Font Size" -msgstr "フォントの大きさ" - -#: lib/choose_font.tcl:93 -msgid "Font Example" -msgstr "フォント・サンプル" - -#: lib/choose_font.tcl:105 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"これはサンプル文です。\n" -"このフォントが気に入ればお使いになれます。" - -#: lib/remote.tcl:200 -msgid "Push to" -msgstr "プッシュ先" - -#: lib/remote.tcl:218 -msgid "Remove Remote" -msgstr "リモートを削除" - -#: lib/remote.tcl:223 -msgid "Prune from" -msgstr "から刈込む…" - -#: lib/remote.tcl:228 -msgid "Fetch from" -msgstr "取得元" - -#: lib/diff.tcl:77 -#, 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:117 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "%s の変更点をロード中…" - -#: lib/diff.tcl:140 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOCAL: 削除\n" -"Remote:\n" - -#: lib/diff.tcl:145 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"REMOTE: 削除\n" -"LOCAL:\n" - -#: lib/diff.tcl:152 -msgid "LOCAL:\n" -msgstr "LOCAL:\n" - -#: lib/diff.tcl:155 -msgid "REMOTE:\n" -msgstr "REMOTE\n" - -#: lib/diff.tcl:217 lib/diff.tcl:355 -#, tcl-format -msgid "Unable to display %s" -msgstr "%s を表示できません" - -#: lib/diff.tcl:218 -msgid "Error loading file:" -msgstr "ファイルを読む際のエラーです:" - -#: lib/diff.tcl:225 -msgid "Git Repository (subproject)" -msgstr "Git リポジトリ(サブプロジェクト)" - -#: lib/diff.tcl:237 -msgid "* Binary file (not showing content)." -msgstr "* バイナリファイル(内容は表示しません)" - -#: lib/diff.tcl:242 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* 管理外のファイルの大きさは %d バイトです。\n" -"* 最初の %d バイトだけ表示しています。\n" - -#: lib/diff.tcl:248 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"\n" -"* %s は管理外のファイルをここで切りおとしました。\n" -"* 全体を見るには外部エディタを使ってください。\n" - -#: lib/diff.tcl:578 -msgid "Failed to unstage selected hunk." -msgstr "選択されたパッチをコミット予定から外せません。" - -#: lib/diff.tcl:585 -msgid "Failed to stage selected hunk." -msgstr "選択されたパッチをコミット予定に加えられません。" - -#: lib/diff.tcl:664 -msgid "Failed to unstage selected line." -msgstr "選択されたパッチ行をコミット予定から外せません。" - -#: lib/diff.tcl:672 -msgid "Failed to stage selected line." -msgstr "選択されたパッチ行をコミット予定に加えられません。" - -#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "ブランチをチェックアウト" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "チェックアウト" - -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "トラッキング・ブランチをフェッチ" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "ローカル・ブランチから削除" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "インデックスをロックできません" - -#: lib/index.tcl:17 -msgid "Index Error" -msgstr "索引エラー" - -#: lib/index.tcl:19 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンし" -"ます。" - -#: lib/index.tcl:30 -msgid "Continue" -msgstr "続行" - -#: lib/index.tcl:33 -msgid "Unlock Index" -msgstr "インデックスのロック解除" - -#: lib/index.tcl:298 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "コミットから '%s' を降ろす" - -#: lib/index.tcl:337 -msgid "Ready to commit." -msgstr "コミット準備完了" - -#: lib/index.tcl:350 -#, tcl-format -msgid "Adding %s" -msgstr "コミットに %s を加えています" - -#: lib/index.tcl:380 -#, tcl-format -msgid "Stage %d untracked files?" -msgstr "管理外の %d ファイルをコミット予定としますか？" - -#: lib/index.tcl:428 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "ファイル %s にした変更を元に戻しますか？" - -#: lib/index.tcl:430 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "これら %i 個のファイルにした変更を元に戻しますか？" - -#: lib/index.tcl:438 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。" - -#: lib/index.tcl:441 -msgid "Do Nothing" -msgstr "何もしない" - -#: lib/index.tcl:459 -msgid "Reverting selected files" -msgstr "選択されたファイルにした変更を元に戻します" - -#: lib/index.tcl:463 -#, tcl-format -msgid "Reverting %s" -msgstr "%s にした変更を元に戻します" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "キーがありません。" - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "公開鍵がありました: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "鍵を生成" - -#: lib/sshkey.tcl:58 -msgid "Copy To Clipboard" -msgstr "クリップボードにコピー" - -#: lib/sshkey.tcl:72 -msgid "Your OpenSSH Public Key" -msgstr "あなたの OpenSSH 公開鍵" - -#: lib/sshkey.tcl:80 -msgid "Generating..." -msgstr "生成中..." - -#: lib/sshkey.tcl:86 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"ssh-keygen を起動できません:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:113 -msgid "Generation failed." -msgstr "生成に失敗しました。" - -#: lib/sshkey.tcl:120 -msgid "Generation succeeded, but no keys found." -msgstr "生成には成功しましたが、鍵が見つかりません。" - -#: lib/sshkey.tcl:123 -#, tcl-format -msgid "Your key is in: %s" -msgstr "あなたの鍵は %s にあります" - -#: 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:48 -msgid "Error loading commit data for amend:" -msgstr "訂正するコミットのデータを読めません:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "ユーザの正体を確認できません:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "GIT_COMMITTER_IDENT が無効です:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません" - -#: lib/commit.tcl:149 -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:173 -#, 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:181 -#, 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:189 -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:204 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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:235 -msgid "Calling pre-commit hook..." -msgstr "コミット前フックを実行中・・・" - -#: lib/commit.tcl:250 -msgid "Commit declined by pre-commit hook." -msgstr "コミット前フックがコミットを拒否しました" - -#: lib/commit.tcl:269 -msgid "" -"You are about to commit on a detached head. This is a potentially dangerous " -"thing to do because if you switch to another branch you will lose your " -"changes and it can be difficult to retrieve them later from the reflog. You " -"should probably cancel this commit and create a new branch to continue.\n" -" \n" -" Do you really want to proceed with your Commit?" -msgstr "" -"分離 HEAD での変更をコミットしようとしています。" -"これは潜在的に危険な行為で、理由は別のブランチへの切り替えで" -"変更が消失し、reflog からの事後復旧も困難となるためです。" -"おそらくこのコミットはキャンセルし新しく作成したブランチで" -"行うべきです。\n" -"\n" -" 本当にコミットを続行しますか？" - -#: lib/commit.tcl:290 -msgid "Calling commit-msg hook..." -msgstr "コミット・メッセージ・フックを実行中・・・" - -#: lib/commit.tcl:305 -msgid "Commit declined by commit-msg hook." -msgstr "コミット・メッセージ・フックがコミットを拒否しました" - -#: lib/commit.tcl:318 -msgid "Committing changes..." -msgstr "変更点をコミット中・・・" - -#: lib/commit.tcl:334 -msgid "write-tree failed:" -msgstr "write-tree が失敗しました:" - -#: lib/commit.tcl:335 lib/commit.tcl:379 lib/commit.tcl:400 -msgid "Commit failed." -msgstr "コミットに失敗しました。" - -#: lib/commit.tcl:352 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "コミット %s は壊れています" - -#: lib/commit.tcl:357 -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:364 -msgid "No changes to commit." -msgstr "コミットする変更がありません。" - -#: lib/commit.tcl:378 -msgid "commit-tree failed:" -msgstr "commit-tree が失敗しました:" - -#: lib/commit.tcl:399 -msgid "update-ref failed:" -msgstr "update-ref が失敗しました:" - -#: lib/commit.tcl:492 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "コミット %s を作成しました: %s" - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "起動中…" - -#: lib/browser.tcl:27 -msgid "File Browser" -msgstr "ファイル・ブラウザ" - -#: lib/browser.tcl:132 lib/browser.tcl:149 -#, tcl-format -msgid "Loading %s..." -msgstr "%s をロード中…" - -#: lib/browser.tcl:193 -msgid "[Up To Parent]" -msgstr "[上位フォルダへ]" - -#: lib/browser.tcl:275 lib/browser.tcl:282 -msgid "Browse Branch Files" -msgstr "現在のブランチのファイルを見る" - -#: lib/remote_add.tcl:20 -msgid "Add Remote" -msgstr "リモートを追加" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "リモートを新規に追加" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "リモートの詳細" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "場所:" - -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "その他の動作" - -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "即座に取得" - -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "リモートレポジトリを初期化してプッシュ" - -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "何もしない" - -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "リモート名を指定して下さい。" - -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' はリモート名に使えません。" - -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "場所 '%2$s' のリモート '%1$s'の名前変更に失敗しました。" - -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "%s からフェッチしています" - -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "リポジトリ '%s' を初期化できません。" - -#: lib/remote_add.tcl:163 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "%2$s にある %1$s をセットアップします" - -#: lib/line.tcl:17 -msgid "Goto Line:" -msgstr "行番号" - -#: lib/line.tcl:23 -msgid "Go" -msgstr "移動" - -#: lib/branch_create.tcl:23 -msgid "Create Branch" -msgstr "ブランチを作成" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "ブランチを新規作成" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "ブランチ名" - -#: lib/branch_create.tcl:57 -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:97 -msgid "Checkout After Creation" -msgstr "作成してすぐチェックアウト" - -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "トラッキング・ブランチを選択して下さい。" - -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "" -"トラッキング・ブランチ %s はリモートリポジトリのブランチではありません。" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "サポートされていないスペルチェッカーです" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "スペルチェック機能は使えません" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "スペルチェックの設定が不正です" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "辞書を %s に巻き戻します" - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "スペルチェッカーの起動に失敗しました" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "スペルチェッカーが判別できません" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "提案なし" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "スペルチェッカーが予想外の EOF を返しました" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "スペルチェック失敗" diff --git a/third_party/git/git-gui/po/nb.po b/third_party/git/git-gui/po/nb.po deleted file mode 100644 index d66aa5026391..000000000000 --- a/third_party/git/git-gui/po/nb.po +++ /dev/null @@ -1,2474 +0,0 @@ -# Norwegian (Bokmål) translation of git-gui. -# Copyright (C) 2007-2008 Shawn Pearce, et al. -# This file is distributed under the same license as the git-gui package. -# -# Fredrik Skolmli <fredrik@frsk.net>, 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: nb\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-16 13:56-0800\n" -"PO-Revision-Date: 2008-12-03 16:05+0100\n" -"Last-Translator: Fredrik Skolmli <fredrik@frsk.net>\n" -"Language-Team: Norwegian Bokmål\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:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 -#: git-gui.sh:866 -msgid "git-gui: fatal error" -msgstr "git-gui: Kritisk feil" - -#: git-gui.sh:689 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Ugyldig font spesifisert i %s:" - -#: git-gui.sh:723 -msgid "Main Font" -msgstr "Hovedskrifttype" - -#: git-gui.sh:724 -msgid "Diff/Console Font" -msgstr "Diff-/Konsollskrifttype" - -#: git-gui.sh:738 -msgid "Cannot find git in PATH." -msgstr "Kan ikke finne git i PATH" - -#: git-gui.sh:765 -msgid "Cannot parse Git version string:" -msgstr "Kan ikke tyde Git's oppgitte versjon:" - -#: git-gui.sh:783 -#, 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 "" -"Kan ikke avgjøre hvilken Git-versjon du har.\n" -"\n" -"%s sier versjonen er '%s'.\n" -"\n" -"%s krever Git versjon 1.5.0 eller nyere.\n" -"\n" -"Anta at '%s' er versjon 1.5.0?\n" - -#: git-gui.sh:1062 -msgid "Git directory not found:" -msgstr "Git-katalog ikke funnet:" - -#: git-gui.sh:1069 -msgid "Cannot move to top of working directory:" -msgstr "Kan ikke gå til toppen av arbeidskatalogen:" - -#: git-gui.sh:1076 -msgid "Cannot use funny .git directory:" -msgstr "" - -#: git-gui.sh:1081 -msgid "No working directory" -msgstr "Ingen arbeidskatalog" - -#: git-gui.sh:1247 lib/checkout_op.tcl:305 -msgid "Refreshing file status..." -msgstr "Oppdaterer filstatus..." - -#: git-gui.sh:1303 -msgid "Scanning for modified files ..." -msgstr "Søker etter endrede filer..." - -#: git-gui.sh:1367 -msgid "Calling prepare-commit-msg hook..." -msgstr "" - -#: git-gui.sh:1384 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "" - -#: git-gui.sh:1542 lib/browser.tcl:246 -msgid "Ready." -msgstr "Klar." - -#: git-gui.sh:1819 -msgid "Unmodified" -msgstr "Uendret" - -#: git-gui.sh:1821 -msgid "Modified, not staged" -msgstr "Endret, ikke køet" - -#: git-gui.sh:1822 git-gui.sh:1830 -msgid "Staged for commit" -msgstr "Køet for innsjekking" - -#: git-gui.sh:1823 git-gui.sh:1831 -msgid "Portions staged for commit" -msgstr "Delvis køet for innsjekking" - -#: git-gui.sh:1824 git-gui.sh:1832 -msgid "Staged for commit, missing" -msgstr "Klar for innsjekking, fraværende" - -#: git-gui.sh:1826 -msgid "File type changed, not staged" -msgstr "Filtype endret, ikke køet" - -#: git-gui.sh:1827 -msgid "File type changed, staged" -msgstr "Filtype endret, køet" - -#: git-gui.sh:1829 -msgid "Untracked, not staged" -msgstr "Usporet, ikke køet" - -#: git-gui.sh:1834 -msgid "Missing" -msgstr "Fraværende" - -#: git-gui.sh:1835 -msgid "Staged for removal" -msgstr "Køet for fjerning" - -#: git-gui.sh:1836 -msgid "Staged for removal, still present" -msgstr "Køet for fjerning, fortsatt tilstede" - -#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 -#: git-gui.sh:1842 git-gui.sh:1843 -msgid "Requires merge resolution" -msgstr "Sammenslåingen krever konflikthåndtering" - -#: git-gui.sh:1878 -msgid "Starting gitk... please wait..." -msgstr "Starter gitk... Vennligst vent..." - -#: git-gui.sh:1887 -msgid "Couldn't find gitk in PATH" -msgstr "Kunne ikke finne gitk i PATH" - -#: git-gui.sh:2280 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Arkiv" - -#: git-gui.sh:2281 -msgid "Edit" -msgstr "Redigere" - -#: git-gui.sh:2283 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Gren" - -#: git-gui.sh:2286 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Innsjekking" - -#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Sammenslåing" - -#: git-gui.sh:2290 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Fjernarkiv" - -#: git-gui.sh:2293 -msgid "Tools" -msgstr "Verktøy" - -#: git-gui.sh:2302 -msgid "Explore Working Copy" -msgstr "Utforsk arbeidskopien" - -#: git-gui.sh:2307 -msgid "Browse Current Branch's Files" -msgstr "Utforsk denne grens filer" - -#: git-gui.sh:2311 -msgid "Browse Branch Files..." -msgstr "Bla igjennom filer på gren..." - -#: git-gui.sh:2316 -msgid "Visualize Current Branch's History" -msgstr "Visualiser denne grens historikk" - -#: git-gui.sh:2320 -msgid "Visualize All Branch History" -msgstr "Visualiser alle greners historikk" - -#: git-gui.sh:2327 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Bla i filene til %s" - -#: git-gui.sh:2329 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Visualiser historien til %s" - -#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Databasestatistikk" - -#: git-gui.sh:2337 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Kompress databasen" - -#: git-gui.sh:2340 -msgid "Verify Database" -msgstr "Verifiser databasen" - -#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 -msgid "Create Desktop Icon" -msgstr "Lag skrivebordsikon" - -#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Avslutt" - -#: git-gui.sh:2371 -msgid "Undo" -msgstr "Angre" - -#: git-gui.sh:2374 -msgid "Redo" -msgstr "Gjør om" - -#: git-gui.sh:2378 git-gui.sh:2923 -msgid "Cut" -msgstr "Klipp ut" - -#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Kopier" - -#: git-gui.sh:2384 git-gui.sh:2929 -msgid "Paste" -msgstr "Lim inn" - -#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Slett" - -#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71 -msgid "Select All" -msgstr "Velg alle" - -#: git-gui.sh:2400 -msgid "Create..." -msgstr "Opprett..." - -#: git-gui.sh:2406 -msgid "Checkout..." -msgstr "Sjekk ut..." - -#: git-gui.sh:2412 -msgid "Rename..." -msgstr "Endre navn..." - -#: git-gui.sh:2417 -msgid "Delete..." -msgstr "Slett..." - -#: git-gui.sh:2422 -msgid "Reset..." -msgstr "Tilbakestill..." - -#: git-gui.sh:2432 -msgid "Done" -msgstr "Ferdig" - -#: git-gui.sh:2434 -msgid "Commit@@verb" -msgstr "Sjekk inn" - -#: git-gui.sh:2443 git-gui.sh:2864 -msgid "New Commit" -msgstr "Ny innsjekking" - -#: git-gui.sh:2451 git-gui.sh:2871 -msgid "Amend Last Commit" -msgstr "Legg til forrige innsjekking" - -#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Søk på ny" - -#: git-gui.sh:2467 -msgid "Stage To Commit" -msgstr "Legg til i innsjekkingskøen" - -#: git-gui.sh:2473 -msgid "Stage Changed Files To Commit" -msgstr "Legg til endrede filer i innsjekkingskøen" - -#: git-gui.sh:2479 -msgid "Unstage From Commit" -msgstr "Fjern fra innsjekkingskøen" - -#: git-gui.sh:2484 lib/index.tcl:410 -msgid "Revert Changes" -msgstr "Tilbakestill endringer" - -#: git-gui.sh:2491 git-gui.sh:3069 -msgid "Show Less Context" -msgstr "Vis mindre innhold" - -#: git-gui.sh:2495 git-gui.sh:3073 -msgid "Show More Context" -msgstr "Vis mer innhold" - -#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947 -msgid "Sign Off" -msgstr "Signér" - -#: git-gui.sh:2518 -msgid "Local Merge..." -msgstr "Lokal sammenslåing..." - -#: git-gui.sh:2523 -msgid "Abort Merge..." -msgstr "Avbryt sammenslåing..." - -#: git-gui.sh:2535 git-gui.sh:2575 -msgid "Add..." -msgstr "Legg til..." - -#: git-gui.sh:2539 -msgid "Push..." -msgstr "Send..." - -#: git-gui.sh:2543 -msgid "Delete Branch..." -msgstr "Fjern gren..." - -#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Om %s" - -#: git-gui.sh:2557 -msgid "Preferences..." -msgstr "Innstillinger..." - -#: git-gui.sh:2565 git-gui.sh:3115 -msgid "Options..." -msgstr "Alternativer..." - -#: git-gui.sh:2576 -msgid "Remove..." -msgstr "Fjern..." - -#: git-gui.sh:2585 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Hjelp" - -#: git-gui.sh:2611 -msgid "Online Documentation" -msgstr "Online dokumentasjon" - -#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Vis SSH-nøkkel" - -#: git-gui.sh:2707 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"kritisk: kunne ikke finne status for sti %s: Ingen slik fil eller katalog" - -#: git-gui.sh:2740 -msgid "Current Branch:" -msgstr "Nåværende gren:" - -#: git-gui.sh:2761 -msgid "Staged Changes (Will Commit)" -msgstr "Køede endringer (til innsjekking)" - -#: git-gui.sh:2781 -msgid "Unstaged Changes" -msgstr "Ukøede endringer" - -#: git-gui.sh:2831 -msgid "Stage Changed" -msgstr "Kø endret" - -#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182 -msgid "Push" -msgstr "Send" - -#: git-gui.sh:2885 -msgid "Initial Commit Message:" -msgstr "Innledende innsjekkingsmelding:" - -#: git-gui.sh:2886 -msgid "Amended Commit Message:" -msgstr "Utdypt innsjekkingsmelding" - -#: git-gui.sh:2887 -msgid "Amended Initial Commit Message:" -msgstr "Utdypt innledende innsjekkingsmelding:" - -#: git-gui.sh:2888 -msgid "Amended Merge Commit Message:" -msgstr "Utdypt innsjekkingsmelding for sammenslåing:" - -#: git-gui.sh:2889 -msgid "Merge Commit Message:" -msgstr "Revisjonsmelding for sammenslåing:" - -#: git-gui.sh:2890 -msgid "Commit Message:" -msgstr "Revisjonsmelding:" - -#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73 -msgid "Copy All" -msgstr "Kopier alle" - -#: git-gui.sh:2963 lib/blame.tcl:104 -msgid "File:" -msgstr "Fil:" - -#: git-gui.sh:3078 -msgid "Refresh" -msgstr "Oppdater" - -#: git-gui.sh:3099 -msgid "Decrease Font Size" -msgstr "Gjør teksten mindre" - -#: git-gui.sh:3103 -msgid "Increase Font Size" -msgstr "Gjør teksten større" - -#: git-gui.sh:3111 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Tekstkoding" - -#: git-gui.sh:3122 -msgid "Apply/Reverse Hunk" -msgstr "Bruk/tilbakestill del" - -#: git-gui.sh:3127 -msgid "Apply/Reverse Line" -msgstr "Bruk/tilbakestill linje" - -#: git-gui.sh:3137 -msgid "Run Merge Tool" -msgstr "Start sammenslåingsprosess" - -#: git-gui.sh:3142 -msgid "Use Remote Version" -msgstr "Bruk versjon fra fjernarkiv" - -#: git-gui.sh:3146 -msgid "Use Local Version" -msgstr "Bruk lokal versjon" - -#: git-gui.sh:3150 -msgid "Revert To Base" -msgstr "Tilbakestill til baseversjonen" - -#: git-gui.sh:3169 -msgid "Unstage Hunk From Commit" -msgstr "Fjern delen fra innsjekkingskøen" - -#: git-gui.sh:3170 -msgid "Unstage Line From Commit" -msgstr "Fjern linjen fra innsjekkingskøen" - -#: git-gui.sh:3172 -msgid "Stage Hunk For Commit" -msgstr "Legg del i innsjekkingskøen" - -#: git-gui.sh:3173 -msgid "Stage Line For Commit" -msgstr "Legg til linje i innsjekkingskøen" - -#: git-gui.sh:3196 -msgid "Initializing..." -msgstr "Initsialiserer..." - -#: git-gui.sh:3301 -#, 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:3331 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" - -#: git-gui.sh:3336 -#, 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:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - Et grafisk brukergrensesnitt for Git." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Filviser" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Innsjekking:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Kopier innsjekking" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Søk etter tekst..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Gjennomfør full deteksjon av kopieringer" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Vis historikkens innhold" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Leser %s..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "" - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "" - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "" - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Opptatt" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "" - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Kjører kopidetektering..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "" - -#: lib/blame.tcl:964 -msgid "Author:" -msgstr "Forfatter:" - -#: lib/blame.tcl:968 -msgid "Committer:" -msgstr "Innsjekker:" - -#: lib/blame.tcl:973 -msgid "Original File:" -msgstr "Opprinnelig fil:" - -#: lib/blame.tcl:1021 -msgid "Cannot find HEAD commit:" -msgstr "Finner ikke HEAD's innsjekking:" - -#: lib/blame.tcl:1076 -msgid "Cannot find parent commit:" -msgstr "Kan ikke finne innsjekkingens forelder:" - -#: lib/blame.tcl:1091 -msgid "Unable to display parent" -msgstr "Kan ikke vise forelder" - -#: lib/blame.tcl:1092 lib/diff.tcl:297 -msgid "Error loading diff:" -msgstr "Feil ved innlasting av forskjell:" - -#: lib/blame.tcl:1232 -msgid "Originally By:" -msgstr "Opprinnelig av:" - -#: lib/blame.tcl:1238 -msgid "In File:" -msgstr "I fil:" - -#: lib/blame.tcl:1243 -msgid "Copied Or Moved Here By:" -msgstr "Kopiert eller flyttet hit av:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Sjekk ut gren" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "Utsjekking" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:97 -msgid "Cancel" -msgstr "Avbryt" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Revisjon" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Valg" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Hent sporet gren" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Koble bort lokal gren" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Opprett gren" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Opprett ny gren" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377 -msgid "Create" -msgstr "Opprett" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Navn på gren" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Navn:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Bruk navn på sporet gren" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Starter revisjon" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Oppdater eksisterende gren:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nei" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Kun hurtigfremspoling" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536 -msgid "Reset" -msgstr "Tilbakestill" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Sjekk ut etter oppretting" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Velg en gren som skal følges." - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Den fulgte grenen %s er ikke en gren i fjernarkivet." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Angi et navn for grenen." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' kan ikke brukes som navn på en gren." - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Fjern gren" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Fjern lokal gren" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Lokale grener" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Fjern kun ved sammenslåing" - -#: lib/branch_delete.tcl:54 -msgid "Always (Do not perform merge test.)" -msgstr "Alltid (Ikke utfør sammenslåingstest.)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Følgende grener er ikke fullstendig slått sammen med %s:" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Kunne ikke fjerne grener:\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Gi gren nytt navn" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Endre navn" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Gren:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Nytt navn:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Vennligst velg grenen du vil endre navn på." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Grenen '%s' eksisterer allerede." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Kunne ikke endre navnet '%s'." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Starter..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Utforsker" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Laster %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Opp til forelder]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Bla igjennom grenens filer" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:394 -#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 -#: lib/choose_repository.tcl:995 -msgid "Browse" -msgstr "Bla igjennom" - -#: lib/checkout_op.tcl:84 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Henter %s fra %s" - -#: lib/checkout_op.tcl:132 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "kritisk: Kan ikke åpne %s" - -#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Lukk" - -#: lib/checkout_op.tcl:174 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Grenen '%s' eksisterer ikke." - -#: lib/checkout_op.tcl:193 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Kunne ikke konfigurere forenklet git-pull for '%s'." - -#: lib/checkout_op.tcl:228 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"Grenen '%s' eksisterer allerede.\n" -"\n" -"Den kan ikke hurtigfremspoles til %s.\n" -"En sammenslåing er påkrevd." - -#: lib/checkout_op.tcl:242 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Sammenslåingsstrategien '%s' er ikke støttet." - -#: lib/checkout_op.tcl:261 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Kunne ikke oppdatere '%s'." - -#: lib/checkout_op.tcl:273 -msgid "Staging area (index) is already locked." -msgstr "Køområdet (index) er allerede låst." - -#: lib/checkout_op.tcl:288 -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:344 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Oppdaterer arbeidskatalogen til '%s'..." - -#: lib/checkout_op.tcl:345 -msgid "files checked out" -msgstr "filer sjekket ut" - -#: lib/checkout_op.tcl:375 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Avbrøt utsjekkingen av '%s' (sammenslåing på filnivå kreves)." - -#: lib/checkout_op.tcl:376 -msgid "File level merge required." -msgstr "Sammenslåing på filnivå kreves" - -#: lib/checkout_op.tcl:380 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Blir stående på grenen '%s'." - -#: lib/checkout_op.tcl:451 -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:468 lib/checkout_op.tcl:472 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Sjekket ut '%s'." - -#: lib/checkout_op.tcl:500 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "" -"Tilbakestilling av '%s' til '%s' vil medføre tap av følgende innsjekkinger:" - -#: lib/checkout_op.tcl:522 -msgid "Recovering lost commits may not be easy." -msgstr "" -"Det vil kanskje ikke være så enkelt å gjenopprette en tapt innsjekking." - -#: lib/checkout_op.tcl:527 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Tilbakestill '%s'?" - -#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Visualiser" - -#: lib/checkout_op.tcl:600 -#, 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 "Velg" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Skrifttype-familie" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Skriftstørrelse" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Skrifteksempel" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Dette er en eksempeltekst.\n" -"Hvis du liker hvordan teksten ser ut, kan du velge dette som din skrifttype." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 -msgid "Create New Repository" -msgstr "Opprett nytt arkiv" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Ny..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 -msgid "Clone Existing Repository" -msgstr "Klon eksistererende arkiv" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Klon..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 -msgid "Open Existing Repository" -msgstr "Åpne eksistererende arkiv" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Åpne..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Nylig brukte arkiv" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Åpne nylig brukt arkiv:" - -#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 -#: lib/choose_repository.tcl:316 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Kunne ikke opprette arkivet %s:" - -#: lib/choose_repository.tcl:387 -msgid "Directory:" -msgstr "Mappe:" - -#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 -#: lib/choose_repository.tcl:1017 -msgid "Git Repository" -msgstr "Git arkiv" - -#: lib/choose_repository.tcl:442 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Mappen %s eksisterer allerede." - -#: lib/choose_repository.tcl:446 -#, tcl-format -msgid "File %s already exists." -msgstr "Filen %s eksisterer allerede." - -#: lib/choose_repository.tcl:460 -msgid "Clone" -msgstr "Klon" - -#: lib/choose_repository.tcl:473 -msgid "Source Location:" -msgstr "Kildeplassering:" - -#: lib/choose_repository.tcl:484 -msgid "Target Directory:" -msgstr "Destinasjonsmappe:" - -#: lib/choose_repository.tcl:496 -msgid "Clone Type:" -msgstr "Klontype:" - -#: lib/choose_repository.tcl:502 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (rask, delvis redundant, hardlinker)" - -#: lib/choose_repository.tcl:508 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Full kopi (tregere, redundant sikkerhetskopi)" - -#: lib/choose_repository.tcl:514 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Delt (raskest, ikke anbefalt, ingen sikkerhetskopiering)" - -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 -#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 -#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Ikke et Git-arkiv: %s" - -#: lib/choose_repository.tcl:586 -msgid "Standard only available for local repository." -msgstr "Standard er kun tilgjengelig for lokalt arkiv." - -#: lib/choose_repository.tcl:590 -msgid "Shared only available for local repository." -msgstr "Delt er kun tilgjengelig for lokalt arkiv." - -#: lib/choose_repository.tcl:611 -#, tcl-format -msgid "Location %s already exists." -msgstr "Stedet %s eksisterer allerede." - -#: lib/choose_repository.tcl:622 -msgid "Failed to configure origin" -msgstr "Kunne ikke konfigurere kildeoppføring" - -#: lib/choose_repository.tcl:634 -msgid "Counting objects" -msgstr "Teller objekter" - -#: lib/choose_repository.tcl:635 -msgid "buckets" -msgstr "bøtter" - -#: lib/choose_repository.tcl:659 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Kunne ikke kopiere objekter/informasjon/alternativt: %s" - -#: lib/choose_repository.tcl:695 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Ingenting å klone fra %s." - -#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 -#: lib/choose_repository.tcl:923 -msgid "The 'master' branch has not been initialized." -msgstr "Grenen 'master' har ikke blitt initsialisert." - -#: lib/choose_repository.tcl:710 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Harde linker er utilgjengelig. Går tilbake til kopiering." - -#: lib/choose_repository.tcl:722 -#, tcl-format -msgid "Cloning from %s" -msgstr "Kloner fra %s" - -#: lib/choose_repository.tcl:753 -msgid "Copying objects" -msgstr "Kopierer objekter" - -#: lib/choose_repository.tcl:754 -msgid "KiB" -msgstr "kB" - -#: lib/choose_repository.tcl:778 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Kunne ikke kopiere objekt: %s" - -#: lib/choose_repository.tcl:788 -msgid "Linking objects" -msgstr "Lenker objekter" - -#: lib/choose_repository.tcl:789 -msgid "objects" -msgstr "objekter" - -#: lib/choose_repository.tcl:797 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Kunne ikke opprette hardlink med objektet: %s" - -#: lib/choose_repository.tcl:852 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "Kunne ikke hente grener og objekter. Se utdata i konsoll for detaljer." - -#: lib/choose_repository.tcl:863 -msgid "Cannot fetch tags. See console output for details." -msgstr "Kunne ikke hente tagger. Se utdata i konsoll for detaljer." - -#: lib/choose_repository.tcl:887 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Kan ikke bestemme HEAD. Se utdata i konsoll for detaljer." - -#: lib/choose_repository.tcl:896 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Kunne ikke rydde opp %s" - -#: lib/choose_repository.tcl:902 -msgid "Clone failed." -msgstr "Kloning feilet." - -#: lib/choose_repository.tcl:909 -msgid "No default branch obtained." -msgstr "Ingen standardgren hentet." - -#: lib/choose_repository.tcl:920 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Kan ikke finne %s som en innsjekking." - -#: lib/choose_repository.tcl:932 -msgid "Creating working directory" -msgstr "Oppretter arbeidskatalog" - -#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 -#: lib/index.tcl:196 -msgid "files" -msgstr "filer" - -#: lib/choose_repository.tcl:962 -msgid "Initial file checkout failed." -msgstr "Initsialiserende utsjekking feilet." - -#: lib/choose_repository.tcl:978 -msgid "Open" -msgstr "Åpne" - -#: lib/choose_repository.tcl:988 -msgid "Repository:" -msgstr "Arkiv:" - -#: lib/choose_repository.tcl:1037 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Kunne ikke åpne arkivet %s:" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Denne frakoblede utsjekkingen" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Revisjonsuttrykk:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Lokal gren" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Sporet gren" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Tag" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Ugyldig revisjon: %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Ingen revisjoner valgt." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "Revisjonsuttrykk er tomt." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Oppdatert" - -#: lib/choose_rev.tcl:559 -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 "" -"Det er ingenting å legge til.\n" -"\n" -"Du er i ferd med å lage den initsialiserende revisjonen. Det er ingen " -"tidligere revisjoner å tilføye.\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 "" -"Kan ikke tilføye under sammenslåing.\n" -"\n" -"Du er for øyeblikket under en pågående sammenslåing som ikke er fullført. Du " -"kan ikke tilføye en tidligere revisjon med mindre du først avbryter denne " -"sammenslåingen.\n" - -#: lib/commit.tcl:49 -msgid "Error loading commit data for amend:" -msgstr "Feil ved innhenting av revisjonsdata for tilføying:" - -#: lib/commit.tcl:76 -msgid "Unable to obtain your identity:" -msgstr "Kunne ikke avgjøre din identitet:" - -#: lib/commit.tcl:81 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Ugyldig 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 "" - -#: lib/commit.tcl:156 -#, 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:164 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Ukjent filstatus %s er funnet.\n" -"\n" -"Filen %s kan ikke sjekkes inn av dette programmet.\n" - -#: lib/commit.tcl:172 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Ingen endringer å sjekke inn.\n" -"\n" -"Du må køe minst en fil før du kan sjekke inn noe.\n" - -#: lib/commit.tcl:187 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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 "" -"Vennligst angi en revisjonsmelding.\n" -"\n" -"En god melding har følgende format:\n" -"\n" -"- Første linje: En beskrivelse av hva du har gjort i én setning.\n" -"- Andre linje: Blank\n" -"- Resterende linjer: Forklar hvorfor denne endringen er bra.\n" - -#: lib/commit.tcl:211 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "advarsel: Tcl støtter ikke denne tegnkodingen '%s'." - -#: lib/commit.tcl:227 -msgid "Calling pre-commit hook..." -msgstr "" - -#: lib/commit.tcl:242 -msgid "Commit declined by pre-commit hook." -msgstr "" - -#: lib/commit.tcl:265 -msgid "Calling commit-msg hook..." -msgstr "" - -#: lib/commit.tcl:280 -msgid "Commit declined by commit-msg hook." -msgstr "" - -#: lib/commit.tcl:293 -msgid "Committing changes..." -msgstr "Sjekker inn endringer..." - -#: lib/commit.tcl:309 -msgid "write-tree failed:" -msgstr "Skriving til tre feilet:" - -#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374 -msgid "Commit failed." -msgstr "Innsjekking feilet." - -#: lib/commit.tcl:327 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Revisjon %s ser ut til å være korrupt" - -#: lib/commit.tcl:332 -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 "" -"Ingen endringer til innsjekking.\n" -"\n" -"Ingen filer ble endret av denne revisjonen, og det var ikke en revisjon fra " -"en sammenslåing.\n" -"\n" -"Et nytt søk vil bli startet automatisk.\n" - -#: lib/commit.tcl:339 -msgid "No changes to commit." -msgstr "Ingen endringer til innsekking." - -#: lib/commit.tcl:353 -msgid "commit-tree failed:" -msgstr "commit-tree feilet:" - -#: lib/commit.tcl:373 -msgid "update-ref failed:" -msgstr "update-ref feilet:" - -#: lib/commit.tcl:461 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Opprettet innsjekking %s: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Jobber... Vennligst vent..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Suksess" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Feil: Kommandoen feilet" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Antall løse objekter" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Diskplass brukt av løse objekter" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Antall pakkede objekter" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Antall pakker" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Diskplass brukt av pakkede objekter" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Pakkede objekter som avventer fjerning" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Avfallsfiler" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Komprimerer objektdatabasen" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Verifiserer objektdatabasen med 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 "" -"Dette arkivet inneholder omtrent %i 'løse' objekter.\n" -"\n" -"For å sikre en optimal ytelse er det sterkt anbefalt at du komprimerer " -"databasen når det er flere enn %i 'løse' objekter i den.\n" -"\n" -"Komprimere databasen nå?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ugyldig dato fra Git: %s" - -#: lib/diff.tcl:59 -#, 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 "" -"Ingen forandringer funnet.\n" -"\n" -"%s har ingen endringer.\n" -"\n" -"Tidsstempelet for endring på denne filen ble oppdatert av en annen " -" applikasjon, men innholdet er uendret.\n" -"\n" -"En gjennomsøking vil nå starte automatisk for å se om andre filer har " -"status." - -#: lib/diff.tcl:99 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Laster inn forskjellene av %s..." - -#: lib/diff.tcl:120 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "LOKAL: slettet\n" -"FJERN:\n" - -#: lib/diff.tcl:125 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "FJERN: slettet\n" -"LOKAL:\n" - -#: lib/diff.tcl:132 -msgid "LOCAL:\n" -msgstr "LOKAL:\n" - -#: lib/diff.tcl:135 -msgid "REMOTE:\n" -msgstr "FJERN:\n" - -#: lib/diff.tcl:197 lib/diff.tcl:296 -#, tcl-format -msgid "Unable to display %s" -msgstr "Kan ikke vise %s" - -#: lib/diff.tcl:198 -msgid "Error loading file:" -msgstr "Feil ved lesing av fil: %s" - -#: lib/diff.tcl:205 -msgid "Git Repository (subproject)" -msgstr "Git-arkiv (underprosjekt)" - -#: lib/diff.tcl:217 -msgid "* Binary file (not showing content)." -msgstr "* Binærfil (viser ikke innhold)" - -#: lib/diff.tcl:222 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Usporet fil er %d bytes.\n" -"* Viser bare %d første bytes.\n" - -#: lib/diff.tcl:228 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Usporede filer klippet her av %s.\n" -"* For å se hele filen, bruk et eksternt redigeringsverktøy.\n" - -#: lib/diff.tcl:436 -msgid "Failed to unstage selected hunk." -msgstr "Kunne ikke fjerne den valgte delen fra innsjekkingskøen." - -#: lib/diff.tcl:443 -msgid "Failed to stage selected hunk." -msgstr "Kunne ikke legge til den valgte delen i innsjekkingskøen." - -#: lib/diff.tcl:509 -msgid "Failed to unstage selected line." -msgstr "Kunne ikke fjerne den valgte linjen fra innsjekkingskøen." - -#: lib/diff.tcl:517 -msgid "Failed to stage selected line." -msgstr "Kunne ikke legge til den valgte linjen i innsjekkingskøen." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Standard" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Systemets (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Andre" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "feil" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "advarsel" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Du må rette de ovenstående feilene før innsjekking." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Kunne ikke låse opp indexen." - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Feil på index" - -#: lib/index.tcl:21 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Oppdatering av Git's index mislyktes. Et nytt søk vil bli startet for å " -"resynkronisere git-gui." - -#: lib/index.tcl:27 -msgid "Continue" -msgstr "Fortsett" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Lås opp index" - -#: lib/index.tcl:287 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Fjerner %s fra innsjekkingskøen" - -#: lib/index.tcl:326 -msgid "Ready to commit." -msgstr "Klar til innsjekking." - -#: lib/index.tcl:339 -#, tcl-format -msgid "Adding %s" -msgstr "Legger til %s" - -#: lib/index.tcl:396 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Reverter endringene i filen %s?" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Reverter endringene i disse %i filene?" - -#: lib/index.tcl:406 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "Endringer som ikke ligger i innsjekkingskøen vil bli tapt av denne " -"reverteringen" - -#: lib/index.tcl:409 -msgid "Do Nothing" -msgstr "Ikke gjør noe" - -#: lib/index.tcl:427 -msgid "Reverting selected files" -msgstr "Reverterer valgte filer" - -#: lib/index.tcl:431 -#, tcl-format -msgid "Reverting %s" -msgstr "Reverterer %s" - -#: 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 "" -"Kunne ikke slå sammen under utvidelse.\n" -"\n" -"Du må først fullføre utvidelsen av denne revisjonen før du kan starte en " -"sammenslåing.\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 "" - -#: lib/merge.tcl:45 -#, 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:55 -#, 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:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s av %s" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Slår sammen %s og %s" - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "Vellykket sammenslåing fullført." - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "Sammenslåing feilet. Håndtering av konflikten kreves." - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Slå sammen inn i %s" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Revisjon til sammenslåing" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Kan ikke avbryte under utvidelse av revisjon.\n" -"\n" -"Du må fullføre utvidelsen av denne revisjonen.\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 "" -"Avbryt sammenslåing?\n" -"\n" -"Avbryting av pågående sammenslåing vil føre til at *alle* endringer som ikke " -" er sjekket inn, vil gå tapt.\n" -"\n" -"Fortsette med å avbryte den pågående sammenslåingen?" - -#: 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 "" -"Nullstill endringer?\n" -"\n" -"Nullstilling av endringer vil føre til at *alle* endringer som ikke er " -"sjekket inn går tapt.\n" -"\n" -"Fortsette med nullstilling av endringer?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Avbryter" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "filer tilbakestilt" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "Avbryting feilet." - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Avbryting fullført. Klar." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Tving håndtering til opprinnelig versjon?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Tving håndtering i denne grenen?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Tving håndtering i den andre grenen?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Merk deg at endringsvisningen kun viser motstridende endringer.\n" -"\n" -"%s vil bli overskrevet.\n" -"\n" -"Denne operasjonen kan kun bli angret ved å starte sammenslåingen på ny." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "Filen %s ser ut til å ha uløste konflikter, skal filen likevel køes?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Legger til løsninge på konflikt for %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Konfliktfil eksisterer ikke" - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Kunne ikke hente versjoner:\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "" - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "" - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Gjennopprett standardverdier" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Lagre" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "%s arkiv" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Globalt (alle arkiv)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Navn" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Epost-adresse" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Oppsummer innsjekkinger fra sammenslåinger" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Detaljenivå på sammenslåing" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Vis endringsstatistikk etter sammenslåing" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Bruk sammenslåingsverktøy" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Stol på filers tid for endring" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Antall linjer sammenhengende endringer" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Tekstbredde for vindu til innsjekkingsmeldinger" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Mal for navn på nye grener" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Standard tekstenkoding for innhold i filer" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Endre" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Stavebokordlister:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Endre skrifttype" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Velg %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Egenskaper" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Kunne ikke lagre alternativ:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Fjern fjernarkiv" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Fjern fra" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Hent fra" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Send til" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Legg til fjernarkiv" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Legg til nytt fjernarkiv" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Legg til" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Detaljer for fjernarkiv" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Lokasjon:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Videre handling" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Hent umiddelbart" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Initsialiser og send til fjernarkiv" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Ikke gjør mer nå" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Vennligst angi et navn for fjernarkivet." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' er ikke et tillatt navn for et fjernarkiv." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Kunne ikke legge til fjernarkivet '%s' på '%s'." - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "hent %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Henter %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Vet ikke hvordan arkiv på '%s' skal opprettes." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71 -#, tcl-format -msgid "push %s" -msgstr "send %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Initsialiserer %s (på %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Fjern gren fra fjernarkiv" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Fra arkiv" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 -msgid "Remote:" -msgstr "Fjernarkiv:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 -msgid "Arbitrary Location:" -msgstr "Vilkårlig lokasjon:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Grener" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Slett kun hvis" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Slått sammen i:" - -#: lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Alltid (Ikke utfør sammenslåingskontroll)" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "En gren kreves for 'sammenslåing i'." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Følgende grener er ikke fullestendig sammenslått med %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 "" -"En eller flere av testene som blir kjørt under sammenslåing feilet fordi du" -"ikke har hentet inn de nødvendige innsjekkingene. Prøv å hent disse fra %s" -"først" - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Velg en eller flere grener som skal fjernes." - -#: lib/remote_branch_delete.tcl:216 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Gjenoppretting av fjernede grener er vanskelig.\n" -"\n" -"Fjern den merkede grenen?" - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Fjerner grenene fra %s" - -#: lib/remote_branch_delete.tcl:286 -msgid "No repository selected." -msgstr "Ingen arkiv valgt." - -#: lib/remote_branch_delete.tcl:291 -#, tcl-format -msgid "Scanning %s..." -msgstr "Søker %s..." - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Finn:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Neste" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Forrige" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Skiller på store og små bokstaver" - -#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 -msgid "Cannot write shortcut:" -msgstr "Kan ikke opprette snarvei:" - -#: lib/shortcut.tcl:136 -msgid "Cannot write icon:" -msgstr "Kan ikke opprette ikon:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Stavekontrolleren er ikke støttet" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Stavekontroll er ikke tilgjengelig" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Ugyldig stavekontroll-konfigurasjon" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Reverterer ordbok til %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Stavekontrollen feilet stille under oppstart" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Stavekontrolleren er ukjent" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Ingen forslag" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Uventet slutt på filen fra stavekontrollen" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Stavekontroll mislyktes" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Ingen nøkler funnet." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Funnet en offentlig nøkkel i: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Generer nøkkel" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Kopier til utklippstavlen" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Din offentlige OpenSSH-nøkkel" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Genererer..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Kunne ikke starte ssh-keygen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "Generering feilet." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "Generering vellykket, men ingen nøkler er funnet." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Nøkkelen din ligger i: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i av %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Å kjøre %s krever at en fil er valgt" - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Er du sikker på at du vil kjøre %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Verktøy: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Kjører: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Verktøyet ble fullført med suksess: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Verktøy feilet: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Legg til verktøy" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Legg til ny verktøykommando" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Legg til globalt" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Verktøydetaljer" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Bruk '/'-separator for å lage undermenyer:" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Kommando:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Vis en dialog før start" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Spør brukeren om å velge en revisjon (setter $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Spør brukeren for ytterligere paramtere (setter $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Ikke vis kommandoens utdata i vinduet" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Kjør kun om forskjellene er markert ($FILENAME er ikke tom)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Vennligst angi et navn for dette verktøyet." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Verktøyet '%s' eksisterer allerede." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Kunne ikke legge til verktøyet:\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Fjern verktøyet" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Fjern verktøyskommandoen" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Fjern" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Blue angir lokale verktøy til arkivet)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Kjør kommando: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Argumenter" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Henter nye endringer fra %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "slett fjernarkiv %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Fjrner sporing av grener slettet fra %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Sender endringer til %s" - -#: lib/transport.tcl:72 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Sender %s %s til %s" - -#: lib/transport.tcl:89 -msgid "Push Branches" -msgstr "Send grener" - -#: lib/transport.tcl:103 -msgid "Source Branches" -msgstr "Kildegrener" - -#: lib/transport.tcl:120 -msgid "Destination Repository" -msgstr "Destinasjonsarkiv" - -#: lib/transport.tcl:158 -msgid "Transfer Options" -msgstr "Overføringsalternativer" - -#: lib/transport.tcl:160 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Tving overskrivning av eksisterende gren (kan forkaste endringer)" - -#: lib/transport.tcl:164 -msgid "Use thin pack (for slow network connections)" -msgstr "Bruk tynne pakker (for tregere nettverkstilkoblinger)" - -#: lib/transport.tcl:168 -msgid "Include tags" -msgstr "Inkluder tagger" diff --git a/third_party/git/git-gui/po/po2msg.sh b/third_party/git/git-gui/po/po2msg.sh deleted file mode 100755 index 1e9f99252815..000000000000 --- a/third_party/git/git-gui/po/po2msg.sh +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/sh -# Tcl ignores the next line -*- tcl -*- \ -exec tclsh "$0" -- "$@" - -# This is a really stupid program, which serves as an alternative to -# msgfmt. It _only_ translates to Tcl mode, does _not_ validate the -# input, and does _not_ output any statistics. - -proc u2a {s} { - set res "" - foreach i [split $s ""] { - scan $i %c c - if {$c<128} { - # escape '[', '\', '$' and ']' - if {$c == 0x5b || $c == 0x5d || $c == 0x24} { - append res "\\" - } - append res $i - } else { - append res \\u[format %04.4x $c] - } - } - return $res -} - -set output_directory "." -set lang "dummy" -set files [list] -set show_statistics 0 - -# parse options -for {set i 0} {$i < $argc} {incr i} { - set arg [lindex $argv $i] - if {$arg == "--statistics"} { - incr show_statistics - continue - } - if {$arg == "--tcl"} { - # we know - continue - } - if {$arg == "-l"} { - incr i - set lang [lindex $argv $i] - continue - } - if {$arg == "-d"} { - incr i - set tmp [lindex $argv $i] - regsub "\[^/\]$" $tmp "&/" output_directory - continue - } - lappend files $arg -} - -proc flush_msg {} { - global msgid msgstr mode lang out fuzzy - global translated_count fuzzy_count not_translated_count - - if {![info exists msgid] || $mode == ""} { - return - } - set mode "" - if {$fuzzy == 1} { - incr fuzzy_count - set fuzzy 0 - return - } - - if {$msgid == ""} { - set prefix "set ::msgcat::header" - } else { - if {$msgstr == ""} { - incr not_translated_count - return - } - set prefix "::msgcat::mcset $lang \"[u2a $msgid]\"" - incr translated_count - } - - puts $out "$prefix \"[u2a $msgstr]\"" -} - -set fuzzy 0 -set translated_count 0 -set fuzzy_count 0 -set not_translated_count 0 -foreach file $files { - regsub "^.*/\(\[^/\]*\)\.po$" $file "$output_directory\\1.msg" outfile - set in [open $file "r"] - fconfigure $in -encoding utf-8 - set out [open $outfile "w"] - - set mode "" - while {[gets $in line] >= 0} { - if {[regexp "^#" $line]} { - if {[regexp ", fuzzy" $line]} { - set fuzzy 1 - } else { - flush_msg - } - continue - } elseif {[regexp "^msgid \"(.*)\"$" $line dummy match]} { - flush_msg - set msgid $match - set mode "msgid" - } elseif {[regexp "^msgstr \"(.*)\"$" $line dummy match]} { - set msgstr $match - set mode "msgstr" - } elseif {$line == ""} { - flush_msg - } elseif {[regexp "^\"(.*)\"$" $line dummy match]} { - if {$mode == "msgid"} { - append msgid $match - } elseif {$mode == "msgstr"} { - append msgstr $match - } else { - puts stderr "I do not know what to do: $match" - } - } else { - puts stderr "Cannot handle $line" - } - } - flush_msg - close $in - close $out -} - -if {$show_statistics} { - set str "" - - append str "$translated_count translated message" - if {$translated_count != 1} { - append str s - } - - if {$fuzzy_count > 1} { - append str ", $fuzzy_count fuzzy translation" - if {$fuzzy_count != 1} { - append str s - } - } - if {$not_translated_count > 0} { - append str ", $not_translated_count untranslated message" - if {$not_translated_count != 1} { - append str s - } - } - - append str . - puts $str -} diff --git a/third_party/git/git-gui/po/pt_br.po b/third_party/git/git-gui/po/pt_br.po deleted file mode 100644 index bad116c78038..000000000000 --- a/third_party/git/git-gui/po/pt_br.po +++ /dev/null @@ -1,2568 +0,0 @@ -# Translation of git-gui to Brazilian Portuguese -# Copyright (C) 2007 Shawn Pearce, et al. -# This file is distributed under the same license as the git-gui package. -# -# Alexandre Erwin Ittner <alexandre@ittner.com.br>, 2010. -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2010-09-18 11:09-0300\n" -"Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n" -"Language-Team: Brazilian Portuguese <>\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:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: erro fatal" - -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Fonte inválida indicada em %s:" - -#: git-gui.sh:779 -msgid "Main Font" -msgstr "Fonte principal" - -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "Fonte para o diff/console" - -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "Impossível encontrar o git no \"PATH\"" - -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Impossível interpretar a versão do git:" - -#: git-gui.sh:839 -#, 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 "" -"Não foi possível determinar a versão do git:\n" -"\n" -"%s afirmar que sua versão é \"%s\".\n" -"\n" -"%s exige o Git 1.5.0 ou posterior.\n" -"\n" -"Assumir que '%s' é a versão 1.5.0?\n" - -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "Diretório do Git não encontrado:" - -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "Impossível mover para o início do diretório de trabalho:" - -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "Impossível usar repositório puro:" - -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "Sem diretório de trabalho" - -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Atualizando estado dos arquivos..." - -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "Procurando por arquivos modificados ..." - -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "Executando hook \"prepare-commit-msg\"..." - -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "O script \"prepare-commit-msg\" negou a criação de uma nova revisão" - -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "Pronto." - -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Exibindo apenas %s de %s arquivos." - -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "Não modificado" - -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "Modificado, não marcado" - -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "Marcado para uma nova revisão" - -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "Trechos marcados para revisão" - -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "Marcado para revisão, faltando" - -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "Tipo do arquivo modificado, não marcado" - -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "Tipo do arquivo modificado, marcado" - -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "Não monitorado, não marcado" - -#: git-gui.sh:1928 -msgid "Missing" -msgstr "Faltando" - -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "Marcado para remoção" - -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "Marcado para remoção, ainda presente" - -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "Requer resolução de conflitos" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Iniciando gitk... Aguarde..." - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "Impossível encontrar o gitk no PATH" - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "Impossível encontrar o \"git gui\" no PATH" - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Repositório" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "Editar" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Ramo" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Revisão" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Mesclar" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Remoto" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "Ferramentas" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "Explorar cópia de trabalho" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "Explorar arquivos do ramo atual" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "Explorar arquivos do ramo..." - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "Visualizar histórico do ramo atual" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "Visualizar histórico de todos os ramos" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Explorar arquivos de %s" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Visualizar histórico de %s" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Estatísticas do banco de dados" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Compactar banco de dados" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "Verificar banco de dados" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Criar ícone na área de trabalho" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Sair" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "Desfazer" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "Refazer" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "Recortar" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Copiar" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "Colar" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Apagar" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "Selecionar tudo" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "Criar..." - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "Checkout..." - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "Renomear..." - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "Apagar..." - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "Redefinir..." - -#: git-gui.sh:2608 -msgid "Done" -msgstr "Pronto" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "Salvar revisão" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Nova revisão" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "Corrigir última revisão" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Atualizar" - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "Marcar para revisão" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "Marcar arquivos modificados" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "Desmarcar" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "Reverter mudanças" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "Mostrar menos contexto" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "Mostrar mais contexto" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "Assinar embaixo" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "Mesclar localmente..." - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "Abortar mesclagem..." - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "Adicionar..." - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "Enviar..." - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "Apagar ramo..." - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "Opções..." - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "Remover..." - -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Ajuda" - -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "Sobre o %s" - -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "Ajuda online" - -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Mostrar chave SSH" - -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"erro fatal: impossível executar \"stat\" em %s: Arquivo ou diretório não " -"encontrado" - -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "Ramo atual:" - -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Mudanças marcadas" - -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "Mudanças não marcadas" - -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "Marcar alterados" - -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Enviar" - -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "Descrição da revisão inicial:" - -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "Descrição da revisão corrigida:" - -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "Descrição da revisão inicial corrigida:" - -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "Descrição da revisão de mescla corrigida:" - -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "Descrição da revisão de mescla:" - -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "Descrição da revisão:" - -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "Copiar todos" - -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "Arquivo:" - -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "Atualizar" - -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "Reduzir tamanho da fonte" - -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "Aumentar tamanho da fonte" - -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Codificação" - -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "Aplicar/reverter trecho" - -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "Aplicar/reverter linha" - -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "Executar ferramenta de mescla" - -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "Usar versão remota" - -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "Usar versão local" - -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "Reverter para a versão-base" - -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "Visualizar estas mudanças no sub-módulo" - -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Visualizar histórico do ramo atual no sub-módulo" - -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "Visualizar histórico de todos os camos no sub-módulo" - -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "Iniciar \"git gui\" no sub-módulo" - -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "Desmarcar trecho para revisão" - -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "Desmarcar linhas para revisão" - -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "Desmarcar linha para revisão" - -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "Marcar trecho para revisão" - -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "Marcar linhas para revisão" - -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "Marcar linha para revisão" - -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "Iniciando..." - -#: git-gui.sh:3541 -#, 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 "" -"Possíveis problemas com as variáveis de ambiente.\n" -"\n" -"As seguintes variáveis de ambiente provavelmente serão\n" -"ignoradas por qualquer sub-processo do Git executado por\n" -"%s:\n" - -#: git-gui.sh:3570 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Isto se deve a um problema conhecido com os binários da Tcl \n" -"distribuídos com o Cygwin" - -#: git-gui.sh:3575 -#, 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" -"Uma boa alternativa para %s\n" -"é colocar os valores para o nome de usuário e e-mail\n" -"no seu arquivo \"~/.gitconfig\"\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - uma interface gráfica para o Git" - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Visualizador de arquivos" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Revisão:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Copiar revisão" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Procurar texto..." - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Executar detecção completa de cópias" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Mostrar contexto do histórico" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Anotar revisão anterior" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Lendo %s..." - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Carregando anotações de cópia/movimentação..." - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "linhas anotadas" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Carregando anotações originais..." - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Anotação completa." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Ocupado" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "O processo de anotação já está em execução" - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Executando detecção de cópia..." - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Carregando anotações..." - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Autor:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Revisor:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Arquivo original:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Impossível encontrar revisão HEAD:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Impossível encontrar revisão anterior:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Impossível exibir revisão anterior" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Erro ao carregar as diferenças:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "Originalmente por:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "No arquivo:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Copiado ou movido para cá por:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Efetuar checkout do ramo" - -#: 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:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Cancelar" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Revisão" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "Opções" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Obter ramo de rastreamento" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "Separar do ramo local" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Criar ramo" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Criar novo ramo" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "Criar" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Nome do ramo" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "Nome:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Coincidir nome do ramo de rastreamento" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Revisão inicial" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Atualizar ramo existente:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Não" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Somente se for um avanço rápido" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Redefinir" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Efetuar checkout após a criação" - -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Selecione um ramo de rastreamento." - -#: lib/branch_create.tcl:140 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "O ramo de rastreamento %s não é um ramo do repositório remoto." - -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Indique um nome para o ramo." - -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "\"%s\" não é um nome de ramo válido" - -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Apagar ramo" - -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Apagar ramo local" - -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "Ramos locais" - -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Apagar somente se mesclado em" - -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "Forçar exclusão (não verificar se o ramo foi mesclado)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Os ramos seguintes não foram completamente mesclados em %s:" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Recuperar ramos apagados é difícil.\n" -"\n" -"Apagar os ramos selecionados?" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Erro ao apagar ramos:\n" -"%s" - -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "Renomear ramo" - -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "Renomear" - -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "Ramo:" - -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "Novo nome:" - -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Selecione um ramo para renomear." - -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "O ramo \"%s\" já existe." - -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Erro ao renomear \"%s\"." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Inciando..." - -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "Navegador de arquivos" - -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Carregando %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[Subir]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Explorar arquivos do ramo" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "Explorar" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Obtendo %s de %s" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "Erro fatal: impossível resolver %s" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Fechar" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "O ramo \"%s\" não existe." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Erro ao configurar git-pull simplificado para \"%s\"." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"O ramo \"%s\" já existe.\n" -"\n" -"Não é possível avançá-lo para %s.\n" -"É preciso mesclar." - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Estratégia de mesclagem \"%s\" não suportada." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Erro ao atualizar \"%s\"." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "A área de marcação (staging area, index) já está bloqueada." - -#: lib/checkout_op.tcl:289 -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 "" -"O último estado lido não confere com o estado atual.\n" -"\n" -"Outro programa do Git modificou o repositório desde a última leitura. Uma " -"atualização deve ser executada antes de alterar o ramo atual.\n" -"\n" -"A atualização começará automaticamente agora.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Atualizando diretório de trabalho para \"%s\"..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "arquivos retirados" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Checkout de \"%s\" abortado (é preciso mesclar alguns arquivos)" - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Mesclagem de arquivos necessária." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Permanecendo no ramo \"%s\"." - -#: lib/checkout_op.tcl:452 -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 "" -"Você não está mais em um ramo local\n" -"\n" -"Se você deseja um ramo, crie um agora a partir deste checkout." - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Checkout de \"%s\" concluído." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Redefinir \"%s\" para \"%s\" provocará a perda das seguintes revisões:" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Recuperar revisões perdidas pode não ser fácil." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Redefinir \"%s\"?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Visualizar" - -#: lib/checkout_op.tcl:635 -#, 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 "" -"Erro ao definir o ramo atual.\n" -"\n" -"Este diretório de trabalho está incompleto. Foi possível atualizar seus " -"arquivos, mas houve uma falha ao atualizar os arquivos internos do Git.\n" -"\n" -"Isto não deveria ter acontecido, %s terminará agora." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Selecionar" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Tipo da fonte" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Tamanho da fonte" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Exemplo" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Este é um texto de exemplo.\n" -"Se você gostar deste texto, esta pode ser sua fonte." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "Criar novo repositório" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Novo..." - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "Clonar repositório existente" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Clonar..." - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "Abrir repositório existente" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Abrir..." - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Repositórios recentes" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Abrir repositório recente:" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Erro ao criar repositório %s:" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "Diretório:" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "Repositório Git" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "O diretório %s já existe." - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "O arquivo %s já existe." - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "Clonar" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "Origem:" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "Diretório de destino:" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "Tipo de clonagem:" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Padrão (rápida, semi-redundante, com hardlinks)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Cópia completa (mais lenta, backup redundante)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Compartilhada (A mais rápida, não recomendada, sem backup)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Este não é um repositório do Git: %s" - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Clonagens padrões só são possíveis em repositórios locais." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Clonagens parciais só são possíveis em repositórios locais." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "O local %s já existe." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "Erro ao configurar origem" - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Contando objetos" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "buckets" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Erro ao copiar objetos ou informações adicionais: %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Não há nada para clonar em %s." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "O ramo \"master\" não foi inicializado." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Não foi possível criar hardlinks, usando cópias convencionais." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Clonando de %s" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Copiando objetos" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Não foi possível copiar o objeto: %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Ligando objetos" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "objetos" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Não foi possível ligar o objeto: %s" - -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Não foi possível receber ramos ou objetos. Veja a saída do console para " -"detalhes." - -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Não foi possível receber as etiquetas. Veja a saída do console para detalhes." - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Não foi possível determinar a etiqueta HEAD. Veja a saída do console para " -"detalhes." - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Não foi possível limpar %s" - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "A clonagem falhou." - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "O ramo padrão não foi recebido." - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Não foi possível resolver %s como uma revisão." - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Criando diretório de trabalho." - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "arquivos" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Erro ao efetuar checkout inicial." - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "Abrir" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "Repositório:" - -#: lib/choose_repository.tcl:1072 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Erro ao abrir o repositório %s:" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "Este checkout" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Expressão de revisão:" - -#: lib/choose_rev.tcl:74 -msgid "Local Branch" -msgstr "Ramo local" - -#: lib/choose_rev.tcl:79 -msgid "Tracking Branch" -msgstr "Ramo de rastreamento" - -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 -msgid "Tag" -msgstr "Etiqueta" - -#: lib/choose_rev.tcl:317 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Revisão inválida: %s" - -#: lib/choose_rev.tcl:338 -msgid "No revision selected." -msgstr "Nenhuma revisão selecionada." - -#: lib/choose_rev.tcl:346 -msgid "Revision expression is empty." -msgstr "A expressão de revisão está vazia." - -#: lib/choose_rev.tcl:531 -msgid "Updated" -msgstr "Atualizado" - -#: lib/choose_rev.tcl:559 -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ão há nada para corrigir.\n" -"\n" -"Você está prestes a criar uma revisão inicial. Não há revisão anterior para " -"corrigir.\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ão é possível corrigir durante uma mesclagem.\n" -"\n" -"Você está em meio a uma operação de mesclagem que não foi completada. Não é " -"possível corrigir a revisão anterior a menos que você aborte a mescla atual " -"antes.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Erro ao carregar dados da revisão para corrigir:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Não foi possível obter a sua identidade:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Variável \"GIT_COMMITTER_IDENT\" inválida:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "aviso: O Tcl não suporta a codificação \"%s\"." - -#: lib/commit.tcl:149 -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 "" -"O último estado lido não confere com o estado atual.\n" -"\n" -"Outro programa do Git modificou o repositório desde a última leitura. Uma " -"atualização deve ser executada antes de criar outra revisão.\n" -"\n" -"A atualização começará automaticamente agora.\n" - -#: lib/commit.tcl:172 -#, 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ão é possível salvar revisões para arquivos não mesclados.\n" -"\n" -"O arquivo %s possui conflitos de mesclagem. Você deve resolvê-los e marcar o " -"arquivo antes de salvar a revisão.\n" - -#: lib/commit.tcl:180 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Estado desconhecido detectado para o arquivo %s.\n" -"\n" -"Este programa não pode salvar uma revisão para o arquivo %s.\n" - -#: lib/commit.tcl:188 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Não há mudanças para salvar.\n" -"\n" -"Você deve marcar ao menos um arquivo antes de salvar a revisão.\n" - -#: lib/commit.tcl:203 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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 "" -"Por favor, indique uma descrição para a revisão.\n" -"\n" -"Uma boa descrição tem o seguinte formato:\n" -"\n" -"- Primeira linha: descreve, em uma única frase, o que você fez.\n" -"- Segunda linha: em branco.\n" -"- Demais linhas: Descreve detalhadamente a revisão.\n" - -#: lib/commit.tcl:234 -msgid "Calling pre-commit hook..." -msgstr "Executando script \"pre-commit\"..." - -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "A revisão foi bloqueada pelo script \"pre-commit\"." - -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Executando script \"commit-msg\"..." - -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Revisão bloqueada pelo script \"commit-msg\"." - -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Salvando revisão..." - -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "write-tree falhou:" - -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "A revisão falhou." - -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "A revisão %s parece estar corrompida." - -#: lib/commit.tcl:339 -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ão há alterações para salvar.\n" -"\n" -"Nenhum arquivo foi modificado e esta não é uma revisão de mesclagem.\n" -"\n" -"Uma atualização será executada automaticamente agora.\n" - -#: lib/commit.tcl:346 -msgid "No changes to commit." -msgstr "Não há alterações para salvar." - -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "commit-tree falhou:" - -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "update-ref falhou:" - -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Revisão %s criada: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Trabalhando... aguarde..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Sucesso" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Erro: o comando falhou" - -#: lib/database.tcl:43 -msgid "Number of loose objects" -msgstr "Número de objetos soltos" - -#: lib/database.tcl:44 -msgid "Disk space used by loose objects" -msgstr "Espaço ocupado pelos objetos soltos" - -#: lib/database.tcl:45 -msgid "Number of packed objects" -msgstr "Número de objetos compactados" - -#: lib/database.tcl:46 -msgid "Number of packs" -msgstr "Número de pacotes" - -#: lib/database.tcl:47 -msgid "Disk space used by packed objects" -msgstr "Espaço ocupado pelos objetos compactados" - -#: lib/database.tcl:48 -msgid "Packed objects waiting for pruning" -msgstr "Objetos compactados aguardando eliminação" - -#: lib/database.tcl:49 -msgid "Garbage files" -msgstr "Arquivos de lixo" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Compactando banco de dados de objetos" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Verificando banco de dados de objetos com fsck-objects" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Este repositório possui aproximadamente %i objetos soltos.\n" -"\n" -"Para manter o desempenho ótimo é altamente recomendado que você compacte o " -"banco de dados.\n" -"\n" -"Compactar o banco de dados agora?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Data inválida recebida do Git: %s" - -#: lib/diff.tcl:64 -#, 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 "" -"Nenhuma diferença foi detectada.\n" -"\n" -"%s não possui mudanças.\n" -"\n" -"A data de modificação deste arquivo foi atualizada por outro aplicativo, mas " -"o conteúdo do arquivo não foi alterado.\n" -"\n" -"Uma atualização ser executada para encontrar outros arquivos que possam ter " -"o mesmo estado." - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Carregando diferenças de %s..." - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"Local: apagado\n" -"Remoto:\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"Remoto: apagado\n" -"Local:\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "Local:\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "Remoto:\n" - -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "Impossível exibir %s" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Erro ao carregar o arquivo:" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Repositório Git (sub-projeto)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* Arquivo binário (conteúdo não exibido)." - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* O arquivo não rastreado possui %d bytes.\n" -"* Exibindo apenas os primeiros %d bytes.\n" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* O arquivo não rastreado foi cortado aqui por %s.\n" -"* Para ver o arquivo completo, use um editor externo.\n" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "Erro ao desmarcar o trecho selecionado." - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "Erro ao marcar o trecho selecionado." - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "Erro ao desmarcar a linha selecionada." - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "Erro ao marcar a linha selecionada." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Padrão" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Sistema (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Outro" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "Erro" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "aviso" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Você precisa corrigir os erros acima antes de salvar a revisão." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Impossível desbloquear o índice." - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Erro no índice" - -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"A atualização do índice do Git falhou. Uma atualização será executada " -"automaticamente para ressincronizar o Git GUI" - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "Continuar" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Desbloquear índice" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Desmarcando %s para revisão" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Pronto para salvar a revisão." - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "Adicionando %s" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Reverter as alterações no arquivo %s?" - -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Reverter as alterações nestes %i arquivos?" - -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Qualquer alteração não marcada será permanentemente perdida na reversão." - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "Não fazer nada" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "Revertendo os arquivos selecionados" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "Revertendo %s" - -#: 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ão é possível mesclar durante uma correção.\n" -"\n" -"Você deve concluir a correção antes de começar qualquer mesclagem.\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 "" -"O último estado lido não confere com o estado atual.\n" -"\n" -"Outro programa do Git modificou o repositório desde a última leitura. Uma " -"atualização deve ser executada antes de efetuar uma mesclagem.\n" -"\n" -"A atualização começará automaticamente agora.\n" - -#: lib/merge.tcl:45 -#, 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 "" -"Há uma mesclagem com conflitos em progresso.\n" -"\n" -"O arquivo %s possui conflitos de mesclagem.\n" -"\n" -"Você deve resolvê-los, marcar o arquivo e salvar a revisão para completar a " -"mesclagem atual. Só então você poderá começar outra.\n" - -#: lib/merge.tcl:55 -#, 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 "" -"Você está em meio a uma mudança.\n" -"\n" -"O arquivo %s foi modificado.\n" -"\n" -"Você deve completar e salvar a revisão atual antes de começar uma mesclagem. " -"Ao fazê-lo, você poderá abortar a mesclagem caso haja algum erro.\n" - -#: lib/merge.tcl:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s de %s" - -#: lib/merge.tcl:120 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Mesclando %s e %s..." - -#: lib/merge.tcl:131 -msgid "Merge completed successfully." -msgstr "Mesclagem completada com sucesso." - -#: lib/merge.tcl:133 -msgid "Merge failed. Conflict resolution is required." -msgstr "A mesclagem falhou. É necessário resolver conflitos." - -#: lib/merge.tcl:158 -#, tcl-format -msgid "Merge Into %s" -msgstr "Mesclar em %s" - -#: lib/merge.tcl:177 -msgid "Revision To Merge" -msgstr "Revisão para mesclar" - -#: lib/merge.tcl:212 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Não é possível abortar durante uma correção.\n" -"\n" -"Você precisa finalizar a correção desta revisão.\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 "" -"Abortar mesclagem?\n" -"\n" -"Abortar a mesclagem atual implicará na perda de *TODAS* as mudanças não " -"salvas.\n" -"\n" -"Abortar a mesclagem atual?" - -#: 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 "" -"Descartar as mudanças?\n" -"\n" -"Ao fazê-lo, *TODAS* as alterações não salvas serão perdidas.\n" -"\n" -"Continuar e descartar as mudanças atuais?" - -#: lib/merge.tcl:239 -msgid "Aborting" -msgstr "Abortando" - -#: lib/merge.tcl:239 -msgid "files reset" -msgstr "arquivos redefindos" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "A tentativa de abortar a operação falhou" - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Operação abortada com sucesso. Pronto." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Forçar a resolução para a versão base?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Forçar resolução para este ramo?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Forçar resolução para o outro ramo?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Note que o diff mostra apenas as mudanças conflitantes.\n" -"\n" -"%s será sobrescrito.\n" -"\n" -"Caso necessário, será preciso reiniciar a mesclagem para desfazer esta " -"operação." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "O arquivo %s parece ter conflitos não resolvidos. Marcar mesmo assim?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Adicionando resolução para %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Impossível resolver conflitos envolvendo exclusão ou links de arquivos com " -"esta ferramenta." - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "O arquivo conflitante não existe" - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Não é uma ferramenta de mesclagem gráfica: \"%s\"" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Ferramenta de mesclagem não suportada \"%s\"" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "A ferramenta de mesclagem já está em execução. Finalizar?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Erro ao obter as versões:\n" -"%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Não foi possível iniciar a ferramenta de mesclagem:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Executando ferramenta de mesclagem..." - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "Ferramenta de mesclagem falhou." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Codificação global inválida \"%s\"" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Codificação do repositório inválida \"%s\"" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Restaurar padrões" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Salvar" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "Repositório %s" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Global (todos os repositórios)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Nome do usuário" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Endereço de e-mail" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Exibir sumário das revisões de mesclagem" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Nível de detalhamento da mesclagem" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Exibir estatísticas após mesclagens" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Usar ferramenta de mesclagem" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Confiar nas datas de modificação dos arquivos" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "Eliminar ramos de rastreamento ao receber" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Coincidir ramos de rastreamento" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "Detectar cópias somente em arquivos modificados" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Número mínimo de letras para detectar cópias" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Extensão do contexto de detecção (em dias)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Número de linhas para o diff contextual" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Largura do texto da descrição da revisão" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Modelo de nome para novos ramos" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Codificação padrão dos arquivos" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Alterar" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Dicionário para o verificador ortográfico:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Mudar fonte" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Escolher %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Preferências" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Houve um erro ao salvar as opções:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Excluir" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Limpar de" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Receber de" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Enviar para" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Adicionar repositório remoto" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Adicionar novo repositório remoto" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Adicionar" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Detalhes do repositório remoto" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Local:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Ações adicionais" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Receber imediatamente" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Inicializar repositório remoto e enviar" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Não fazer nada agora" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Por favor, indique um nome para o repositório remoto." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "\"%s\" não é um nome válido para um repositório remoto." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Erro ao adicionar repositório remoto \"%s\" do local \"%s\":" - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "receber %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Recebendo o %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Não sabe como inicializar o repositório remoto em \"%s\"." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "enviar %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Configurando %s (em %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Apagar ramo remoto" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Do repositório" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Remoto:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Outro local:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "Ramos" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Apagar somente se" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Mesclado em:" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "É preciso indicar um ramo para \"Mesclado em\"." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Os seguintes ramos não estão inteiramente mesclados em %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 "" -"Um ou mais testes de mesclagem falharam porque você não possui as revisões " -"necessárias. Tente receber revisões de %s primeiro." - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Por favor selecione um ou mais ramos para apagar." - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Apagar ramos de %s" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "Nenhum repositório foi selecionado." - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "Atualizando %s..." - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Encontrar:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Próximo" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Anterior" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Sensível a maiúsculas/minúsculas" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Não foi possível gravar o atalho:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Não foi possível gravar o ícone:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Verificador ortográfico não suportado" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Verificação ortográfica indisponível" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Configuração do verificador ortográfico inválida" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Revertendo dicionário para %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "O verificador ortográfico falhou sem relatar nenhum erro" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Verificador ortográfico não reconhecido" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Sem sugestões" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Final de arquivo inesperado recebido do verificador ortográfico" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "A verificação ortográfica falhou" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Nenhuma chave encontrada" - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Chave pública encontrada em: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Gerar chave" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Copiar para a área de transferência" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Sua chave pública OpenSSH" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Gerando..." - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Impossível iniciar ssh-keygen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "A geração da chave falhou." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "A geração da chave foi bem-sucedida, mas nenhuma chave foi encontrada." - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Sua chave em: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i de %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "É preciso selecionar um arquivo para executar %s." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Você tem certeza que deseja executar %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Ferramenta: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Executando: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Execução completada com sucesso: %s" - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Ferramenta falhou: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Adicionar ferramenta" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Adicionar novo comando de ferramenta" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Adicionar globalmente" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Detalhes da ferramenta" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Use o separador \"/\" para criar uma árvore de sub-menus:" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Comando:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Exibir uma caixa de diálogo antes de executar" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Solicitar a seleção de uma revisão (a variável $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Solicitar argumentos adicionais (define a variável $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Não exibir a janela de saída do comando" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Executar apenas se houver um diff selecionado ($FILENAME não-vazio)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Por favor, indique um nome para a ferramenta." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "A ferramenta \"%s\" já existe." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Não foi possível adicionar a ferramenta:\n" -"%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Excluir ferramenta" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Excluir comando de ferramenta" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Excluir" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Azul indica ferramentas do repositório local)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Executar comando: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Argumentos" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Recebendo novas mudanças de %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "Limpar %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Limpando ramos excluídos de %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Enviando mudanças para %s" - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Duplicando para %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Enviando %s %s para %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Enviar ramos" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Ramos de origem" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Repositório de destino" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Opções de transferência" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Sobrescrever ramos existentes (pode descartar mudanças)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Usar compactação minimalista (para redes lentas)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Incluir etiquetas" diff --git a/third_party/git/git-gui/po/pt_pt.po b/third_party/git/git-gui/po/pt_pt.po deleted file mode 100644 index 0ef3c7927d2c..000000000000 --- a/third_party/git/git-gui/po/pt_pt.po +++ /dev/null @@ -1,2716 +0,0 @@ -# Portuguese translations for git-gui package. -# Copyright (C) 2016 Shawn Pearce, et al. -# This file is distributed under the same license as the git package. -# Vasco Almeida <vascomalmeida@sapo.pt>, 2016. -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-06 09:36+0000\n" -"PO-Revision-Date: 2016-05-06 13:09+0000\n" -"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" -"Language-Team: Portuguese\n" -"Language: pt\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" -"X-Generator: Virtaal 0.7.1\n" - -#: git-gui.sh:861 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Tipo de letra inválido especificado em %s:" - -#: git-gui.sh:915 -msgid "Main Font" -msgstr "Tipo de letra principal" - -#: git-gui.sh:916 -msgid "Diff/Console Font" -msgstr "Tipo de letra Diferenças/Consola" - -#: git-gui.sh:931 git-gui.sh:945 git-gui.sh:958 git-gui.sh:1048 -#: git-gui.sh:1067 git-gui.sh:3125 -msgid "git-gui: fatal error" -msgstr "git-gui: erro fatal" - -#: git-gui.sh:932 -msgid "Cannot find git in PATH." -msgstr "Não é possível encontrar o git em PATH." - -#: git-gui.sh:959 -msgid "Cannot parse Git version string:" -msgstr "Não é possível analisar a versão do Git:" - -#: git-gui.sh:984 -#, 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 "" -"A versão do Git não pôde ser determinada.\n" -"\n" -"%s alega que está na versão '%s'.\n" -"\n" -"%s requer pelo menos Git 1.5.0 ou mais recente.\n" -"\n" -"Assumir que '%s' está na versão 1.5.0?\n" - -#: git-gui.sh:1281 -msgid "Git directory not found:" -msgstr "Diretório Git não encontrado:" - -#: git-gui.sh:1315 -msgid "Cannot move to top of working directory:" -msgstr "Não é possível mover para o topo do diretório de trabalho:" - -#: git-gui.sh:1323 -msgid "Cannot use bare repository:" -msgstr "Não é possível usar repositório nu:" - -#: git-gui.sh:1331 -msgid "No working directory" -msgstr "Nenhum diretório de trabalho" - -#: git-gui.sh:1503 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "A atualizar estado do ficheiro..." - -#: git-gui.sh:1563 -msgid "Scanning for modified files ..." -msgstr "A procurar por ficheiros modificados..." - -#: git-gui.sh:1639 -msgid "Calling prepare-commit-msg hook..." -msgstr "" -"A invocar gancho preparar-mensagem-de-commit (prepare-commit-msg hook)..." - -#: git-gui.sh:1656 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "" -"Commit recusado pelo gancho preparar-mensagem-de-commit (prepare-commit-msg " -"hook)." - -#: git-gui.sh:1814 lib/browser.tcl:252 -msgid "Ready." -msgstr "Pronto." - -#: git-gui.sh:1978 -#, tcl-format -msgid "" -"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." -msgstr "" -"Limite de visualização (gui.maxfilesdisplayed = %s) atingido, não são " -"mostrados todos os %s ficheiros." - -#: git-gui.sh:2101 -msgid "Unmodified" -msgstr "Não modificado" - -#: git-gui.sh:2103 -msgid "Modified, not staged" -msgstr "Modificado, não preparado" - -#: git-gui.sh:2104 git-gui.sh:2116 -msgid "Staged for commit" -msgstr "Preparado para commit" - -#: git-gui.sh:2105 git-gui.sh:2117 -msgid "Portions staged for commit" -msgstr "Porções preparadas para commit" - -#: git-gui.sh:2106 git-gui.sh:2118 -msgid "Staged for commit, missing" -msgstr "Preparado para commit, em falta" - -#: git-gui.sh:2108 -msgid "File type changed, not staged" -msgstr "Tipo de ficheiro modificado, não preparado" - -#: git-gui.sh:2109 git-gui.sh:2110 -msgid "File type changed, old type staged for commit" -msgstr "Tipo de ficheiro modificado, tipo antigo preparado para commit" - -#: git-gui.sh:2111 -msgid "File type changed, staged" -msgstr "Tipo de ficheiro modificado, preparado" - -#: git-gui.sh:2112 -msgid "File type change staged, modification not staged" -msgstr "Tipo de ficheiro modificado, modificação não preparada" - -#: git-gui.sh:2113 -msgid "File type change staged, file missing" -msgstr "Tipo de ficheiro modificado, ficheiro em falta" - -#: git-gui.sh:2115 -msgid "Untracked, not staged" -msgstr "Não controlado, não preparado" - -#: git-gui.sh:2120 -msgid "Missing" -msgstr "Em falta" - -#: git-gui.sh:2121 -msgid "Staged for removal" -msgstr "Preparado para remoção" - -#: git-gui.sh:2122 -msgid "Staged for removal, still present" -msgstr "Preparado para remoção, ainda presente" - -#: git-gui.sh:2124 git-gui.sh:2125 git-gui.sh:2126 git-gui.sh:2127 -#: git-gui.sh:2128 git-gui.sh:2129 -msgid "Requires merge resolution" -msgstr "Requer resolução de integração" - -#: git-gui.sh:2164 -msgid "Starting gitk... please wait..." -msgstr "A iniciar gitk... aguarde..." - -#: git-gui.sh:2176 -msgid "Couldn't find gitk in PATH" -msgstr "Não foi possível encontrar gitk em PATH" - -#: git-gui.sh:2235 -msgid "Couldn't find git gui in PATH" -msgstr "Não foi possível encontrar git gui em PATH" - -#: git-gui.sh:2654 lib/choose_repository.tcl:41 -msgid "Repository" -msgstr "Repositório" - -#: git-gui.sh:2655 -msgid "Edit" -msgstr "Editar" - -#: git-gui.sh:2657 lib/choose_rev.tcl:567 -msgid "Branch" -msgstr "Ramo" - -#: git-gui.sh:2660 lib/choose_rev.tcl:554 -msgid "Commit@@noun" -msgstr "Commit" - -#: git-gui.sh:2663 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 -msgid "Merge" -msgstr "Integrar" - -#: git-gui.sh:2664 lib/choose_rev.tcl:563 -msgid "Remote" -msgstr "Remoto" - -#: git-gui.sh:2667 -msgid "Tools" -msgstr "Ferramentas" - -#: git-gui.sh:2676 -msgid "Explore Working Copy" -msgstr "Explorar cópia de trabalho" - -#: git-gui.sh:2682 -msgid "Git Bash" -msgstr "Git Bash" - -#: git-gui.sh:2692 -msgid "Browse Current Branch's Files" -msgstr "Navegar pelos ficheiro do ramo atual" - -#: git-gui.sh:2696 -msgid "Browse Branch Files..." -msgstr "Navegar pelos ficheiros do ramo..." - -#: git-gui.sh:2701 -msgid "Visualize Current Branch's History" -msgstr "Visualizar histórico do ramo atual" - -#: git-gui.sh:2705 -msgid "Visualize All Branch History" -msgstr "Visualizar histórico de todos os ramos" - -#: git-gui.sh:2712 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Navegar pelos ficheiro de %s" - -#: git-gui.sh:2714 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Visualizar histórico de %s" - -#: git-gui.sh:2719 lib/database.tcl:40 lib/database.tcl:66 -msgid "Database Statistics" -msgstr "Estatísticas da base de dados" - -#: git-gui.sh:2722 lib/database.tcl:33 -msgid "Compress Database" -msgstr "Comprimir base de dados" - -#: git-gui.sh:2725 -msgid "Verify Database" -msgstr "Verificar base de dados" - -#: git-gui.sh:2732 git-gui.sh:2736 git-gui.sh:2740 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Criar ícone no ambiente de trabalho" - -#: git-gui.sh:2748 lib/choose_repository.tcl:193 lib/choose_repository.tcl:201 -msgid "Quit" -msgstr "Sair" - -#: git-gui.sh:2756 -msgid "Undo" -msgstr "Desfazer" - -#: git-gui.sh:2759 -msgid "Redo" -msgstr "Refazer" - -#: git-gui.sh:2763 git-gui.sh:3368 -msgid "Cut" -msgstr "Cortar" - -#: git-gui.sh:2766 git-gui.sh:3371 git-gui.sh:3445 git-gui.sh:3530 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Copiar" - -#: git-gui.sh:2769 git-gui.sh:3374 -msgid "Paste" -msgstr "Colar" - -#: git-gui.sh:2772 git-gui.sh:3377 lib/remote_branch_delete.tcl:39 -#: lib/branch_delete.tcl:28 -msgid "Delete" -msgstr "Eliminar" - -#: git-gui.sh:2776 git-gui.sh:3381 git-gui.sh:3534 lib/console.tcl:71 -msgid "Select All" -msgstr "Selecionar tudo" - -#: git-gui.sh:2785 -msgid "Create..." -msgstr "Criar..." - -#: git-gui.sh:2791 -msgid "Checkout..." -msgstr "Extrair..." - -#: git-gui.sh:2797 -msgid "Rename..." -msgstr "Mudar nome..." - -#: git-gui.sh:2802 -msgid "Delete..." -msgstr "Eliminar..." - -#: git-gui.sh:2807 -msgid "Reset..." -msgstr "Repor..." - -#: git-gui.sh:2817 -msgid "Done" -msgstr "Concluído" - -#: git-gui.sh:2819 -msgid "Commit@@verb" -msgstr "Submeter" - -#: git-gui.sh:2828 git-gui.sh:3309 -msgid "New Commit" -msgstr "Novo commit" - -#: git-gui.sh:2836 git-gui.sh:3316 -msgid "Amend Last Commit" -msgstr "Emendar último commit" - -#: git-gui.sh:2846 git-gui.sh:3270 lib/remote_branch_delete.tcl:101 -msgid "Rescan" -msgstr "Reanalisar" - -#: git-gui.sh:2852 -msgid "Stage To Commit" -msgstr "Preparar para commit" - -#: git-gui.sh:2858 -msgid "Stage Changed Files To Commit" -msgstr "Preparar ficheiros modificados para commit" - -#: git-gui.sh:2864 -msgid "Unstage From Commit" -msgstr "Retirar do commit" - -#: git-gui.sh:2870 lib/index.tcl:442 -msgid "Revert Changes" -msgstr "Reverter alterações" - -#: git-gui.sh:2878 git-gui.sh:3581 git-gui.sh:3612 -msgid "Show Less Context" -msgstr "Mostrar menos contexto" - -#: git-gui.sh:2882 git-gui.sh:3585 git-gui.sh:3616 -msgid "Show More Context" -msgstr "Mostrar mais contexto" - -#: git-gui.sh:2889 git-gui.sh:3283 git-gui.sh:3392 -msgid "Sign Off" -msgstr "Assinar por baixo" - -#: git-gui.sh:2905 -msgid "Local Merge..." -msgstr "Integração local..." - -#: git-gui.sh:2910 -msgid "Abort Merge..." -msgstr "Abortar integração..." - -#: git-gui.sh:2922 git-gui.sh:2950 -msgid "Add..." -msgstr "Adicionar..." - -#: git-gui.sh:2926 -msgid "Push..." -msgstr "Publicar..." - -#: git-gui.sh:2930 -msgid "Delete Branch..." -msgstr "Eliminar ramo..." - -#: git-gui.sh:2940 git-gui.sh:3563 -msgid "Options..." -msgstr "Opções..." - -#: git-gui.sh:2951 -msgid "Remove..." -msgstr "Remover..." - -#: git-gui.sh:2960 lib/choose_repository.tcl:55 -msgid "Help" -msgstr "Ajuda" - -#: git-gui.sh:2964 git-gui.sh:2968 lib/choose_repository.tcl:49 -#: lib/choose_repository.tcl:58 lib/about.tcl:14 -#, tcl-format -msgid "About %s" -msgstr "Sobre %s" - -#: git-gui.sh:2992 -msgid "Online Documentation" -msgstr "Documentação online" - -#: git-gui.sh:2995 lib/choose_repository.tcl:52 lib/choose_repository.tcl:61 -msgid "Show SSH Key" -msgstr "Mostrar chave SSH" - -#: git-gui.sh:3014 git-gui.sh:3146 -msgid "Usage" -msgstr "Utilização" - -#: git-gui.sh:3095 lib/blame.tcl:573 -msgid "Error" -msgstr "Erro" - -#: git-gui.sh:3126 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"fatal: não é possível obter estado do caminho %s: Ficheiro ou diretório " -"inexistente" - -#: git-gui.sh:3159 -msgid "Current Branch:" -msgstr "Ramo atual:" - -#: git-gui.sh:3185 -msgid "Staged Changes (Will Commit)" -msgstr "Alterações preparadas (para commit)" - -#: git-gui.sh:3205 -msgid "Unstaged Changes" -msgstr "Alterações não preparadas" - -#: git-gui.sh:3276 -msgid "Stage Changed" -msgstr "Preparar modificados" - -#: git-gui.sh:3295 lib/transport.tcl:137 lib/transport.tcl:229 -msgid "Push" -msgstr "Publicar" - -#: git-gui.sh:3330 -msgid "Initial Commit Message:" -msgstr "Mensagem de commit inicial:" - -#: git-gui.sh:3331 -msgid "Amended Commit Message:" -msgstr "Mensagem de commit emendada:" - -#: git-gui.sh:3332 -msgid "Amended Initial Commit Message:" -msgstr "Mensagem de commit inicial emendada:" - -#: git-gui.sh:3333 -msgid "Amended Merge Commit Message:" -msgstr "Mensagem de commit de integração emendada:" - -#: git-gui.sh:3334 -msgid "Merge Commit Message:" -msgstr "Mensagem de commit de integração:" - -#: git-gui.sh:3335 -msgid "Commit Message:" -msgstr "Mensagem de commit:" - -#: git-gui.sh:3384 git-gui.sh:3538 lib/console.tcl:73 -msgid "Copy All" -msgstr "Copiar tudo" - -#: git-gui.sh:3408 lib/blame.tcl:105 -msgid "File:" -msgstr "Ficheiro:" - -#: git-gui.sh:3526 -msgid "Refresh" -msgstr "Atualizar" - -#: git-gui.sh:3547 -msgid "Decrease Font Size" -msgstr "Diminuir tamanho de letra" - -#: git-gui.sh:3551 -msgid "Increase Font Size" -msgstr "Aumentar tamanho de letra" - -#: git-gui.sh:3559 lib/blame.tcl:294 -msgid "Encoding" -msgstr "Codificação" - -#: git-gui.sh:3570 -msgid "Apply/Reverse Hunk" -msgstr "Aplicar/Reverter excerto" - -#: git-gui.sh:3575 -msgid "Apply/Reverse Line" -msgstr "Aplicar/Reverter linha" - -#: git-gui.sh:3594 -msgid "Run Merge Tool" -msgstr "Executar ferramenta de integração" - -#: git-gui.sh:3599 -msgid "Use Remote Version" -msgstr "Usar a versão remota" - -#: git-gui.sh:3603 -msgid "Use Local Version" -msgstr "Usar a versão local" - -#: git-gui.sh:3607 -msgid "Revert To Base" -msgstr "Reverter para a base" - -#: git-gui.sh:3625 -msgid "Visualize These Changes In The Submodule" -msgstr "Visualizar estas alterações no submódulo" - -#: git-gui.sh:3629 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Visualizar histórico do ramo atual no submódulo" - -#: git-gui.sh:3633 -msgid "Visualize All Branch History In The Submodule" -msgstr "Visualizar histórico de todos os ramos no submódulo" - -#: git-gui.sh:3638 -msgid "Start git gui In The Submodule" -msgstr "Iniciar git gui no submódulo" - -#: git-gui.sh:3673 -msgid "Unstage Hunk From Commit" -msgstr "Retirar excerto do commit" - -#: git-gui.sh:3675 -msgid "Unstage Lines From Commit" -msgstr "Retirar linhas do commit" - -#: git-gui.sh:3677 -msgid "Unstage Line From Commit" -msgstr "Retirar linha do commit" - -#: git-gui.sh:3680 -msgid "Stage Hunk For Commit" -msgstr "Preparar excerto para commit" - -#: git-gui.sh:3682 -msgid "Stage Lines For Commit" -msgstr "Preparar linhas para commit" - -#: git-gui.sh:3684 -msgid "Stage Line For Commit" -msgstr "Preparar linha para commit" - -#: git-gui.sh:3709 -msgid "Initializing..." -msgstr "A inicializar..." - -#: git-gui.sh:3852 -#, 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 "" -"Existem possíveis erros de ambiente.\n" -"\n" -"As seguintes variáveis de ambiente serão provavelmente\n" -"ignoradas pelos subprocessos do Git executados\n" -"por %s:\n" -"\n" - -#: git-gui.sh:3881 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Devido a um problema conhecido com o\n" -"binário Tcl distribuído pelo Cygwin." - -#: git-gui.sh:3886 -#, 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 bom substituto para %s\n" -"é colocar valores das definições user.name e\n" -"user.email no ficheiro pessoal ~/.gitconfig.\n" - -#: lib/line.tcl:17 -msgid "Goto Line:" -msgstr "Ir para a linha:" - -#: lib/line.tcl:23 -msgid "Go" -msgstr "Ir" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "A processar... aguarde..." - -#: lib/console.tcl:81 lib/checkout_op.tcl:146 lib/sshkey.tcl:55 -#: lib/database.tcl:30 -msgid "Close" -msgstr "Fechar" - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Sucesso" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Erro: falha ao executar comando" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "A obter %s de %s" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "fatal: Não é possível resolver %s" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "O ramo '%s' não existe." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Falha ao configurar git-pull simplificado de '%s'." - -#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "O ramo '%s' já existe." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"O ramo '%s' já existe.\n" -"\n" -"Não pode ser avançado rapidamente para %s.\n" -"Integração necessária." - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "A estratégia de integração '%s' não é suportada." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Falha ao atualizar '%s'." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "A área de estágio (índice) já está bloqueada." - -#: lib/checkout_op.tcl:289 -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 "" -"O último estado analisado não corresponde ao estado do repositório.\n" -"\n" -"Outro programa Git modificou este repositório deste a última análise. Deve-" -"se reanalisar antes do ramo atual poder ser alterado.\n" -"\n" -"Irá-se reanalisar automaticamente agora.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "A atualizar o diretório de trabalho para '%s'..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "ficheiros extraídos" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "" -"Extração de '%s' abortada (é necessário integrar ao nível de ficheiros)." - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Integração ao nível de ficheiros necessária." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Permanecer no ramo '%s'." - -#: lib/checkout_op.tcl:452 -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 "" -"Já não se encontra num ramo local.\n" -"\n" -"Se queria estar sobre um ramo, crie um a partir de 'Esta extração destacada'." - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "'%s' extraído." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Ao repor '%s' para '%s' perderá os seguintes commits:" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Recuperar commits perdidos pode não ser fácil." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Repor '%s'?" - -#: lib/checkout_op.tcl:567 lib/tools_dlg.tcl:336 lib/merge.tcl:166 -msgid "Visualize" -msgstr "Visualizar" - -#: lib/checkout_op.tcl:571 lib/branch_create.tcl:85 -msgid "Reset" -msgstr "Repor" - -#: lib/checkout_op.tcl:579 lib/transport.tcl:141 lib/remote_add.tcl:34 -#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/choose_font.tcl:45 -#: lib/option.tcl:127 lib/tools_dlg.tcl:41 lib/tools_dlg.tcl:202 -#: lib/tools_dlg.tcl:345 lib/branch_rename.tcl:32 -#: lib/remote_branch_delete.tcl:43 lib/branch_create.tcl:37 -#: lib/branch_delete.tcl:34 lib/merge.tcl:174 -msgid "Cancel" -msgstr "Cancelar" - -#: lib/checkout_op.tcl:635 -#, 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 "" -"Falha ao definir ramo atual.\n" -"\n" -"Apenas se mudou o diretório de trabalho parcialmente. Os ficheiros foram " -"atualizados com sucesso, mas não foi possível atualizar o ficheiro Git " -"interno.\n" -"\n" -"Não devia ter ocorrido. %s irá terminar e desistir." - -#: lib/transport.tcl:6 lib/remote_add.tcl:132 -#, tcl-format -msgid "fetch %s" -msgstr "obter %s" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Obter novas alterações de %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "poda remota de %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "A podar ramos de monitorização eliminados de %s" - -#: lib/transport.tcl:25 -msgid "fetch all remotes" -msgstr "obter de todos os remotos" - -#: lib/transport.tcl:26 -msgid "Fetching new changes from all remotes" -msgstr "A obter novas alterações de todos os remotos" - -#: lib/transport.tcl:40 -msgid "remote prune all remotes" -msgstr "poda remota de todos os remotos" - -#: lib/transport.tcl:41 -msgid "Pruning tracking branches deleted from all remotes" -msgstr "A podar ramos de monitorização eliminados de todos os remotos" - -#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 -#: lib/remote_add.tcl:162 -#, tcl-format -msgid "push %s" -msgstr "publicar %s" - -#: lib/transport.tcl:55 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "A publicar alterações em %s" - -#: lib/transport.tcl:93 -#, tcl-format -msgid "Mirroring to %s" -msgstr "A espelhar em %s" - -#: lib/transport.tcl:111 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "A publicar %s %s em %s" - -#: lib/transport.tcl:132 -msgid "Push Branches" -msgstr "Publicar ramos" - -#: lib/transport.tcl:147 -msgid "Source Branches" -msgstr "Ramos de origem" - -#: lib/transport.tcl:162 -msgid "Destination Repository" -msgstr "Repositório de destino" - -#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 -msgid "Remote:" -msgstr "Remoto:" - -#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 -msgid "Arbitrary Location:" -msgstr "Localização arbitrária:" - -#: lib/transport.tcl:205 -msgid "Transfer Options" -msgstr "Opções de transferência" - -#: lib/transport.tcl:207 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Forçar substituição de ramos existente (pode descartar alterações)" - -#: lib/transport.tcl:211 -msgid "Use thin pack (for slow network connections)" -msgstr "Usar pacote fino (para conexões de rede lentas)" - -#: lib/transport.tcl:215 -msgid "Include tags" -msgstr "Incluir tags" - -#: lib/remote_add.tcl:20 -msgid "Add Remote" -msgstr "Adicionar remoto" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "Adicionar novo remoto" - -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "Adicionar" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "Detalhes do remoto" - -#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 -msgid "Name:" -msgstr "Nome:" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Localização:" - -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "Ação adicional" - -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "Obter imediatamente" - -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "Inicializar repositório remoto e publicar" - -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "Não fazer mais nada agora" - -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "Forneça um nome para o remoto." - -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' não pode ser aceite como nome de remoto." - -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Falha ao adicionar remoto '%s' localizado em '%s'." - -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "A obter de %s" - -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Não se sabe como inicializar o repositório localizado em '%s'." - -#: lib/remote_add.tcl:163 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "A configurar %s (em %s)" - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "A iniciar..." - -#: lib/browser.tcl:27 -msgid "File Browser" -msgstr "Navegador de ficheiros" - -#: lib/browser.tcl:132 lib/browser.tcl:149 -#, tcl-format -msgid "Loading %s..." -msgstr "A carregar %s..." - -#: lib/browser.tcl:193 -msgid "[Up To Parent]" -msgstr "[Subir]" - -#: lib/browser.tcl:275 lib/browser.tcl:282 -msgid "Browse Branch Files" -msgstr "Navegar pelos ficheiros do ramo" - -#: lib/browser.tcl:288 lib/choose_repository.tcl:422 -#: lib/choose_repository.tcl:509 lib/choose_repository.tcl:518 -#: lib/choose_repository.tcl:1074 -msgid "Browse" -msgstr "Navegar" - -#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "Revisão" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Deve selecionar um ficheiro para executar %s." - -#: lib/tools.tcl:91 -#, tcl-format -msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "Tem a certeza que pretende executar %1$s sobre o ficheiro \"%2$s\"?" - -#: lib/tools.tcl:95 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Tem a certeza que pretende executar %s?" - -#: lib/tools.tcl:116 -#, tcl-format -msgid "Tool: %s" -msgstr "Ferramenta: %s" - -#: lib/tools.tcl:117 -#, tcl-format -msgid "Running: %s" -msgstr "A executar: %s" - -#: lib/tools.tcl:155 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "A ferramenta concluí com sucesso: %s" - -#: lib/tools.tcl:157 -#, tcl-format -msgid "Tool failed: %s" -msgstr "A ferramenta falhou: %s" - -#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "Extrair ramo" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "Extrair" - -#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 -msgid "Options" -msgstr "Opções" - -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Obter ramo de monitorização" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "Destacar do ramo local" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Corretor ortográfico não suportado" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Correção ortográfica indisponível" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Configuração inválida do corretor ortográfico" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "A reverter dicionário para %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "O corretor ortográfico falhou silenciosamente ao iniciar" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Corretor ortográfico não reconhecido" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Sem sugestões" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "EOF (fim de ficheiro) inesperado do corretor ortográfico" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Corretor ortográfico falhou" - -#: lib/status_bar.tcl:87 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i de %*i %s (%3i%%)" - -#: lib/diff.tcl:77 -#, 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 "" -"Nenhum diferença detetada.\n" -"\n" -"%s não tem alterações.\n" -"\n" -"A data de modificação deste ficheiro foi atualizada por outra aplicação, mas " -"o conteúdo no interior do ficheiro não foi alterado.\n" -"\n" -"Irá-se reanalisar automaticamente para encontrar outros ficheiros que " -"estejam no mesmo estado." - -#: lib/diff.tcl:117 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "A carregar diferenças de %s..." - -#: lib/diff.tcl:140 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOCAL: eliminado\n" -"REMOTO:\n" - -#: lib/diff.tcl:145 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"REMOTO: eliminado\n" -"LOCAL:\n" - -#: lib/diff.tcl:152 -msgid "LOCAL:\n" -msgstr "LOCAL:\n" - -#: lib/diff.tcl:155 -msgid "REMOTE:\n" -msgstr "REMOTO:\n" - -#: lib/diff.tcl:217 lib/diff.tcl:355 -#, tcl-format -msgid "Unable to display %s" -msgstr "Não é possível mostrar %s" - -#: lib/diff.tcl:218 -msgid "Error loading file:" -msgstr "Erro ao carregar ficheiro:" - -#: lib/diff.tcl:225 -msgid "Git Repository (subproject)" -msgstr "Repositório Git (subprojeto)" - -#: lib/diff.tcl:237 -msgid "* Binary file (not showing content)." -msgstr "* Ficheiro binário (conteúdo não exibido)." - -#: lib/diff.tcl:242 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* O ficheiro não controlado tem %d bytes.\n" -"* Exibido apenas os primeiros %d bytes.\n" - -#: lib/diff.tcl:248 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Ficheiro não controlado recortado aqui por %s.\n" -"* Para ver o ficheiro inteiro, use um editor externo.\n" - -#: lib/diff.tcl:356 lib/blame.tcl:1128 -msgid "Error loading diff:" -msgstr "Erro ao carregar diferenças:" - -#: lib/diff.tcl:578 -msgid "Failed to unstage selected hunk." -msgstr "Falha ao retirar excerto selecionado do índice." - -#: lib/diff.tcl:585 -msgid "Failed to stage selected hunk." -msgstr "Falha ao preparar excerto selecionado." - -#: lib/diff.tcl:664 -msgid "Failed to unstage selected line." -msgstr "Falha ao retirar linha selecionada do índice." - -#: lib/diff.tcl:672 -msgid "Failed to stage selected line." -msgstr "Falha ao preparar linha selecionada." - -#: lib/remote.tcl:200 -msgid "Push to" -msgstr "Publicar em" - -#: lib/remote.tcl:218 -msgid "Remove Remote" -msgstr "Remover remoto" - -#: lib/remote.tcl:223 -msgid "Prune from" -msgstr "Podar de" - -#: lib/remote.tcl:228 -msgid "Fetch from" -msgstr "Obter de" - -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "Selecionar" - -#: lib/choose_font.tcl:55 -msgid "Font Family" -msgstr "Família de tipo de letra" - -#: lib/choose_font.tcl:76 -msgid "Font Size" -msgstr "Tamanho de letra" - -#: lib/choose_font.tcl:93 -msgid "Font Example" -msgstr "Exemplo do tipo de letra" - -#: lib/choose_font.tcl:105 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Este texto é um exemplo.\n" -"Se gostar deste texto, pode defini-lo como tipo de letra." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Codificação global '%s' inválida" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Codificação do repositório '%s' inválida" - -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "Restaurar predefinições" - -#: lib/option.tcl:123 -msgid "Save" -msgstr "Guardar" - -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "Repositório %s" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "Global (todos os repositórios)" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "Nome de utilizador" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "Endereço de e-mail" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "Resumir commits de integração" - -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "Verbosidade de integração" - -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "Mostrar estatísticas de diferenças depois de integrar" - -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "Usar ferramenta de integração" - -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "Confiar na data de modificação dos ficheiros" - -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "Podar ramos de monitorização ao obter" - -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "Corresponder ramos de monitorização" - -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "Usar textconv para mostrar diferenças e culpar" - -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "Detetar cópia apenas em ficheiros modificados" - -#: lib/option.tcl:153 -msgid "Maximum Length of Recent Repositories List" -msgstr "Comprimento máximo da lista de repositórios recentes" - -#: lib/option.tcl:154 -msgid "Minimum Letters To Blame Copy On" -msgstr "Número mínimo de letras para detetar cópia" - -#: lib/option.tcl:155 -msgid "Blame History Context Radius (days)" -msgstr "Raio de contexto histórico para culpar (dias)" - -#: lib/option.tcl:156 -msgid "Number of Diff Context Lines" -msgstr "Número de linhas de contexto ao mostrar diferenças" - -#: lib/option.tcl:157 -msgid "Additional Diff Parameters" -msgstr "Parâmetros de diff adicionais" - -#: lib/option.tcl:158 -msgid "Commit Message Text Width" -msgstr "Largura do texto da mensagem de commit" - -#: lib/option.tcl:159 -msgid "New Branch Name Template" -msgstr "Modelo para nome de novo ramo" - -#: lib/option.tcl:160 -msgid "Default File Contents Encoding" -msgstr "Codificação predefinida dos conteúdos de ficheiros" - -#: lib/option.tcl:161 -msgid "Warn before committing to a detached head" -msgstr "Avisar antes de submeter numa cabeça destacada" - -#: lib/option.tcl:162 -msgid "Staging of untracked files" -msgstr "Preparar ficheiros não controlados" - -#: lib/option.tcl:163 -msgid "Show untracked files" -msgstr "Mostrar ficheiros não controlados" - -#: lib/option.tcl:164 -msgid "Tab spacing" -msgstr "Espaçamento da tabulação" - -#: lib/option.tcl:210 -msgid "Change" -msgstr "Alterar" - -#: lib/option.tcl:254 -msgid "Spelling Dictionary:" -msgstr "Dicionário ortográfico:" - -#: lib/option.tcl:284 -msgid "Change Font" -msgstr "Alterar tipo de letra" - -#: lib/option.tcl:288 -#, tcl-format -msgid "Choose %s" -msgstr "Escolher %s" - -#: lib/option.tcl:294 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:308 -msgid "Preferences" -msgstr "Preferências" - -#: lib/option.tcl:345 -msgid "Failed to completely save options:" -msgstr "Falha ao guardar todas as opções:" - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Forçar resolução para a versão base?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Forçar resolução para este ramo?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Forçar resolução para o outro ramo?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Note que as diferenças mostram apenas alterações em conflito.\n" -"\n" -"%s será substituído.\n" -"\n" -"Esta operação só pode ser anulada reiniciando a integração." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"O ficheiro %s parece ter conflitos não resolvidos, prepará-lo mesmo assim?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "A adicionar resolução de %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Não é possível resolver conflitos de exclusão ou ligação usando uma " -"ferramenta" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "O ficheiro em conflito não existe" - -#: lib/mergetool.tcl:246 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Não é uma ferramenta GUI de integração: '%s'" - -#: lib/mergetool.tcl:275 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Ferramenta de integração '%s' não suportada" - -#: lib/mergetool.tcl:310 -msgid "Merge tool is already running, terminate it?" -msgstr "A ferramenta de integração já está a executar, terminá-la?" - -#: lib/mergetool.tcl:330 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Erro ao obter versões:\n" -"%s" - -#: lib/mergetool.tcl:350 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Não foi possível iniciar a ferramenta de integração:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:354 -msgid "Running merge tool..." -msgstr "A executar a ferramenta de integração..." - -#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 -msgid "Merge tool failed." -msgstr "A ferramenta de integração falhou." - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Adicionar ferramenta" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Adicionar novo comando de ferramenta" - -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "Adicionar globalmente" - -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "Detalhes da ferramenta" - -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Use separadores '/' para criar uma árvore de submenus:" - -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "Comando:" - -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "Mostrar um diálogo antes de executar" - -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Pedir ao utilizador para selecionar uma revisão (define $REVISION)" - -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Pedir ao utilizador argumentos adicionais (define $ARGS)" - -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "Não mostrar a janela com a saída do comando" - -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Executar só se for selecionada um diferença ($FILENAME não vazio)" - -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "Forneça um nome para a ferramenta." - -#: lib/tools_dlg.tcl:126 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "A ferramenta '%s' já existe." - -#: lib/tools_dlg.tcl:148 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Não foi possível adicionar ferramenta:\n" -"%s" - -#: lib/tools_dlg.tcl:187 -msgid "Remove Tool" -msgstr "Remover ferramenta" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "Remover comandos de ferramenta" - -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "Remover" - -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "(Azul denota ferramentas locais do repositório)" - -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "Executar comando: %s" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "Argumentos" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "OK" - -#: lib/search.tcl:48 -msgid "Find:" -msgstr "Procurar:" - -#: lib/search.tcl:50 -msgid "Next" -msgstr "Seguinte" - -#: lib/search.tcl:51 -msgid "Prev" -msgstr "Anterior" - -#: lib/search.tcl:52 -msgid "RegExp" -msgstr "ExpReg" - -#: lib/search.tcl:54 -msgid "Case" -msgstr "Maiúsculas" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Não é possível escrever atalho:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Não é possível escrever ícone:" - -#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "Mudar nome de ramo" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "Mudar nome" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "Ramo:" - -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "Novo nome:" - -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "Selecione um ramo para mudar de nome." - -#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 -msgid "Please supply a branch name." -msgstr "Indique um nome para o ramo." - -#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' não pode ser aceite como nome de ramo." - -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Falha ao mudar o nome de '%s'." - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Remover ramo remotamente" - -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" -msgstr "Do repositório" - -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" -msgstr "Ramos" - -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" -msgstr "Eliminar só se" - -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" -msgstr "Integrar em:" - -#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 -msgid "Always (Do not perform merge checks)" -msgstr "Sempre (não realizar verificação de integração)" - -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." -msgstr "É necessário um ramo em 'Integrar em'." - -#: lib/remote_branch_delete.tcl:185 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Os seguintes ramos não foram completamente integrados em %s:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:190 -#, 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 "" -"Um ou mais testes de integração falharam porque não obteve os commits " -"necessários. Tente primeiro obter de %s." - -#: lib/remote_branch_delete.tcl:208 -msgid "Please select one or more branches to delete." -msgstr "Selecione um ou mais ramos para eliminar." - -#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Recuperar ramos eliminados é difícil.\n" -"\n" -"Eliminar os ramos selecionado?" - -#: lib/remote_branch_delete.tcl:227 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "A eliminar ramos de %s" - -#: lib/remote_branch_delete.tcl:300 -msgid "No repository selected." -msgstr "Nenhum repositório selecionado." - -#: lib/remote_branch_delete.tcl:305 -#, tcl-format -msgid "Scanning %s..." -msgstr "A analisar %s..." - -#: lib/choose_repository.tcl:33 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:92 lib/choose_repository.tcl:412 -msgid "Create New Repository" -msgstr "Criar novo repositório" - -#: lib/choose_repository.tcl:98 -msgid "New..." -msgstr "Novo..." - -#: lib/choose_repository.tcl:105 lib/choose_repository.tcl:496 -msgid "Clone Existing Repository" -msgstr "Clonar repositório existente" - -#: lib/choose_repository.tcl:116 -msgid "Clone..." -msgstr "Clonar..." - -#: lib/choose_repository.tcl:123 lib/choose_repository.tcl:1064 -msgid "Open Existing Repository" -msgstr "Abrir repositório existente" - -#: lib/choose_repository.tcl:129 -msgid "Open..." -msgstr "Abrir..." - -#: lib/choose_repository.tcl:142 -msgid "Recent Repositories" -msgstr "Repositórios recentes" - -#: lib/choose_repository.tcl:148 -msgid "Open Recent Repository:" -msgstr "Abrir repositório recente:" - -#: lib/choose_repository.tcl:316 lib/choose_repository.tcl:323 -#: lib/choose_repository.tcl:330 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Falha ao criar o repositório %s:" - -#: lib/choose_repository.tcl:407 lib/branch_create.tcl:33 -msgid "Create" -msgstr "Criar" - -#: lib/choose_repository.tcl:417 -msgid "Directory:" -msgstr "Diretório:" - -#: lib/choose_repository.tcl:447 lib/choose_repository.tcl:573 -#: lib/choose_repository.tcl:1098 -msgid "Git Repository" -msgstr "Repositório Git" - -#: lib/choose_repository.tcl:472 -#, tcl-format -msgid "Directory %s already exists." -msgstr "O diretório %s já existe." - -#: lib/choose_repository.tcl:476 -#, tcl-format -msgid "File %s already exists." -msgstr "O ficheiro %s já existe." - -#: lib/choose_repository.tcl:491 -msgid "Clone" -msgstr "Clonar" - -#: lib/choose_repository.tcl:504 -msgid "Source Location:" -msgstr "Localização de origem:" - -#: lib/choose_repository.tcl:513 -msgid "Target Directory:" -msgstr "Diretório de destino:" - -#: lib/choose_repository.tcl:523 -msgid "Clone Type:" -msgstr "Tipo de clone:" - -#: lib/choose_repository.tcl:528 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Padrão (rápido, semi-redundante, ligações fixas)" - -#: lib/choose_repository.tcl:533 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Cópia Total (lento, cópia de segurança redundante)" - -#: lib/choose_repository.tcl:538 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Partilhado (mais rápido, não recomendado, sem cópia)" - -#: lib/choose_repository.tcl:545 -msgid "Recursively clone submodules too" -msgstr "Clonar recursivamente submódulos também" - -#: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626 -#: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842 -#: lib/choose_repository.tcl:1104 lib/choose_repository.tcl:1112 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Não é um repositório Git: %s" - -#: lib/choose_repository.tcl:615 -msgid "Standard only available for local repository." -msgstr "Padrão só disponível em repositórios locais." - -#: lib/choose_repository.tcl:619 -msgid "Shared only available for local repository." -msgstr "Partilhado só disponível em repositórios locais." - -#: lib/choose_repository.tcl:640 -#, tcl-format -msgid "Location %s already exists." -msgstr "A localização %s já existe." - -#: lib/choose_repository.tcl:651 -msgid "Failed to configure origin" -msgstr "Falha ao configurar origem" - -#: lib/choose_repository.tcl:663 -msgid "Counting objects" -msgstr "A contar objetos" - -#: lib/choose_repository.tcl:664 -msgid "buckets" -msgstr "baldes" - -#: lib/choose_repository.tcl:688 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Não é possível copiar objects/info/alternates: %s" - -#: lib/choose_repository.tcl:724 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Nada para clonar de %s." - -#: lib/choose_repository.tcl:726 lib/choose_repository.tcl:940 -#: lib/choose_repository.tcl:952 -msgid "The 'master' branch has not been initialized." -msgstr "O ramo 'master' não foi inicializado." - -#: lib/choose_repository.tcl:739 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Ligações fixas indisponíveis. A recorrer a cópia." - -#: lib/choose_repository.tcl:751 -#, tcl-format -msgid "Cloning from %s" -msgstr "A clonar de %s" - -#: lib/choose_repository.tcl:782 -msgid "Copying objects" -msgstr "A copiar objetos" - -#: lib/choose_repository.tcl:783 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:807 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Não é possível copiar objeto: %s" - -#: lib/choose_repository.tcl:817 -msgid "Linking objects" -msgstr "A ligar objetos" - -#: lib/choose_repository.tcl:818 -msgid "objects" -msgstr "objetos" - -#: lib/choose_repository.tcl:826 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Não é possível criar ligação fixa de objeto: %s" - -#: lib/choose_repository.tcl:881 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Não é possível obter ramos e objetos. Ver saída na consola para detalhes." - -#: lib/choose_repository.tcl:892 -msgid "Cannot fetch tags. See console output for details." -msgstr "Não é possível obter tags. Ver saída na consola para detalhes." - -#: lib/choose_repository.tcl:916 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Não é possível determinar HEAD. Ver saída na consola para detalhes." - -#: lib/choose_repository.tcl:925 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Não foi possível limpar %s" - -#: lib/choose_repository.tcl:931 -msgid "Clone failed." -msgstr "Falha ao clonar." - -#: lib/choose_repository.tcl:938 -msgid "No default branch obtained." -msgstr "Não foi obtido nenhum ramo predefinido." - -#: lib/choose_repository.tcl:949 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Não é possível resolver %s como um commit." - -#: lib/choose_repository.tcl:961 -msgid "Creating working directory" -msgstr "A criar diretório de trabalho" - -#: lib/choose_repository.tcl:962 lib/index.tcl:70 lib/index.tcl:136 -#: lib/index.tcl:207 -msgid "files" -msgstr "ficheiros" - -#: lib/choose_repository.tcl:981 -msgid "Cannot clone submodules." -msgstr "Não é possível clonar submódulos." - -#: lib/choose_repository.tcl:990 -msgid "Cloning submodules" -msgstr "A clonar submódulos" - -#: lib/choose_repository.tcl:1015 -msgid "Initial file checkout failed." -msgstr "Falha de extração inicial de ficheiro." - -#: lib/choose_repository.tcl:1059 -msgid "Open" -msgstr "Abrir" - -#: lib/choose_repository.tcl:1069 -msgid "Repository:" -msgstr "Repositório:" - -#: lib/choose_repository.tcl:1118 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Falha ao abrir o repositório %s:" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - uma interface gráfica do Git." - -#: lib/blame.tcl:73 -msgid "File Viewer" -msgstr "Visualizador de ficheiros" - -#: lib/blame.tcl:79 -msgid "Commit:" -msgstr "Commit:" - -#: lib/blame.tcl:280 -msgid "Copy Commit" -msgstr "Copiar commit" - -#: lib/blame.tcl:284 -msgid "Find Text..." -msgstr "Procurar texto..." - -#: lib/blame.tcl:288 -msgid "Goto Line..." -msgstr "Ir para a linha..." - -#: lib/blame.tcl:297 -msgid "Do Full Copy Detection" -msgstr "Efetuar deteção de cópia integral" - -#: lib/blame.tcl:301 -msgid "Show History Context" -msgstr "Mostrar contexto histórico" - -#: lib/blame.tcl:304 -msgid "Blame Parent Commit" -msgstr "Culpar commit pai" - -#: lib/blame.tcl:466 -#, tcl-format -msgid "Reading %s..." -msgstr "A ler %s..." - -#: lib/blame.tcl:594 -msgid "Loading copy/move tracking annotations..." -msgstr "A carregar anotações de cópia/movimento..." - -#: lib/blame.tcl:614 -msgid "lines annotated" -msgstr "linhas anotadas" - -#: lib/blame.tcl:806 -msgid "Loading original location annotations..." -msgstr "A carregar anotações da localização original..." - -#: lib/blame.tcl:809 -msgid "Annotation complete." -msgstr "Anotação concluída." - -#: lib/blame.tcl:839 -msgid "Busy" -msgstr "A processar" - -#: lib/blame.tcl:840 -msgid "Annotation process is already running." -msgstr "O processo de anotação já está em execução." - -#: lib/blame.tcl:879 -msgid "Running thorough copy detection..." -msgstr "A executar deteção de cópia integral..." - -#: lib/blame.tcl:947 -msgid "Loading annotation..." -msgstr "A carregar anotação..." - -#: lib/blame.tcl:1000 -msgid "Author:" -msgstr "Autor:" - -#: lib/blame.tcl:1004 -msgid "Committer:" -msgstr "Committer:" - -#: lib/blame.tcl:1009 -msgid "Original File:" -msgstr "Ficheiro original:" - -#: lib/blame.tcl:1057 -msgid "Cannot find HEAD commit:" -msgstr "Não é possível encontrar commit HEAD:" - -#: lib/blame.tcl:1112 -msgid "Cannot find parent commit:" -msgstr "Não é possível encontrar commit pai:" - -#: lib/blame.tcl:1127 -msgid "Unable to display parent" -msgstr "Não é possível mostrar pai" - -#: lib/blame.tcl:1269 -msgid "Originally By:" -msgstr "Originalmente por:" - -#: lib/blame.tcl:1275 -msgid "In File:" -msgstr "No ficheiro:" - -#: lib/blame.tcl:1280 -msgid "Copied Or Moved Here By:" -msgstr "Copiado ou Movido para aqui por:" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Nenhum chave encontrada." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Chave pública encontrada em: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Gerar chave" - -#: lib/sshkey.tcl:58 -msgid "Copy To Clipboard" -msgstr "Copiar para a área de transferência" - -#: lib/sshkey.tcl:72 -msgid "Your OpenSSH Public Key" -msgstr "A sua chave OpenSSH pública" - -#: lib/sshkey.tcl:80 -msgid "Generating..." -msgstr "A gerar..." - -#: lib/sshkey.tcl:86 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Não foi possível iniciar ssh-keygen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:113 -msgid "Generation failed." -msgstr "Falha ao gerar." - -#: lib/sshkey.tcl:120 -msgid "Generation succeeded, but no keys found." -msgstr "Gerada com sucesso, mas não foi encontrada nenhum chave." - -#: lib/sshkey.tcl:123 -#, tcl-format -msgid "Your key is in: %s" -msgstr "A sua chave encontra-se em: %s" - -#: lib/branch_create.tcl:23 -msgid "Create Branch" -msgstr "Criar ramo" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "Cria novo ramo" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "Nome do ramo" - -#: lib/branch_create.tcl:57 -msgid "Match Tracking Branch Name" -msgstr "Corresponder ao nome do ramo de monitorização" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Revisão inicial" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Atualizar ramo existente:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Não" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Apenas avanço rápido (fast-forward)" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Extrair depois de criar" - -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "Selecione um ramo de monitorização." - -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "O ramo de monitorização %s não é um ramo no repositório remoto." - -#: 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ão há nada para emendar.\n" -"\n" -"Está prestes a criar o commit inicial. Não há nenhum commit antes deste para " -"emendar.\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ão é possível emendar ao mesmo tempo que se integra.\n" -"\n" -"Há uma integração em curso que não foi concluída. Não pode emendar o commit " -"anterior a não ser que primeiro aborte a atividade da integração atual.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Erro ao carregar dados do commit para emendar:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Não é possível obter a sua identidade:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "GIT_COMMITTER_IDENT inválido:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "aviso: Tcl não suporta a codificação '%s'." - -#: lib/commit.tcl:149 -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 "" -"O último estado analisado não corresponde ao estado do repositório.\n" -"\n" -"Outro programa Git modificou este repositório deste a última análise. Deve-" -"se reanalisar antes que se possa criar outro commit.\n" -"\n" -"Irá-se reanalisar automaticamente agora.\n" - -#: lib/commit.tcl:173 -#, 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ão pode fazer commit de ficheiros não integrados.\n" -"\n" -"O ficheiro %s tem conflitos de integração. Deve resolvê-los e preparar o " -"ficheiro antes de submeter.\n" - -#: lib/commit.tcl:181 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Detetado estado de ficheiro %s desconhecido.\n" -"\n" -"Este programa não pode submeter o ficheiro %s.\n" - -#: lib/commit.tcl:189 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Nenhum alteração para submeter.\n" -"\n" -"Deve preparar pelo menos 1 ficheiro antes de submeter.\n" - -#: lib/commit.tcl:204 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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 "" -"Forneça uma mensagem de commit.\n" -"\n" -"Um boa mensagem de commit tem o seguinte formato:\n" -"\n" -"- Primeira linha: descreve numa frase o que fez.\n" -"- Segunda linha: em branco.\n" -"- Linhas restantes: descreve porque esta alteração é vantajosa.\n" - -#: lib/commit.tcl:235 -msgid "Calling pre-commit hook..." -msgstr "A invocar gancho de pré-commit (pre-commit hook)..." - -#: lib/commit.tcl:250 -msgid "Commit declined by pre-commit hook." -msgstr "Commit recusado pela retina de pré-commit (pre-commit hook)." - -#: lib/commit.tcl:269 -msgid "" -"You are about to commit on a detached head. This is a potentially dangerous " -"thing to do because if you switch to another branch you will lose your " -"changes and it can be difficult to retrieve them later from the reflog. You " -"should probably cancel this commit and create a new branch to continue.\n" -" \n" -" Do you really want to proceed with your Commit?" -msgstr "" -"Está prestes a submeter numa cabeça destacada. Fazê-lo é potencialmente " -"perigoso, porque, se mudar para outro ramo, perderá as suas alterações e " -"pode ser difícil recuperá-las do reflog posteriormente. Provavelmente deve " -"cancelar este commit e criar um novo ramo para continuar.\n" -"\n" -"Pretende mesmo continuar com o commit?" - -#: lib/commit.tcl:290 -msgid "Calling commit-msg hook..." -msgstr "A invocar gancho de mensagem-de-commit (commit-msg hook)..." - -#: lib/commit.tcl:305 -msgid "Commit declined by commit-msg hook." -msgstr "Commit recusado pelo gancho de mensagem-de-commit (commit-msg hook)." - -#: lib/commit.tcl:318 -msgid "Committing changes..." -msgstr "A submeter alterações..." - -#: lib/commit.tcl:334 -msgid "write-tree failed:" -msgstr "write-tree falhou:" - -#: lib/commit.tcl:335 lib/commit.tcl:379 lib/commit.tcl:400 -msgid "Commit failed." -msgstr "Falha ao submeter." - -#: lib/commit.tcl:352 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "O commit %s parece estar corrompido" - -#: lib/commit.tcl:357 -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ão há alterações para submeter.\n" -"\n" -"Nenhum ficheiro foi modificado por este commit e não era um commit de " -"integração.\n" -"\n" -"Irá-se reanalisar agora automaticamente.\n" - -#: lib/commit.tcl:364 -msgid "No changes to commit." -msgstr "Não há alterações para submeter." - -#: lib/commit.tcl:378 -msgid "commit-tree failed:" -msgstr "commit-tree falhou:" - -#: lib/commit.tcl:399 -msgid "update-ref failed:" -msgstr "update-ref falhou:" - -#: lib/commit.tcl:492 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Commit %s criado: %s" - -#: lib/branch_delete.tcl:16 -msgid "Delete Branch" -msgstr "Eliminar ramo" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "Eliminar ramo local" - -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "Ramos locais" - -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "Eliminar só se foi integrado" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Os seguintes ramos não foram completamente integrados em %s:" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Falha ao eliminar ramos:\n" -"%s" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Não é possível desbloquear o índice." - -#: lib/index.tcl:17 -msgid "Index Error" -msgstr "Erro de Índice" - -#: lib/index.tcl:19 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Falha ao atualizar o índice do Git. Irá-se reanalisar automaticamente para " -"ressincronizar o git-gui." - -#: lib/index.tcl:30 -msgid "Continue" -msgstr "Continuar" - -#: lib/index.tcl:33 -msgid "Unlock Index" -msgstr "Desbloquear índice" - -#: lib/index.tcl:294 -msgid "Unstaging selected files from commit" -msgstr "A retirar ficheiros selecionados do commit" - -#: lib/index.tcl:298 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "A retirar %s do commit" - -#: lib/index.tcl:337 -msgid "Ready to commit." -msgstr "Pronto para submeter." - -#: lib/index.tcl:346 -msgid "Adding selected files" -msgstr "A adicionar ficheiros selecionados" - -#: lib/index.tcl:350 -#, tcl-format -msgid "Adding %s" -msgstr "A adicionar %s" - -#: lib/index.tcl:380 -#, tcl-format -msgid "Stage %d untracked files?" -msgstr "Preparar %d ficheiros não controlados?" - -#: lib/index.tcl:388 -msgid "Adding all changed files" -msgstr "A adicionar todos os ficheiros controlados" - -#: lib/index.tcl:428 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Reverter alterações no ficheiro %s?" - -#: lib/index.tcl:430 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Reverter alterações nestes %i ficheiros?" - -#: lib/index.tcl:438 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Qualquer alteração não preparada será permanentemente perdida ao reverter." - -#: lib/index.tcl:441 -msgid "Do Nothing" -msgstr "Não fazer nada" - -#: lib/index.tcl:459 -msgid "Reverting selected files" -msgstr "A reverter ficheiros selecionados" - -#: lib/index.tcl:463 -#, tcl-format -msgid "Reverting %s" -msgstr "A reverter %s" - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Predefinição" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Sistema (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Outro" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Data do Git inválida: %s" - -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" -msgstr "Esta extração destacada" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Expressão de revisão:" - -#: lib/choose_rev.tcl:72 -msgid "Local Branch" -msgstr "Ramo local" - -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" -msgstr "Ramo de monitorização" - -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 -msgid "Tag" -msgstr "Tag" - -#: lib/choose_rev.tcl:321 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Revisão inválida: %s" - -#: lib/choose_rev.tcl:342 -msgid "No revision selected." -msgstr "Nenhum revisão selecionada." - -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." -msgstr "A expressão de revisão está vazia." - -#: lib/choose_rev.tcl:537 -msgid "Updated" -msgstr "Atualizado" - -#: lib/choose_rev.tcl:565 -msgid "URL" -msgstr "URL" - -#: lib/database.tcl:42 -msgid "Number of loose objects" -msgstr "Número de objetos soltos" - -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" -msgstr "Espaço em disco usados por objetos soltos" - -#: lib/database.tcl:44 -msgid "Number of packed objects" -msgstr "Número de objetos compactados" - -#: lib/database.tcl:45 -msgid "Number of packs" -msgstr "Números de pacotes" - -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" -msgstr "Espaço em disco usado por objetos compactados" - -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" -msgstr "Objetos compactados à espera de poda" - -#: lib/database.tcl:48 -msgid "Garbage files" -msgstr "Ficheiros de lixo" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "A comprimir a base de dados de objetos" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "A verificar a base de dados de objetos com fsck-objects" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Este repositório tem aproximadamente %i objetos soltos.\n" -"\n" -"Para manter o desempenho ótimo é veemente recomendado que comprima a base de " -"dados.\n" -"\n" -"Comprimir a base de dados agora?" - -#: lib/error.tcl:20 lib/error.tcl:116 -msgid "error" -msgstr "erro" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "aviso" - -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." -msgstr "Deve corrigir os erros acima antes de submeter." - -#: 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ão possível integrar ao mesmo tempo que se emenda.\n" -"\n" -"Deve acabar de emendar este commit antes de iniciar qualquer tipo de " -"integração.\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 "" -"O último estado analisado não corresponde ao estado do repositório.\n" -"\n" -"Outro programa Git modificou este repositório deste a última análise. Deve-" -"se reanalisar antes de se poder integrar.\n" -"\n" -"Irá-se reanalisar agora automaticamente.\n" - -#: lib/merge.tcl:45 -#, 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 "" -"Integração com conflitos em curso.\n" -"\n" -"O ficheiro %s tem conflitos de integração.\n" -"\n" -"Deve resolvê-los, preparar o ficheiro e submeter para concluir a integração " -"atual. Só então pode iniciar outra integração.\n" - -#: lib/merge.tcl:55 -#, 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 "" -"Tem alterações presentes.\n" -"\n" -"O ficheiro %s foi modificado.\n" -"\n" -"Deve concluir o commit atual antes de iniciar uma integração. Assim, ajuda-o " -"a abortar uma integração falhada, caso necessário.\n" - -#: lib/merge.tcl:108 -#, tcl-format -msgid "%s of %s" -msgstr "%s de %s" - -#: lib/merge.tcl:122 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "A integrar %s e %s..." - -#: lib/merge.tcl:133 -msgid "Merge completed successfully." -msgstr "Integração concluída com sucesso." - -#: lib/merge.tcl:135 -msgid "Merge failed. Conflict resolution is required." -msgstr "Integração falhada. É necessário resolver conflitos." - -#: lib/merge.tcl:160 -#, tcl-format -msgid "Merge Into %s" -msgstr "Integrar em %s" - -#: lib/merge.tcl:179 -msgid "Revision To Merge" -msgstr "Revisão a integrar" - -#: lib/merge.tcl:214 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Não é possível abortar enquanto se emenda.\n" -"\n" -"Deve acabar de emendar este commit.\n" - -#: lib/merge.tcl:224 -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 "" -"Abortar integração?\n" -"\n" -"Ao abortar a integração atual perderá *TODAS* as alteração que não foram " -"submetidas.\n" -"\n" -"Continuar a abortar a integração atual?" - -#: lib/merge.tcl:230 -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 "" -"Repor alterações?\n" -"\n" -"Ao repor as alterações perderá *TODAS* as alterações não submetidas.\n" -"\n" -"Continuar a repor as alterações atuais?" - -#: lib/merge.tcl:241 -msgid "Aborting" -msgstr "A abortar" - -#: lib/merge.tcl:241 -msgid "files reset" -msgstr "ficheiros repostos" - -#: lib/merge.tcl:269 -msgid "Abort failed." -msgstr "Falha ao abortar." - -#: lib/merge.tcl:271 -msgid "Abort completed. Ready." -msgstr "Aborto concluído. Pronto." - -#~ msgid "Displaying only %s of %s files." -#~ msgstr "A mostrar apenas %s de %s ficheiros." - -#~ msgid "Case-Sensitive" -#~ msgstr "Distinguir Maiúsculas" diff --git a/third_party/git/git-gui/po/ru.po b/third_party/git/git-gui/po/ru.po deleted file mode 100644 index 9f5305c43eeb..000000000000 --- a/third_party/git/git-gui/po/ru.po +++ /dev/null @@ -1,2382 +0,0 @@ -# Translation of git-gui to russian -# Copyright (C) 2007 Shawn Pearce -# This file is distributed under the same license as the git-gui package. -# Translators: -# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015-2016 -# Irina Riesen <irina.riesen@gmail.com>, 2007 -msgid "" -msgstr "" -"Project-Id-Version: Git Russian Localization Project\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2016-06-30 12:39+0000\n" -"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" -"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" - -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: критическая ошибка" - -#: git-gui.sh:743 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "В %s установлен неверный шрифт:" - -#: git-gui.sh:779 -msgid "Main Font" -msgstr "Шрифт интерфейса" - -#: git-gui.sh:780 -msgid "Diff/Console Font" -msgstr "Шрифт консоли и изменений (diff)" - -#: git-gui.sh:794 -msgid "Cannot find git in PATH." -msgstr "git не найден в PATH." - -#: git-gui.sh:821 -msgid "Cannot parse Git version string:" -msgstr "Невозможно распознать строку версии Git: " - -#: git-gui.sh:839 -#, 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 требуется версия Git, начиная с 1.5.0\n\nПредположить, что «%s» и есть версия 1.5.0?\n" - -#: git-gui.sh:1128 -msgid "Git directory not found:" -msgstr "Каталог Git не найден:" - -#: git-gui.sh:1146 -msgid "Cannot move to top of working directory:" -msgstr "Невозможно перейти к корню рабочего каталога репозитория: " - -#: git-gui.sh:1154 -msgid "Cannot use bare repository:" -msgstr "Невозможно использование репозитория без рабочего каталога:" - -#: git-gui.sh:1162 -msgid "No working directory" -msgstr "Отсутствует рабочий каталог" - -#: git-gui.sh:1334 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Обновление информации о состоянии файлов…" - -#: git-gui.sh:1390 -msgid "Scanning for modified files ..." -msgstr "Поиск измененных файлов…" - -#: git-gui.sh:1454 -msgid "Calling prepare-commit-msg hook..." -msgstr "Вызов перехватчика prepare-commit-msg…" - -#: git-gui.sh:1471 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "Коммит прерван перехватчиком prepare-commit-msg." - -#: git-gui.sh:1629 lib/browser.tcl:246 -msgid "Ready." -msgstr "Готово." - -#: git-gui.sh:1787 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Показано %s из %s файлов." - -#: git-gui.sh:1913 -msgid "Unmodified" -msgstr "Не изменено" - -#: git-gui.sh:1915 -msgid "Modified, not staged" -msgstr "Изменено, не в индексе" - -#: git-gui.sh:1916 git-gui.sh:1924 -msgid "Staged for commit" -msgstr "В индексе для коммита" - -#: git-gui.sh:1917 git-gui.sh:1925 -msgid "Portions staged for commit" -msgstr "Части, в индексе для коммита" - -#: git-gui.sh:1918 git-gui.sh:1926 -msgid "Staged for commit, missing" -msgstr "В индексе для коммита, отсутствует" - -#: git-gui.sh:1920 -msgid "File type changed, not staged" -msgstr "Тип файла изменён, не в индексе" - -#: git-gui.sh:1921 -msgid "File type changed, staged" -msgstr "Тип файла изменён, в индексе" - -#: git-gui.sh:1923 -msgid "Untracked, not staged" -msgstr "Не отслеживается, не в индексе" - -#: git-gui.sh:1928 -msgid "Missing" -msgstr "Отсутствует" - -#: git-gui.sh:1929 -msgid "Staged for removal" -msgstr "В индексе для удаления" - -#: git-gui.sh:1930 -msgid "Staged for removal, still present" -msgstr "В индексе для удаления, еще не удалено" - -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 -msgid "Requires merge resolution" -msgstr "Требуется разрешение конфликта при слиянии" - -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "Запускается gitk… Подождите, пожалуйста…" - -#: git-gui.sh:1984 -msgid "Couldn't find gitk in PATH" -msgstr "gitk не найден в PATH." - -#: git-gui.sh:2043 -msgid "Couldn't find git gui in PATH" -msgstr "git gui не найден в PATH." - -#: git-gui.sh:2455 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "Репозиторий" - -#: git-gui.sh:2456 -msgid "Edit" -msgstr "Редактировать" - -#: git-gui.sh:2458 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "Ветка" - -#: git-gui.sh:2461 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "Коммит" - -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 -msgid "Merge" -msgstr "Слияние" - -#: git-gui.sh:2465 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "Внешние репозитории" - -#: git-gui.sh:2468 -msgid "Tools" -msgstr "Вспомогательные операции" - -#: git-gui.sh:2477 -msgid "Explore Working Copy" -msgstr "Просмотр рабочего каталога" - -#: git-gui.sh:2483 -msgid "Browse Current Branch's Files" -msgstr "Просмотреть файлы текущей ветки" - -#: git-gui.sh:2487 -msgid "Browse Branch Files..." -msgstr "Показать файлы ветки…" - -#: git-gui.sh:2492 -msgid "Visualize Current Branch's History" -msgstr "Показать историю текущей ветки" - -#: git-gui.sh:2496 -msgid "Visualize All Branch History" -msgstr "Показать историю всех веток" - -#: git-gui.sh:2503 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Показать файлы ветки %s" - -#: git-gui.sh:2505 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Показать историю ветки %s" - -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "Статистика базы данных" - -#: git-gui.sh:2513 lib/database.tcl:34 -msgid "Compress Database" -msgstr "Сжать базу данных" - -#: git-gui.sh:2516 -msgid "Verify Database" -msgstr "Проверить базу данных" - -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Создать ярлык на рабочем столе" - -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 -msgid "Quit" -msgstr "Выход" - -#: git-gui.sh:2547 -msgid "Undo" -msgstr "Отменить" - -#: git-gui.sh:2550 -msgid "Redo" -msgstr "Повторить" - -#: git-gui.sh:2554 git-gui.sh:3109 -msgid "Cut" -msgstr "Вырезать" - -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Копировать" - -#: git-gui.sh:2560 git-gui.sh:3115 -msgid "Paste" -msgstr "Вставить" - -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "Удалить" - -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 -msgid "Select All" -msgstr "Выделить все" - -#: git-gui.sh:2576 -msgid "Create..." -msgstr "Создать…" - -#: git-gui.sh:2582 -msgid "Checkout..." -msgstr "Перейти…" - -#: git-gui.sh:2588 -msgid "Rename..." -msgstr "Переименовать…" - -#: git-gui.sh:2593 -msgid "Delete..." -msgstr "Удалить…" - -#: git-gui.sh:2598 -msgid "Reset..." -msgstr "Сбросить…" - -#: git-gui.sh:2608 -msgid "Done" -msgstr "Завершено" - -#: git-gui.sh:2610 -msgid "Commit@@verb" -msgstr "Закоммитить" - -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "Новый коммит" - -#: git-gui.sh:2627 git-gui.sh:3057 -msgid "Amend Last Commit" -msgstr "Исправить последний коммит" - -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "Перечитать" - -#: git-gui.sh:2643 -msgid "Stage To Commit" -msgstr "Добавить в индекс" - -#: git-gui.sh:2649 -msgid "Stage Changed Files To Commit" -msgstr "Добавить изменённые файлы в индекс" - -#: git-gui.sh:2655 -msgid "Unstage From Commit" -msgstr "Убрать из издекса" - -#: git-gui.sh:2661 lib/index.tcl:412 -msgid "Revert Changes" -msgstr "Обратить изменения" - -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 -msgid "Show Less Context" -msgstr "Меньше контекста" - -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 -msgid "Show More Context" -msgstr "Больше контекста" - -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 -msgid "Sign Off" -msgstr "Вставить Signed-off-by" - -#: git-gui.sh:2696 -msgid "Local Merge..." -msgstr "Локальное слияние…" - -#: git-gui.sh:2701 -msgid "Abort Merge..." -msgstr "Прервать слияние…" - -#: git-gui.sh:2713 git-gui.sh:2741 -msgid "Add..." -msgstr "Добавить…" - -#: git-gui.sh:2717 -msgid "Push..." -msgstr "Отправить…" - -#: git-gui.sh:2721 -msgid "Delete Branch..." -msgstr "Удалить ветку…" - -#: git-gui.sh:2731 git-gui.sh:3292 -msgid "Options..." -msgstr "Настройки…" - -#: git-gui.sh:2742 -msgid "Remove..." -msgstr "Удалить…" - -#: git-gui.sh:2751 lib/choose_repository.tcl:50 -msgid "Help" -msgstr "Помощь" - -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "О %s" - -#: git-gui.sh:2783 -msgid "Online Documentation" -msgstr "Документация в интернете" - -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 -msgid "Show SSH Key" -msgstr "Показать ключ SSH" - -#: git-gui.sh:2893 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "критическая ошибка: %s: нет такого файла или каталога" - -#: git-gui.sh:2926 -msgid "Current Branch:" -msgstr "Текущая ветка:" - -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "Изменения в индексе (будут закоммичены)" - -#: git-gui.sh:2967 -msgid "Unstaged Changes" -msgstr "Изменено (не будет сохранено)" - -#: git-gui.sh:3017 -msgid "Stage Changed" -msgstr "Индексировать всё" - -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 -msgid "Push" -msgstr "Отправить" - -#: git-gui.sh:3071 -msgid "Initial Commit Message:" -msgstr "Сообщение первого коммита:" - -#: git-gui.sh:3072 -msgid "Amended Commit Message:" -msgstr "Сообщение исправленного коммита:" - -#: git-gui.sh:3073 -msgid "Amended Initial Commit Message:" -msgstr "Сообщение исправленного первого коммита:" - -#: git-gui.sh:3074 -msgid "Amended Merge Commit Message:" -msgstr "Сообщение исправленного слияния:" - -#: git-gui.sh:3075 -msgid "Merge Commit Message:" -msgstr "Сообщение слияния:" - -#: git-gui.sh:3076 -msgid "Commit Message:" -msgstr "Сообщение коммита:" - -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 -msgid "Copy All" -msgstr "Копировать все" - -#: git-gui.sh:3149 lib/blame.tcl:104 -msgid "File:" -msgstr "Файл:" - -#: git-gui.sh:3255 -msgid "Refresh" -msgstr "Обновить" - -#: git-gui.sh:3276 -msgid "Decrease Font Size" -msgstr "Уменьшить размер шрифта" - -#: git-gui.sh:3280 -msgid "Increase Font Size" -msgstr "Увеличить размер шрифта" - -#: git-gui.sh:3288 lib/blame.tcl:281 -msgid "Encoding" -msgstr "Кодировка" - -#: git-gui.sh:3299 -msgid "Apply/Reverse Hunk" -msgstr "Применить/Убрать изменение" - -#: git-gui.sh:3304 -msgid "Apply/Reverse Line" -msgstr "Применить/Убрать строку" - -#: git-gui.sh:3323 -msgid "Run Merge Tool" -msgstr "Запустить программу слияния" - -#: git-gui.sh:3328 -msgid "Use Remote Version" -msgstr "Взять внешнюю версию" - -#: git-gui.sh:3332 -msgid "Use Local Version" -msgstr "Взять локальную версию" - -#: git-gui.sh:3336 -msgid "Revert To Base" -msgstr "Обратить изменения" - -#: git-gui.sh:3354 -msgid "Visualize These Changes In The Submodule" -msgstr "Показать эти изменения подмодуля" - -#: git-gui.sh:3358 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Показать историю текущей ветки подмодуля" - -#: git-gui.sh:3362 -msgid "Visualize All Branch History In The Submodule" -msgstr "Показать историю всех веток подмодуля" - -#: git-gui.sh:3367 -msgid "Start git gui In The Submodule" -msgstr "Запустить git gui в подмодуле" - -#: git-gui.sh:3389 -msgid "Unstage Hunk From Commit" -msgstr "Убрать блок из индекса" - -#: git-gui.sh:3391 -msgid "Unstage Lines From Commit" -msgstr "Убрать строки из индекса" - -#: git-gui.sh:3393 -msgid "Unstage Line From Commit" -msgstr "Убрать строку из индекса" - -#: git-gui.sh:3396 -msgid "Stage Hunk For Commit" -msgstr "Добавить блок в индекс" - -#: git-gui.sh:3398 -msgid "Stage Lines For Commit" -msgstr "Добавить строки в индекс" - -#: git-gui.sh:3400 -msgid "Stage Line For Commit" -msgstr "Добавить строку в индекс" - -#: git-gui.sh:3424 -msgid "Initializing..." -msgstr "Инициализация…" - -#: git-gui.sh:3541 -#, 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Переменные окружения, которые возможно\nбудут проигнорированы командами Git,\nзапущенными из %s\n\n" - -#: git-gui.sh:3570 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "\nЭто известная проблема с Tcl,\nраспространяемым Cygwin." - -#: git-gui.sh:3575 -#, 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Вместо использования %s можно\nсохранить значения user.name и\nuser.email в Вашем персональном\nфайле ~/.gitconfig.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - графический пользовательский интерфейс к Git." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "Просмотр файла" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "Коммит:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "Копировать SHA-1" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "Найти текст…" - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "Провести полный поиск копий" - -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "Показать исторический контекст" - -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "Авторы родительского коммита" - -#: lib/blame.tcl:450 -#, tcl-format -msgid "Reading %s..." -msgstr "Чтение %s…" - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "Загрузка аннотации копирований/переименований…" - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "строк прокомментировано" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "Загрузка аннотаций первоначального положения объекта…" - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "Аннотация завершена." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "Занят" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "Аннотация уже запущена" - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "Выполнение полного поиска копий…" - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "Загрузка аннотации…" - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "Автор:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "Коммитер:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "Исходный файл:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "Не удалось найти текущее состояние:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "Не удалось найти родительское состояние:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "Не могу показать предка" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "Ошибка загрузки изменений:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "Источник:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "Файл:" - -#: lib/blame.tcl:1242 -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:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "Отмена" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "Версия" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -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:381 -msgid "Create" -msgstr "Создать" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "Имя ветки" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -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 "Только Fast Forward" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -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 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -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 lib/remote_branch_delete.tcl:217 -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:202 -#, 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:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "Загрузка %s…" - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[На уровень выше]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "Показать файлы ветки" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "Показать" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Извлечение %s из %s " - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "критическая ошибка: невозможно разрешить %s" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 -msgid "Close" -msgstr "Закрыть" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Ветка «%s» не существует." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Ошибка создания упрощённой конфигурации git pull для «%s»." - -#: lib/checkout_op.tcl:229 -#, 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:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Неизвестная стратегия слияния «%s»." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Не удалось обновить «%s»." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "Рабочая область заблокирована другим процессом." - -#: lib/checkout_op.tcl:289 -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:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Обновление рабочего каталога из «%s»…" - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "файлы извлечены" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Прерван переход на «%s» (требуется слияние содержимого файлов)" - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Требуется слияние содержания файлов." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Ветка «%s» остаётся текущей." - -#: lib/checkout_op.tcl:452 -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:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Выполнен переход на «%s»." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Сброс «%s» на «%s» приведет к потере следующих коммитов:" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Восстановить потерянные коммиты будет сложно." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Сбросить «%s»?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 -msgid "Visualize" -msgstr "Наглядно" - -#: lib/checkout_op.tcl:635 -#, 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\nЭтого не должно было произойти. %s завершается." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "Выбрать" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "Шрифт" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "Размер шрифта" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "Пример текста" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "Это пример текста.\nЕсли Вам нравится этот текст, это может быть Ваш шрифт." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 -msgid "Create New Repository" -msgstr "Создать новый репозиторий" - -#: lib/choose_repository.tcl:93 -msgid "New..." -msgstr "Новый…" - -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 -msgid "Clone Existing Repository" -msgstr "Склонировать существующий репозиторий" - -#: lib/choose_repository.tcl:106 -msgid "Clone..." -msgstr "Клонировать…" - -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 -msgid "Open Existing Repository" -msgstr "Выбрать существующий репозиторий" - -#: lib/choose_repository.tcl:119 -msgid "Open..." -msgstr "Открыть…" - -#: lib/choose_repository.tcl:132 -msgid "Recent Repositories" -msgstr "Недавние репозитории" - -#: lib/choose_repository.tcl:138 -msgid "Open Recent Repository:" -msgstr "Открыть последний репозиторий" - -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Не удалось создать репозиторий %s:" - -#: lib/choose_repository.tcl:391 -msgid "Directory:" -msgstr "Каталог:" - -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 -msgid "Git Repository" -msgstr "Репозиторий" - -#: lib/choose_repository.tcl:448 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Каталог '%s' уже существует." - -#: lib/choose_repository.tcl:452 -#, tcl-format -msgid "File %s already exists." -msgstr "Файл '%s' уже существует." - -#: lib/choose_repository.tcl:466 -msgid "Clone" -msgstr "Склонировать" - -#: lib/choose_repository.tcl:479 -msgid "Source Location:" -msgstr "Исходное положение:" - -#: lib/choose_repository.tcl:490 -msgid "Target Directory:" -msgstr "Каталог назначения:" - -#: lib/choose_repository.tcl:502 -msgid "Clone Type:" -msgstr "Тип клона:" - -#: lib/choose_repository.tcl:508 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Стандартный (Быстрый, полуизбыточный, «жесткие» ссылки)" - -#: lib/choose_repository.tcl:514 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Полная копия (Медленный, создает резервную копию)" - -#: lib/choose_repository.tcl:520 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Общий (Самый быстрый, не рекомендуется, без резервной копии)" - -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Каталог не является репозиторием: %s" - -#: lib/choose_repository.tcl:592 -msgid "Standard only available for local repository." -msgstr "Стандартный клон возможен только для локального репозитория." - -#: lib/choose_repository.tcl:596 -msgid "Shared only available for local repository." -msgstr "Общий клон возможен только для локального репозитория." - -#: lib/choose_repository.tcl:617 -#, tcl-format -msgid "Location %s already exists." -msgstr "Путь '%s' уже существует." - -#: lib/choose_repository.tcl:628 -msgid "Failed to configure origin" -msgstr "Не могу сконфигурировать исходный репозиторий." - -#: lib/choose_repository.tcl:640 -msgid "Counting objects" -msgstr "Считаю объекты" - -#: lib/choose_repository.tcl:641 -msgid "buckets" -msgstr "блоки" - -#: lib/choose_repository.tcl:665 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Не могу скопировать objects/info/alternates: %s" - -#: lib/choose_repository.tcl:701 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Нечего клонировать с %s." - -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 -msgid "The 'master' branch has not been initialized." -msgstr "Не инициализирована ветвь «master»." - -#: lib/choose_repository.tcl:716 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "«Жесткие ссылки» недоступны. Будет использовано копирование." - -#: lib/choose_repository.tcl:728 -#, tcl-format -msgid "Cloning from %s" -msgstr "Клонирование %s" - -#: lib/choose_repository.tcl:759 -msgid "Copying objects" -msgstr "Копирование objects" - -#: lib/choose_repository.tcl:760 -msgid "KiB" -msgstr "КБ" - -#: lib/choose_repository.tcl:784 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Не могу скопировать объект: %s" - -#: lib/choose_repository.tcl:794 -msgid "Linking objects" -msgstr "Создание ссылок на objects" - -#: lib/choose_repository.tcl:795 -msgid "objects" -msgstr "объекты" - -#: lib/choose_repository.tcl:803 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Не могу создать «жесткую ссылку» на объект: %s" - -#: lib/choose_repository.tcl:858 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "Не удалось извлечь ветки и объекты. Дополнительная информация на консоли." - -#: lib/choose_repository.tcl:869 -msgid "Cannot fetch tags. See console output for details." -msgstr "Не удалось извлечь метки. Дополнительная информация на консоли." - -#: lib/choose_repository.tcl:893 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Не могу определить HEAD. Дополнительная информация на консоли." - -#: lib/choose_repository.tcl:902 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Не могу очистить %s" - -#: lib/choose_repository.tcl:908 -msgid "Clone failed." -msgstr "Клонирование не удалось." - -#: lib/choose_repository.tcl:915 -msgid "No default branch obtained." -msgstr "Ветка по умолчанию не была получена." - -#: lib/choose_repository.tcl:926 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Не могу распознать %s как коммит." - -#: lib/choose_repository.tcl:938 -msgid "Creating working directory" -msgstr "Создаю рабочий каталог" - -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "файлов" - -#: lib/choose_repository.tcl:968 -msgid "Initial file checkout failed." -msgstr "Не удалось получить начальное состояние файлов репозитория." - -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "Открыть" - -#: lib/choose_repository.tcl:1021 -msgid "Repository:" -msgstr "Репозиторий:" - -#: lib/choose_repository.tcl:1072 -#, 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:538 -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:531 -msgid "Updated" -msgstr "Обновлено" - -#: lib/choose_rev.tcl:559 -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 "Отсутствует коммиты для исправления.\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:48 -msgid "Error loading commit data for amend:" -msgstr "Ошибка при загрузке данных для исправления коммита:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Невозможно получить информацию об авторстве:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Недопустимый GIT_COMMITTER_IDENT:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "предупреждение: Tcl не поддерживает кодировку «%s»." - -#: lib/commit.tcl:149 -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:172 -#, 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:180 -#, 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:188 -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:203 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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:234 -msgid "Calling pre-commit hook..." -msgstr "Вызов перехватчика pre-commit…" - -#: lib/commit.tcl:249 -msgid "Commit declined by pre-commit hook." -msgstr "Коммит прерван переватчиком pre-commit." - -#: lib/commit.tcl:272 -msgid "Calling commit-msg hook..." -msgstr "Вызов перехватчика commit-msg…" - -#: lib/commit.tcl:287 -msgid "Commit declined by commit-msg hook." -msgstr "Коммит прерван переватчиком commit-msg" - -#: lib/commit.tcl:300 -msgid "Committing changes..." -msgstr "Коммит изменений…" - -#: lib/commit.tcl:316 -msgid "write-tree failed:" -msgstr "Программа write-tree завершилась с ошибкой:" - -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 -msgid "Commit failed." -msgstr "Не удалось закоммитить изменения." - -#: lib/commit.tcl:334 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Коммит %s похоже поврежден" - -#: lib/commit.tcl:339 -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:346 -msgid "No changes to commit." -msgstr "Нет изменения для коммита." - -#: lib/commit.tcl:360 -msgid "commit-tree failed:" -msgstr "Программа commit-tree завершилась с ошибкой:" - -#: lib/commit.tcl:381 -msgid "update-ref failed:" -msgstr "Программа update-ref завершилась с ошибкой:" - -#: lib/commit.tcl:469 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Создан коммит %s: %s " - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "В процессе… пожалуйста, ждите…" - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Процесс успешно завершен" - -#: lib/console.tcl:200 -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 "Количество pack-файлов" - -#: 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" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress the database.\n" -"\n" -"Compress the database now?" -msgstr "Этот репозиторий сейчас содержит примерно %i свободных объектов\n\nДля лучшей производительности рекомендуется сжать базу данных.\n\nСжать базу данных сейчас?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Неправильная дата в репозитории: %s" - -#: lib/diff.tcl:64 -#, 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:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Загрузка изменений %s…" - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "ЛОКАЛЬНО: удалён\nВНЕШНИЙ:\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "ВНЕШНИЙ: удалён\nЛОКАЛЬНО:\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "ЛОКАЛЬНО:\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "ВНЕШНИЙ:\n" - -#: lib/diff.tcl:202 lib/diff.tcl:319 -#, tcl-format -msgid "Unable to display %s" -msgstr "Не могу показать %s" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Ошибка загрузки файла:" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Репозиторий Git (подпроект)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* Двоичный файл (содержимое не показано)" - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "* Размер неотслеживаемого файла %d байт.\n* Показано первых %d байт.\n" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "\n* Неотслеживаемый файл обрезан: %s.\n* Чтобы увидеть весь файл, используйте внешний редактор.\n" - -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "Не удалось исключить выбранную часть." - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "Не удалось проиндексировать выбранный блок изменений." - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "Не удалось исключить выбранную строку." - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "Не удалось проиндексировать выбранную строку." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "По умолчанию" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Системная (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Другая" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "ошибка" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "предупреждение" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "Перед коммитом, исправьте вышеуказанные ошибки." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Не удалось разблокировать индекс" - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "Ошибка в индексе" - -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "Не удалось обновить индекс Git. Состояние репозитория будет перечитано автоматически." - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "Продолжить" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Разблокировать индекс" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Удаление %s из индекса" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "Готов для коммита." - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "Добавление %s…" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Обратить изменения в файле %s?" - -#: lib/index.tcl:400 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Обратить изменения в %i файле(-ах)?" - -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "Любые непроиндексированные изменения, будут потеряны при обращении изменений." - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "Ничего не делать" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "Обращение изменений в выбранных файлах" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "Обращение изменений в %s" - -#: 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:45 -#, 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:55 -#, 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:107 -#, tcl-format -msgid "%s of %s" -msgstr "%s из %s" - -#: lib/merge.tcl:120 -#, 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:239 -msgid "files reset" -msgstr "изменения в файлах отменены" - -#: lib/merge.tcl:267 -msgid "Abort failed." -msgstr "Прервать не удалось." - -#: lib/merge.tcl:269 -msgid "Abort completed. Ready." -msgstr "Прервано." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Использовать базовую версию для разрешения конфликта?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Использовать версию из этой ветки для разрешения конфликта?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Использовать версию из другой ветки для разрешения конфликта?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "Внимание! Список изменений показывает только конфликтующие отличия.\n\n%s будет переписан.\n\nЭто действие можно отменить только перезапуском операции слияния." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "Похоже, что файл %s содержит неразрешенные конфликты. Продолжить индексацию?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Добавляю результат разрешения для %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "Программа слияния не обрабатывает конфликты с удалением или участием ссылок" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Конфликтующий файл не существует" - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "«%s» не является программой слияния" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Неподдерживаемая программа слияния «%s»" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "Программа слияния уже работает. Прервать?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "Ошибка получения версий:\n%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "Ошибка запуска программы слияния:\n\n%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "Запуск программы слияния…" - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "Ошибка выполнения программы слияния." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Неверная глобальная кодировка «%s»" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Неверная кодировка репозитория «%s»" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "Восстановить настройки по умолчанию" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Сохранить" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "Для репозитория %s" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "Общие (для всех репозиториев)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "Имя пользователя" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "Адрес электронной почты" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Суммарное сообщение при слиянии" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Уровень детальности сообщений при слиянии" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "Показать отчет об изменениях после слияния" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "Использовать для слияния программу" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "Доверять времени модификации файла" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "Чистка отслеживаемых веток при извлечении изменений" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Такое же имя, как и у отслеживаемой ветки" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "Поиск копий только в изменённых файлах" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "Минимальное количество символов для поиска копий" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Радиус исторического контекста (в днях)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Число строк в контексте diff" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Ширина текста сообщения коммита" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Шаблон для имени новой ветки" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "Кодировка содержания файла по умолчанию" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "Изменить" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Словарь для проверки правописания:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "Изменить" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "Выберите %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "Настройки" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "Не удалось полностью сохранить настройки:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Удалить ссылку на внешний репозиторий" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Чистка" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "Извлечение из" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "Отправить" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "Зарегистрировать внешний репозиторий" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "Добавить внешний репозиторий" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "Добавить" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "Информация о внешнем репозитории" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Положение:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Следующая операция" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Сразу извлечь изменения" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "Инициализировать внешний репозиторий и отправить" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "Больше ничего не делать" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Укажите название внешнего репозитория." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "«%s» не является допустимым именем внешнего репозитория." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Не удалось добавить «%s» из «%s». " - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "извлечение %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "Извлечение %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Невозможно инициализировать репозиторий в «%s»." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "отправить %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Настройка %s (в %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Удаление ветки во внешнем репозитории" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "Из репозитория" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "внешний:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -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: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:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Удаление веток из %s" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "Не указан репозиторий." - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "Перечитывание %s…" - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "Поиск:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "Дальше" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "Обратно" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "Игн. большие/маленькие" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Невозможно записать ссылку:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Невозможно записать значок:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Неподдерживаемая программа проверки правописания" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Проверка правописания не доступна" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Неправильная конфигурация программы проверки правописания" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Словарь вернут к %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Программа проверки правописания не смогла запуститься" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Нераспознанная программа проверки правописания" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Исправлений не найдено" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Программа проверки правописания прервала передачу данных" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Ошибка проверки правописания" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Ключ не найден" - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Публичный ключ из %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Создать ключ" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Скопировать в буфер обмена" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "Ваш публичный ключ OpenSSH" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Создание…" - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "Ошибка запуска ssh-keygen:\n\n%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "Ключ не создан." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "Создание ключа завершилось, но результат не был найден" - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Ваш ключ находится в: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s … %*i из %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Запуск %s требует выбранного файла." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Действительно запустить %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "Вспомогательная операция: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "Выполнение: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Программа %s завершилась успешно." - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Ошибка выполнения программы: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Добавить вспомогательную операцию" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Новая вспомогательная операция" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "Добавить для всех репозиториев" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "Описание вспомогательной операции" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Используйте «/» для создания подменю" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "Команда:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "Показать диалог перед запуском" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Запрос на выбор версии (устанавливает $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Запрос дополнительных аргументов (устанавливает $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "Не показывать окно вывода команды" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Запуск только если показан список изменений ($FILENAME не пусто)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Укажите название вспомогательной операции." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Вспомогательная операция «%s» уже существует." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "Ошибка добавления программы:\n%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Удалить программу" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Удалить команды программы" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Удалить" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Синим выделены программы локальные репозиторию)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "Запуск команды: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "Аргументы" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: 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:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Отправка изменений в %s " - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Точное копирование в %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Отправка %s %s в %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "Отправить ветки" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "Исходные ветки" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Репозиторий назначения" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "Настройки отправки" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Принудительно перезаписать существующую ветку (возможна потеря изменений)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "Использовать thin pack (для медленных сетевых подключений)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "Передать метки" diff --git a/third_party/git/git-gui/po/sv.po b/third_party/git/git-gui/po/sv.po deleted file mode 100644 index 1b4ad8368ebf..000000000000 --- a/third_party/git/git-gui/po/sv.po +++ /dev/null @@ -1,2736 +0,0 @@ -# Swedish translation of git-gui. -# Copyright (C) 2007-2008 Shawn Pearce, et al. -# This file is distributed under the same license as the git-gui package. -# -# Mikael Magnusson <mikachu@gmail.com>, 2008. -# Peter Krefting <peter@softwolves.pp.se>, 2007-2008, 2015. -# -msgid "" -msgstr "" -"Project-Id-Version: sv\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-27 10:15+0100\n" -"PO-Revision-Date: 2015-03-27 10:24+0100\n" -"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" -"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" -"Language: sv\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" -"X-Generator: Gtranslator 2.91.6\n" - -#: git-gui.sh:861 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Ogiltigt teckensnitt angivet i %s:" - -#: git-gui.sh:915 -msgid "Main Font" -msgstr "Huvudteckensnitt" - -#: git-gui.sh:916 -msgid "Diff/Console Font" -msgstr "Diff/konsolteckensnitt" - -#: git-gui.sh:931 git-gui.sh:945 git-gui.sh:958 git-gui.sh:1048 -#: git-gui.sh:1067 git-gui.sh:3125 -msgid "git-gui: fatal error" -msgstr "git-gui: ödesdigert fel" - -#: git-gui.sh:932 -msgid "Cannot find git in PATH." -msgstr "Hittar inte git i PATH." - -#: git-gui.sh:959 -msgid "Cannot parse Git version string:" -msgstr "Kan inte tolka versionssträng från Git:" - -#: git-gui.sh:984 -#, 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 "" -"Kan inte avgöra Gits version.\n" -"\n" -"%s säger att dess version är \"%s\".\n" -"\n" -"%s kräver minst Git 1.5.0 eller senare.\n" -"\n" -"Anta att \"%s\" är version 1.5.0?\n" - -#: git-gui.sh:1281 -msgid "Git directory not found:" -msgstr "Git-katalogen hittades inte:" - -#: git-gui.sh:1315 -msgid "Cannot move to top of working directory:" -msgstr "Kan inte gå till början på arbetskatalogen:" - -#: git-gui.sh:1323 -msgid "Cannot use bare repository:" -msgstr "Kan inte använda naket arkiv:" - -#: git-gui.sh:1331 -msgid "No working directory" -msgstr "Ingen arbetskatalog" - -#: git-gui.sh:1503 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Uppdaterar filstatus..." - -#: git-gui.sh:1563 -msgid "Scanning for modified files ..." -msgstr "Söker efter ändrade filer..." - -#: git-gui.sh:1639 -msgid "Calling prepare-commit-msg hook..." -msgstr "" -"Anropar kroken för förberedelse av incheckningsmeddelande (prepare-commit-" -"msg)..." - -#: git-gui.sh:1656 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "" -"Incheckningen avvisades av kroken för förberedelse av incheckningsmeddelande " -"(prepare-commit-msg)." - -#: git-gui.sh:1814 lib/browser.tcl:252 -msgid "Ready." -msgstr "Klar." - -#: git-gui.sh:1978 -#, tcl-format -msgid "" -"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." -msgstr "" -"Visningsgräns (gui.maxfilesdisplayed = %s) nådd, visare inte samtliga %s " -"filer." - -#: git-gui.sh:2101 -msgid "Unmodified" -msgstr "Oförändrade" - -#: git-gui.sh:2103 -msgid "Modified, not staged" -msgstr "Förändrade, ej köade" - -#: git-gui.sh:2104 git-gui.sh:2116 -msgid "Staged for commit" -msgstr "Köade för incheckning" - -#: git-gui.sh:2105 git-gui.sh:2117 -msgid "Portions staged for commit" -msgstr "Delar köade för incheckning" - -#: git-gui.sh:2106 git-gui.sh:2118 -msgid "Staged for commit, missing" -msgstr "Köade för incheckning, saknade" - -#: git-gui.sh:2108 -msgid "File type changed, not staged" -msgstr "Filtyp ändrad, ej köade" - -#: git-gui.sh:2109 git-gui.sh:2110 -msgid "File type changed, old type staged for commit" -msgstr "Filtyp ändrad, gammal typ köade för incheckning" - -#: git-gui.sh:2111 -msgid "File type changed, staged" -msgstr "Filtyp ändrad, köade" - -#: git-gui.sh:2112 -msgid "File type change staged, modification not staged" -msgstr "Filtypsändringar köade, innehållsändringar ej köade" - -#: git-gui.sh:2113 -msgid "File type change staged, file missing" -msgstr "Filtypsändringar köade, fil saknas" - -#: git-gui.sh:2115 -msgid "Untracked, not staged" -msgstr "Ej spårade, ej köade" - -#: git-gui.sh:2120 -msgid "Missing" -msgstr "Saknade" - -#: git-gui.sh:2121 -msgid "Staged for removal" -msgstr "Köade för borttagning" - -#: git-gui.sh:2122 -msgid "Staged for removal, still present" -msgstr "Köade för borttagning, fortfarande närvarande" - -#: git-gui.sh:2124 git-gui.sh:2125 git-gui.sh:2126 git-gui.sh:2127 -#: git-gui.sh:2128 git-gui.sh:2129 -msgid "Requires merge resolution" -msgstr "Kräver konflikthantering efter sammanslagning" - -#: git-gui.sh:2164 -msgid "Starting gitk... please wait..." -msgstr "Startar gitk... vänta..." - -#: git-gui.sh:2176 -msgid "Couldn't find gitk in PATH" -msgstr "Hittade inte gitk i PATH." - -#: git-gui.sh:2235 -msgid "Couldn't find git gui in PATH" -msgstr "Hittade inte git gui i PATH." - -#: git-gui.sh:2654 lib/choose_repository.tcl:41 -msgid "Repository" -msgstr "Arkiv" - -#: git-gui.sh:2655 -msgid "Edit" -msgstr "Redigera" - -#: git-gui.sh:2657 lib/choose_rev.tcl:567 -msgid "Branch" -msgstr "Gren" - -#: git-gui.sh:2660 lib/choose_rev.tcl:554 -msgid "Commit@@noun" -msgstr "Incheckning" - -#: git-gui.sh:2663 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 -msgid "Merge" -msgstr "Slå ihop" - -#: git-gui.sh:2664 lib/choose_rev.tcl:563 -msgid "Remote" -msgstr "Fjärrarkiv" - -#: git-gui.sh:2667 -msgid "Tools" -msgstr "Verktyg" - -#: git-gui.sh:2676 -msgid "Explore Working Copy" -msgstr "Utforska arbetskopia" - -#: git-gui.sh:2682 -msgid "Git Bash" -msgstr "Git Bash" - -#: git-gui.sh:2692 -msgid "Browse Current Branch's Files" -msgstr "Bläddra i grenens filer" - -#: git-gui.sh:2696 -msgid "Browse Branch Files..." -msgstr "Bläddra filer på gren..." - -#: git-gui.sh:2701 -msgid "Visualize Current Branch's History" -msgstr "Visualisera grenens historik" - -#: git-gui.sh:2705 -msgid "Visualize All Branch History" -msgstr "Visualisera alla grenars historik" - -#: git-gui.sh:2712 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Bläddra i filer för %s" - -#: git-gui.sh:2714 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Visualisera historik för %s" - -#: git-gui.sh:2719 lib/database.tcl:40 lib/database.tcl:66 -msgid "Database Statistics" -msgstr "Databasstatistik" - -#: git-gui.sh:2722 lib/database.tcl:33 -msgid "Compress Database" -msgstr "Komprimera databas" - -#: git-gui.sh:2725 -msgid "Verify Database" -msgstr "Verifiera databas" - -#: git-gui.sh:2732 git-gui.sh:2736 git-gui.sh:2740 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Skapa skrivbordsikon" - -#: git-gui.sh:2748 lib/choose_repository.tcl:193 lib/choose_repository.tcl:201 -msgid "Quit" -msgstr "Avsluta" - -#: git-gui.sh:2756 -msgid "Undo" -msgstr "Ångra" - -#: git-gui.sh:2759 -msgid "Redo" -msgstr "Gör om" - -#: git-gui.sh:2763 git-gui.sh:3368 -msgid "Cut" -msgstr "Klipp ut" - -#: git-gui.sh:2766 git-gui.sh:3371 git-gui.sh:3445 git-gui.sh:3530 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Kopiera" - -#: git-gui.sh:2769 git-gui.sh:3374 -msgid "Paste" -msgstr "Klistra in" - -#: git-gui.sh:2772 git-gui.sh:3377 lib/remote_branch_delete.tcl:39 -#: lib/branch_delete.tcl:28 -msgid "Delete" -msgstr "Ta bort" - -#: git-gui.sh:2776 git-gui.sh:3381 git-gui.sh:3534 lib/console.tcl:71 -msgid "Select All" -msgstr "Markera alla" - -#: git-gui.sh:2785 -msgid "Create..." -msgstr "Skapa..." - -#: git-gui.sh:2791 -msgid "Checkout..." -msgstr "Checka ut..." - -#: git-gui.sh:2797 -msgid "Rename..." -msgstr "Byt namn..." - -#: git-gui.sh:2802 -msgid "Delete..." -msgstr "Ta bort..." - -#: git-gui.sh:2807 -msgid "Reset..." -msgstr "Återställ..." - -#: git-gui.sh:2817 -msgid "Done" -msgstr "Färdig" - -#: git-gui.sh:2819 -msgid "Commit@@verb" -msgstr "Checka in" - -#: git-gui.sh:2828 git-gui.sh:3309 -msgid "New Commit" -msgstr "Ny incheckning" - -#: git-gui.sh:2836 git-gui.sh:3316 -msgid "Amend Last Commit" -msgstr "Lägg till föregående incheckning" - -#: git-gui.sh:2846 git-gui.sh:3270 lib/remote_branch_delete.tcl:101 -msgid "Rescan" -msgstr "Sök på nytt" - -#: git-gui.sh:2852 -msgid "Stage To Commit" -msgstr "Köa för incheckning" - -#: git-gui.sh:2858 -msgid "Stage Changed Files To Commit" -msgstr "Köa ändrade filer för incheckning" - -#: git-gui.sh:2864 -msgid "Unstage From Commit" -msgstr "Ta bort från incheckningskö" - -#: git-gui.sh:2870 lib/index.tcl:442 -msgid "Revert Changes" -msgstr "Återställ ändringar" - -#: git-gui.sh:2878 git-gui.sh:3581 git-gui.sh:3612 -msgid "Show Less Context" -msgstr "Visa mindre sammanhang" - -#: git-gui.sh:2882 git-gui.sh:3585 git-gui.sh:3616 -msgid "Show More Context" -msgstr "Visa mer sammanhang" - -#: git-gui.sh:2889 git-gui.sh:3283 git-gui.sh:3392 -msgid "Sign Off" -msgstr "Skriv under" - -#: git-gui.sh:2905 -msgid "Local Merge..." -msgstr "Lokal sammanslagning..." - -#: git-gui.sh:2910 -msgid "Abort Merge..." -msgstr "Avbryt sammanslagning..." - -#: git-gui.sh:2922 git-gui.sh:2950 -msgid "Add..." -msgstr "Lägg till..." - -#: git-gui.sh:2926 -msgid "Push..." -msgstr "Sänd..." - -#: git-gui.sh:2930 -msgid "Delete Branch..." -msgstr "Ta bort gren..." - -#: git-gui.sh:2940 git-gui.sh:3563 -msgid "Options..." -msgstr "Alternativ..." - -#: git-gui.sh:2951 -msgid "Remove..." -msgstr "Ta bort..." - -#: git-gui.sh:2960 lib/choose_repository.tcl:55 -msgid "Help" -msgstr "Hjälp" - -#: git-gui.sh:2964 git-gui.sh:2968 lib/choose_repository.tcl:49 -#: lib/choose_repository.tcl:58 lib/about.tcl:14 -#, tcl-format -msgid "About %s" -msgstr "Om %s" - -#: git-gui.sh:2992 -msgid "Online Documentation" -msgstr "Webbdokumentation" - -#: git-gui.sh:2995 lib/choose_repository.tcl:52 lib/choose_repository.tcl:61 -msgid "Show SSH Key" -msgstr "Visa SSH-nyckel" - -#: git-gui.sh:3014 git-gui.sh:3146 -msgid "Usage" -msgstr "Användning" - -#: git-gui.sh:3095 lib/blame.tcl:573 -msgid "Error" -msgstr "Fel" - -#: git-gui.sh:3126 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas" - -#: git-gui.sh:3159 -msgid "Current Branch:" -msgstr "Aktuell gren:" - -#: git-gui.sh:3185 -msgid "Staged Changes (Will Commit)" -msgstr "Köade ändringar (kommer att checkas in)" - -#: git-gui.sh:3205 -msgid "Unstaged Changes" -msgstr "Oköade ändringar" - -#: git-gui.sh:3276 -msgid "Stage Changed" -msgstr "Köa ändrade" - -#: git-gui.sh:3295 lib/transport.tcl:137 lib/transport.tcl:229 -msgid "Push" -msgstr "Sänd" - -#: git-gui.sh:3330 -msgid "Initial Commit Message:" -msgstr "Inledande incheckningsmeddelande:" - -#: git-gui.sh:3331 -msgid "Amended Commit Message:" -msgstr "Utökat incheckningsmeddelande:" - -#: git-gui.sh:3332 -msgid "Amended Initial Commit Message:" -msgstr "Utökat inledande incheckningsmeddelande:" - -#: git-gui.sh:3333 -msgid "Amended Merge Commit Message:" -msgstr "Utökat incheckningsmeddelande för sammanslagning:" - -#: git-gui.sh:3334 -msgid "Merge Commit Message:" -msgstr "Incheckningsmeddelande för sammanslagning:" - -#: git-gui.sh:3335 -msgid "Commit Message:" -msgstr "Incheckningsmeddelande:" - -#: git-gui.sh:3384 git-gui.sh:3538 lib/console.tcl:73 -msgid "Copy All" -msgstr "Kopiera alla" - -#: git-gui.sh:3408 lib/blame.tcl:105 -msgid "File:" -msgstr "Fil:" - -#: git-gui.sh:3526 -msgid "Refresh" -msgstr "Uppdatera" - -#: git-gui.sh:3547 -msgid "Decrease Font Size" -msgstr "Minska teckensnittsstorlek" - -#: git-gui.sh:3551 -msgid "Increase Font Size" -msgstr "Öka teckensnittsstorlek" - -#: git-gui.sh:3559 lib/blame.tcl:294 -msgid "Encoding" -msgstr "Teckenkodning" - -#: git-gui.sh:3570 -msgid "Apply/Reverse Hunk" -msgstr "Använd/återställ del" - -#: git-gui.sh:3575 -msgid "Apply/Reverse Line" -msgstr "Använd/återställ rad" - -#: git-gui.sh:3594 -msgid "Run Merge Tool" -msgstr "Starta verktyg för sammanslagning" - -#: git-gui.sh:3599 -msgid "Use Remote Version" -msgstr "Använd versionen från fjärrarkivet" - -#: git-gui.sh:3603 -msgid "Use Local Version" -msgstr "Använd lokala versionen" - -#: git-gui.sh:3607 -msgid "Revert To Base" -msgstr "Återställ till basversionen" - -#: git-gui.sh:3625 -msgid "Visualize These Changes In The Submodule" -msgstr "Visualisera ändringarna i undermodulen" - -#: git-gui.sh:3629 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Visualisera grenens historik i undermodulen" - -#: git-gui.sh:3633 -msgid "Visualize All Branch History In The Submodule" -msgstr "Visualisera alla grenars historik i undermodulen" - -#: git-gui.sh:3638 -msgid "Start git gui In The Submodule" -msgstr "Starta git gui i undermodulen" - -#: git-gui.sh:3673 -msgid "Unstage Hunk From Commit" -msgstr "Ta bort del ur incheckningskö" - -#: git-gui.sh:3675 -msgid "Unstage Lines From Commit" -msgstr "Ta bort rader ur incheckningskö" - -#: git-gui.sh:3677 -msgid "Unstage Line From Commit" -msgstr "Ta bort rad ur incheckningskö" - -#: git-gui.sh:3680 -msgid "Stage Hunk For Commit" -msgstr "Ställ del i incheckningskö" - -#: git-gui.sh:3682 -msgid "Stage Lines For Commit" -msgstr "Ställ rader i incheckningskö" - -#: git-gui.sh:3684 -msgid "Stage Line For Commit" -msgstr "Ställ rad i incheckningskö" - -#: git-gui.sh:3709 -msgid "Initializing..." -msgstr "Initierar..." - -#: git-gui.sh:3852 -#, 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 "" -"Det finns möjliga problem med miljövariabler.\n" -"\n" -"Följande miljövariabler kommer troligen att\n" -"ignoreras av alla Git-underprocesser som körs\n" -"av %s:\n" -"\n" - -#: git-gui.sh:3881 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Detta beror på ett känt problem med\n" -"Tcl-binären som följer med Cygwin." - -#: git-gui.sh:3886 -#, 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" -"Du kan ersätta %s\n" -"med att lägga in värden för inställningarna\n" -"user.name och user.email i din personliga\n" -"~/.gitconfig-fil.\n" - -#: lib/line.tcl:17 -msgid "Goto Line:" -msgstr "Gå till rad:" - -#: lib/line.tcl:23 -msgid "Go" -msgstr "Gå" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Arbetar... vänta..." - -#: lib/console.tcl:81 lib/checkout_op.tcl:146 lib/sshkey.tcl:55 -#: lib/database.tcl:30 -msgid "Close" -msgstr "Stäng" - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Lyckades" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Fel: Kommando misslyckades" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Hämtar %s från %s" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "ödesdigert: Kunde inte slå upp %s" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Grenen \"%s\" finns inte." - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Kunde inte konfigurera förenklad git-pull för '%s'." - -#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Grenen \"%s\" finns redan." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"Grenen \"%s\" finns redan.\n" -"\n" -"Den kan inte snabbspolas till %s.\n" -"En sammanslagning krävs." - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Sammanslagningsstrategin \"%s\" stöds inte." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Misslyckades med att uppdatera \"%s\"." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "Köområdet (index) är redan låst." - -#: lib/checkout_op.tcl:289 -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 "" -"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n" -"\n" -"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste " -"utföra en ny sökning innan den aktuella grenen kan ändras.\n" -"\n" -"Sökningen kommer att startas automatiskt nu.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Uppdaterar arbetskatalogen till \"%s\"..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "filer utcheckade" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Avbryter utcheckning av \"%s\" (sammanslagning på filnivå krävs)." - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Sammanslagning på filnivå krävs." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Stannar på grenen \"%s\"." - -#: lib/checkout_op.tcl:452 -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 "" -"Du är inte längre på en lokal gren.\n" -"\n" -"Om du ville vara på en gren skapar du en nu, baserad på \"Denna frånkopplade " -"utcheckning\"." - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Checkade ut \"%s\"." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "" -"Om du återställer \"%s\" till \"%s\" går följande incheckningar förlorade:" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Återställa \"%s\"?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:166 lib/tools_dlg.tcl:336 -msgid "Visualize" -msgstr "Visualisera" - -#: lib/checkout_op.tcl:571 lib/branch_create.tcl:85 -msgid "Reset" -msgstr "Återställ" - -#: lib/checkout_op.tcl:579 lib/transport.tcl:141 lib/remote_add.tcl:34 -#: lib/browser.tcl:292 lib/merge.tcl:174 lib/branch_checkout.tcl:30 -#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 -#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/branch_rename.tcl:32 -#: lib/remote_branch_delete.tcl:43 lib/branch_create.tcl:37 -#: lib/branch_delete.tcl:34 -msgid "Cancel" -msgstr "Avbryt" - -#: lib/checkout_op.tcl:635 -#, 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 "" -"Kunde inte ställa in aktuell gren.\n" -"\n" -"Arbetskatalogen har bara växlats delvis. Vi uppdaterade filerna utan " -"problem, men kunde inte uppdatera en intern fil i Git.\n" -"\n" -"Detta skulle inte ha hänt. %s kommer nu stängas och ge upp." - -#: lib/transport.tcl:6 lib/remote_add.tcl:132 -#, tcl-format -msgid "fetch %s" -msgstr "hämta %s" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Hämtar nya ändringar från %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "fjärrborttagning %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Tar bort spårande grenar som tagits bort från %s" - -#: lib/transport.tcl:25 -msgid "fetch all remotes" -msgstr "hämta alla fjärrarkiv" - -#: lib/transport.tcl:26 -msgid "Fetching new changes from all remotes" -msgstr "Hämtar nya ändringar från alla fjärrarkiv" - -#: lib/transport.tcl:40 -msgid "remote prune all remotes" -msgstr "rensa alla fjärrarkiv" - -#: lib/transport.tcl:41 -msgid "Pruning tracking branches deleted from all remotes" -msgstr "Rensar spårande grenar som tagits bort, från alla fjärrarkiv" - -#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 -#: lib/remote_add.tcl:162 -#, tcl-format -msgid "push %s" -msgstr "sänd %s" - -#: lib/transport.tcl:55 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Sänder ändringar till %s" - -#: lib/transport.tcl:93 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Speglar till %s" - -#: lib/transport.tcl:111 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Sänder %s %s till %s" - -#: lib/transport.tcl:132 -msgid "Push Branches" -msgstr "Sänd grenar" - -#: lib/transport.tcl:147 -msgid "Source Branches" -msgstr "Källgrenar" - -#: lib/transport.tcl:162 -msgid "Destination Repository" -msgstr "Destinationsarkiv" - -#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 -msgid "Remote:" -msgstr "Fjärrarkiv:" - -#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 -msgid "Arbitrary Location:" -msgstr "Godtycklig plats:" - -#: lib/transport.tcl:205 -msgid "Transfer Options" -msgstr "Överföringsalternativ" - -#: lib/transport.tcl:207 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)" - -#: lib/transport.tcl:211 -msgid "Use thin pack (for slow network connections)" -msgstr "Använd tunt paket (för långsamma nätverksanslutningar)" - -#: lib/transport.tcl:215 -msgid "Include tags" -msgstr "Ta med taggar" - -#: lib/remote_add.tcl:20 -msgid "Add Remote" -msgstr "Lägg till fjärrarkiv" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "Lägg till nytt fjärrarkiv" - -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "Lägg till" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "Detaljer för fjärrarkiv" - -#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 -msgid "Name:" -msgstr "Namn:" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Plats:" - -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "Ytterligare åtgärd" - -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "Hämta omedelbart" - -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "Initiera fjärrarkiv och sänd till" - -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "Gör ingent mer nu" - -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "Ange ett namn för fjärrarkivet." - -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "\"%s\" kan inte användas som namn på fjärrarkivet." - -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Kunde inte lägga till fjärrarkivet \"%s\" på platsen \"%s\"." - -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "Hämtar %s" - -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Vet inte hur arkivet på platsen \"%s\" skall initieras." - -#: lib/remote_add.tcl:163 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Konfigurerar %s (på %s)" - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Startar..." - -#: lib/browser.tcl:27 -msgid "File Browser" -msgstr "Filbläddrare" - -#: lib/browser.tcl:132 lib/browser.tcl:149 -#, tcl-format -msgid "Loading %s..." -msgstr "Läser %s..." - -#: lib/browser.tcl:193 -msgid "[Up To Parent]" -msgstr "[Upp till förälder]" - -#: lib/browser.tcl:275 lib/browser.tcl:282 -msgid "Browse Branch Files" -msgstr "Bläddra filer på grenen" - -#: lib/browser.tcl:288 lib/choose_repository.tcl:422 -#: lib/choose_repository.tcl:509 lib/choose_repository.tcl:518 -#: lib/choose_repository.tcl:1074 -msgid "Browse" -msgstr "Bläddra" - -#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "Revision" - -#: 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 "" -"Kan inte slå ihop vid utökning.\n" -"\n" -"Du måste göra färdig utökningen av incheckningen innan du påbörjar någon " -"slags sammanslagning.\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 "" -"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n" -"\n" -"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste " -"utföra en ny sökning innan du kan utföra en sammanslagning.\n" -"\n" -"Sökningen kommer att startas automatiskt nu.\n" - -#: lib/merge.tcl:45 -#, 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 "" -"Du är mitt i en sammanslagning med konflikter.\n" -"\n" -"Filen %s har sammanslagningskonflikter.\n" -"\n" -"Du måste lösa dem, köa filen och checka in för att fullborda den aktuella " -"sammanslagningen. När du gjort det kan du påbörja en ny sammanslagning.\n" - -#: lib/merge.tcl:55 -#, 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 "" -"Du är mitt i en ändring.\n" -"\n" -"Filen %s har ändringar.\n" -"\n" -"Du bör fullborda den aktuella incheckningen innan du påbörjar en " -"sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad " -"sammanslagning, om det skulle vara nödvändigt.\n" - -#: lib/merge.tcl:108 -#, tcl-format -msgid "%s of %s" -msgstr "%s av %s" - -#: lib/merge.tcl:122 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Slår ihop %s och %s..." - -#: lib/merge.tcl:133 -msgid "Merge completed successfully." -msgstr "Sammanslagningen avslutades framgångsrikt." - -#: lib/merge.tcl:135 -msgid "Merge failed. Conflict resolution is required." -msgstr "Sammanslagningen misslyckades. Du måste lösa konflikterna." - -#: lib/merge.tcl:160 -#, tcl-format -msgid "Merge Into %s" -msgstr "Slå ihop i %s" - -#: lib/merge.tcl:179 -msgid "Revision To Merge" -msgstr "Revisioner att slå ihop" - -#: lib/merge.tcl:214 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Kan inte avbryta vid utökning.\n" -"\n" -"Du måste göra dig färdig med att utöka incheckningen.\n" - -#: lib/merge.tcl:224 -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 "" -"Avbryt sammanslagning?\n" -"\n" -"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att gå " -"förlorade.\n" -"\n" -"Gå vidare med att avbryta den aktuella sammanslagningen?" - -#: lib/merge.tcl:230 -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 "" -"Återställ ändringar?\n" -"\n" -"Om du återställer ändringarna kommer *ALLA* ej incheckade ändringar att gå " -"förlorade.\n" -"\n" -"Gå vidare med att återställa de aktuella ändringarna?" - -#: lib/merge.tcl:241 -msgid "Aborting" -msgstr "Avbryter" - -#: lib/merge.tcl:241 -msgid "files reset" -msgstr "filer återställda" - -#: lib/merge.tcl:269 -msgid "Abort failed." -msgstr "Misslyckades avbryta." - -#: lib/merge.tcl:271 -msgid "Abort completed. Ready." -msgstr "Avbrytning fullbordad. Redo." - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "För att starta %s måste du välja en fil." - -#: lib/tools.tcl:91 -#, tcl-format -msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "Är du säker på att du vill starta %1$s med filen \"%2$s\"?" - -#: lib/tools.tcl:95 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Är du säker på att du vill starta %s?" - -#: lib/tools.tcl:116 -#, tcl-format -msgid "Tool: %s" -msgstr "Verktyg: %s" - -#: lib/tools.tcl:117 -#, tcl-format -msgid "Running: %s" -msgstr "Exekverar: %s" - -#: lib/tools.tcl:155 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Verktyget avslutades framgångsrikt: %s" - -#: lib/tools.tcl:157 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Verktyget misslyckades: %s" - -#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "Checka ut gren" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "Checka ut" - -#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 -msgid "Options" -msgstr "Alternativ" - -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Hämta spårande gren" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "Koppla bort från lokal gren" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Stavningskontrollprogrammet stöds inte" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Stavningskontroll är ej tillgänglig" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Ogiltig inställning för stavningskontroll" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Återställer ordlistan till %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Stavningskontroll misslyckades tyst vid start" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Stavningskontrollprogrammet känns inte igen" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Inga förslag" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Oväntat filslut från stavningskontroll" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Stavningskontroll misslyckades" - -#: lib/status_bar.tcl:87 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s... %*i av %*i %s (%3i%%)" - -#: lib/diff.tcl:77 -#, 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 "" -"Hittade inga skillnader.\n" -"\n" -"%s innehåller inga ändringar.\n" -"\n" -"Modifieringsdatum för filen uppdaterades av ett annat program, men " -"innehållet i filen har inte ändrats.\n" -"\n" -"En sökning kommer automatiskt att startas för att hitta andra filer som kan " -"vara i samma tillstånd." - -#: lib/diff.tcl:117 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Läser differens för %s..." - -#: lib/diff.tcl:140 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOKAL: borttagen\n" -"FJÄRR:\n" - -#: lib/diff.tcl:145 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"FJÄRR: borttagen\n" -"LOKAL:\n" - -#: lib/diff.tcl:152 -msgid "LOCAL:\n" -msgstr "LOKAL:\n" - -#: lib/diff.tcl:155 -msgid "REMOTE:\n" -msgstr "FJÄRR:\n" - -#: lib/diff.tcl:217 lib/diff.tcl:355 -#, tcl-format -msgid "Unable to display %s" -msgstr "Kan inte visa %s" - -#: lib/diff.tcl:218 -msgid "Error loading file:" -msgstr "Fel vid läsning av fil:" - -#: lib/diff.tcl:225 -msgid "Git Repository (subproject)" -msgstr "Gitarkiv (underprojekt)" - -#: lib/diff.tcl:237 -msgid "* Binary file (not showing content)." -msgstr "* Binärfil (visar inte innehållet)." - -#: lib/diff.tcl:242 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Den ospårade filen är %d byte.\n" -"* Visar endast inledande %d byte.\n" - -#: lib/diff.tcl:248 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Den ospårade filen klipptes här av %s.\n" -"* För att se hela filen, använd ett externt redigeringsprogram.\n" - -#: lib/diff.tcl:356 lib/blame.tcl:1128 -msgid "Error loading diff:" -msgstr "Fel vid inläsning av differens:" - -#: lib/diff.tcl:578 -msgid "Failed to unstage selected hunk." -msgstr "Kunde inte ta bort den valda delen från kön." - -#: lib/diff.tcl:585 -msgid "Failed to stage selected hunk." -msgstr "Kunde inte lägga till den valda delen till kön." - -#: lib/diff.tcl:664 -msgid "Failed to unstage selected line." -msgstr "Kunde inte ta bort den valda raden från kön." - -#: lib/diff.tcl:672 -msgid "Failed to stage selected line." -msgstr "Kunde inte lägga till den valda raden till kön." - -#: lib/remote.tcl:200 -msgid "Push to" -msgstr "Sänd till" - -#: lib/remote.tcl:218 -msgid "Remove Remote" -msgstr "Ta bort fjärrarkiv" - -#: lib/remote.tcl:223 -msgid "Prune from" -msgstr "Ta bort från" - -#: lib/remote.tcl:228 -msgid "Fetch from" -msgstr "Hämta från" - -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "Välj" - -#: lib/choose_font.tcl:55 -msgid "Font Family" -msgstr "Teckensnittsfamilj" - -#: lib/choose_font.tcl:76 -msgid "Font Size" -msgstr "Storlek" - -#: lib/choose_font.tcl:93 -msgid "Font Example" -msgstr "Exempel" - -#: lib/choose_font.tcl:105 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Detta är en exempeltext.\n" -"Om du tycker om den här texten kan den vara ditt teckensnitt." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Den globala teckenkodningen \"%s\" är ogiltig" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Arkivets teckenkodning \"%s\" är ogiltig" - -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "Återställ standardvärden" - -#: lib/option.tcl:123 -msgid "Save" -msgstr "Spara" - -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "Arkivet %s" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "Globalt (alla arkiv)" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "Användarnamn" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "E-postadress" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "Summera sammanslagningsincheckningar" - -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "Pratsamhet för sammanslagningar" - -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "Visa diffstatistik efter sammanslagning" - -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "Använd verktyg för sammanslagning" - -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "Lita på filändringstidsstämplar" - -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "Städa spårade grenar vid hämtning" - -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "Matcha spårade grenar" - -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "Använd Textconv för diff och klandring" - -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "Klandra kopiering bara i ändrade filer" - -#: lib/option.tcl:153 -msgid "Maximum Length of Recent Repositories List" -msgstr "Max längd för lista över tidigare arkiv" - -#: lib/option.tcl:154 -msgid "Minimum Letters To Blame Copy On" -msgstr "Minsta antal tecken att klandra kopiering för" - -#: lib/option.tcl:155 -msgid "Blame History Context Radius (days)" -msgstr "Historikradie för klandring (dagar)" - -#: lib/option.tcl:156 -msgid "Number of Diff Context Lines" -msgstr "Antal rader sammanhang i differenser" - -#: lib/option.tcl:157 -msgid "Additional Diff Parameters" -msgstr "Ytterligare diff-parametrar" - -#: lib/option.tcl:158 -msgid "Commit Message Text Width" -msgstr "Textbredd för incheckningsmeddelande" - -#: lib/option.tcl:159 -msgid "New Branch Name Template" -msgstr "Mall för namn på nya grenar" - -#: lib/option.tcl:160 -msgid "Default File Contents Encoding" -msgstr "Standardteckenkodning för filinnehåll" - -#: lib/option.tcl:161 -msgid "Warn before committing to a detached head" -msgstr "Varna för incheckning på frånkopplat huvud" - -#: lib/option.tcl:162 -msgid "Staging of untracked files" -msgstr "Köa ospårade filer" - -#: lib/option.tcl:163 -msgid "Show untracked files" -msgstr "Visa ospårade filer" - -#: lib/option.tcl:164 -msgid "Tab spacing" -msgstr "Blanksteg för tabulatortecken" - -#: lib/option.tcl:210 -msgid "Change" -msgstr "Ändra" - -#: lib/option.tcl:254 -msgid "Spelling Dictionary:" -msgstr "Stavningsordlista:" - -#: lib/option.tcl:284 -msgid "Change Font" -msgstr "Byt teckensnitt" - -#: lib/option.tcl:288 -#, tcl-format -msgid "Choose %s" -msgstr "Välj %s" - -#: lib/option.tcl:294 -msgid "pt." -msgstr "p." - -#: lib/option.tcl:308 -msgid "Preferences" -msgstr "Inställningar" - -#: lib/option.tcl:345 -msgid "Failed to completely save options:" -msgstr "Misslyckades med att helt spara alternativ:" - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Tvinga lösning att använda basversionen?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Tvinga lösning att använda den aktuella grenen?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Tvinga lösning att använda den andra grenen?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Observera att diffen endast visar de ändringar som står i konflikt.\n" -"\n" -"%s kommer att skrivas över.\n" -"\n" -"Du måste starta om sammanslagningen för att göra den här operationen ogjord." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "Filen %s verkar innehålla olösta konflikter. Vill du köa ändå?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Lägger till lösning för %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "Kan inte lösa borttagnings- eller länkkonflikter med ett verktyg" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Konfliktfil existerar inte" - -#: lib/mergetool.tcl:246 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Inte ett grafiskt verktyg för sammanslagning: %s" - -#: lib/mergetool.tcl:275 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Verktyget \"%s\" för sammanslagning stöds inte" - -#: lib/mergetool.tcl:310 -msgid "Merge tool is already running, terminate it?" -msgstr "Verktyget för sammanslagning körs redan. Vill du avsluta det?" - -#: lib/mergetool.tcl:330 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Fel vid hämtning av versioner:\n" -"%s" - -#: lib/mergetool.tcl:350 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Kunde inte starta verktyg för sammanslagning:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:354 -msgid "Running merge tool..." -msgstr "Kör verktyg för sammanslagning..." - -#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 -msgid "Merge tool failed." -msgstr "Verktyget för sammanslagning misslyckades." - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Lägg till verktyg" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Lägg till nytt verktygskommando" - -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "Lägg till globalt" - -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "Detaljer för verktyg" - -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Använd \"/\"-avdelare för att skapa ett undermenyträd:" - -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "Kommando:" - -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "Visa dialog innan programmet startas" - -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Be användaren välja en version (sätter $REVISION)" - -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Be användaren om ytterligare parametrar (sätter $ARGS)" - -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "Visa inte kommandots utdatafönster" - -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Kör endast om en diff har markerats ($FILENAME är inte tomt)" - -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "Ange ett namn för verktyget." - -#: lib/tools_dlg.tcl:126 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Verktyget \"%s\" finns redan." - -#: lib/tools_dlg.tcl:148 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Kunde inte lägga till verktyget:\n" -"%s" - -#: lib/tools_dlg.tcl:187 -msgid "Remove Tool" -msgstr "Ta bort verktyg" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "Ta bort verktygskommandon" - -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "Ta bort" - -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "(Blått anger verktyg lokala för arkivet)" - -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "Kör kommandot: %s" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "Argument" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "OK" - -#: lib/search.tcl:48 -msgid "Find:" -msgstr "Sök:" - -#: lib/search.tcl:50 -msgid "Next" -msgstr "Nästa" - -#: lib/search.tcl:51 -msgid "Prev" -msgstr "Föreg" - -#: lib/search.tcl:52 -msgid "RegExp" -msgstr "Reg.uttr." - -#: lib/search.tcl:54 -msgid "Case" -msgstr "Skiftläge" - -#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "Byt namn på gren" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "Byt namn" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "Gren:" - -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "Nytt namn:" - -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "Välj en gren att byta namn på." - -#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 -msgid "Please supply a branch name." -msgstr "Ange ett namn för grenen." - -#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "\"%s\" kan inte användas som namn på grenen." - -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Kunde inte byta namn på \"%s\"." - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Ta bort gren från fjärrarkiv" - -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" -msgstr "Från arkiv" - -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" -msgstr "Grenar" - -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" -msgstr "Ta endast bort om" - -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" -msgstr "Sammanslagen i:" - -#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 -msgid "Always (Do not perform merge checks)" -msgstr "Alltid (utför inte sammanslagningstest)" - -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." -msgstr "En gren krävs för \"Sammanslagen i\"." - -#: lib/remote_branch_delete.tcl:185 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Följande grenar har inte helt slagits samman i %s:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:190 -#, 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 "" -"En eller flera av sammanslagningstesterna misslyckades eftersom du inte har " -"hämtat de nödvändiga incheckningarna. Försök hämta från %s först." - -#: lib/remote_branch_delete.tcl:208 -msgid "Please select one or more branches to delete." -msgstr "Välj en eller flera grenar att ta bort." - -#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Det kan vara svårt att återställa borttagna grenar.\n" -"\n" -"Ta bort de valda grenarna?" - -#: lib/remote_branch_delete.tcl:227 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Tar bort grenar från %s" - -#: lib/remote_branch_delete.tcl:300 -msgid "No repository selected." -msgstr "Inget arkiv markerat." - -#: lib/remote_branch_delete.tcl:305 -#, tcl-format -msgid "Scanning %s..." -msgstr "Söker %s..." - -#: lib/choose_repository.tcl:33 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:92 lib/choose_repository.tcl:412 -msgid "Create New Repository" -msgstr "Skapa nytt arkiv" - -#: lib/choose_repository.tcl:98 -msgid "New..." -msgstr "Nytt..." - -#: lib/choose_repository.tcl:105 lib/choose_repository.tcl:496 -msgid "Clone Existing Repository" -msgstr "Klona befintligt arkiv" - -#: lib/choose_repository.tcl:116 -msgid "Clone..." -msgstr "Klona..." - -#: lib/choose_repository.tcl:123 lib/choose_repository.tcl:1064 -msgid "Open Existing Repository" -msgstr "Öppna befintligt arkiv" - -#: lib/choose_repository.tcl:129 -msgid "Open..." -msgstr "Öppna..." - -#: lib/choose_repository.tcl:142 -msgid "Recent Repositories" -msgstr "Senaste arkiven" - -#: lib/choose_repository.tcl:148 -msgid "Open Recent Repository:" -msgstr "Öppna tidigare arkiv:" - -#: lib/choose_repository.tcl:316 lib/choose_repository.tcl:323 -#: lib/choose_repository.tcl:330 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Kunde inte skapa arkivet %s:" - -#: lib/choose_repository.tcl:407 lib/branch_create.tcl:33 -msgid "Create" -msgstr "Skapa" - -#: lib/choose_repository.tcl:417 -msgid "Directory:" -msgstr "Katalog:" - -#: lib/choose_repository.tcl:447 lib/choose_repository.tcl:573 -#: lib/choose_repository.tcl:1098 -msgid "Git Repository" -msgstr "Gitarkiv" - -#: lib/choose_repository.tcl:472 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Katalogen %s finns redan." - -#: lib/choose_repository.tcl:476 -#, tcl-format -msgid "File %s already exists." -msgstr "Filen %s finns redan." - -#: lib/choose_repository.tcl:491 -msgid "Clone" -msgstr "Klona" - -#: lib/choose_repository.tcl:504 -msgid "Source Location:" -msgstr "Plats för källkod:" - -#: lib/choose_repository.tcl:513 -msgid "Target Directory:" -msgstr "Målkatalog:" - -#: lib/choose_repository.tcl:523 -msgid "Clone Type:" -msgstr "Typ av klon:" - -#: lib/choose_repository.tcl:528 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Standard (snabb, semiredundant, hårda länkar)" - -#: lib/choose_repository.tcl:533 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Full kopia (långsammare, redundant säkerhetskopia)" - -#: lib/choose_repository.tcl:538 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)" - -#: lib/choose_repository.tcl:545 -msgid "Recursively clone submodules too" -msgstr "Klona även rekursivt undermoduler" - -#: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626 -#: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842 -#: lib/choose_repository.tcl:1104 lib/choose_repository.tcl:1112 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Inte ett Gitarkiv: %s" - -#: lib/choose_repository.tcl:615 -msgid "Standard only available for local repository." -msgstr "Standard är endast tillgängligt för lokala arkiv." - -#: lib/choose_repository.tcl:619 -msgid "Shared only available for local repository." -msgstr "Delat är endast tillgängligt för lokala arkiv." - -#: lib/choose_repository.tcl:640 -#, tcl-format -msgid "Location %s already exists." -msgstr "Platsen %s finns redan." - -#: lib/choose_repository.tcl:651 -msgid "Failed to configure origin" -msgstr "Kunde inte konfigurera ursprung" - -#: lib/choose_repository.tcl:663 -msgid "Counting objects" -msgstr "Räknar objekt" - -#: lib/choose_repository.tcl:664 -msgid "buckets" -msgstr "hinkar" - -#: lib/choose_repository.tcl:688 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Kunde inte kopiera objekt/info/alternativ: %s" - -#: lib/choose_repository.tcl:724 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Ingenting att klona från %s." - -#: lib/choose_repository.tcl:726 lib/choose_repository.tcl:940 -#: lib/choose_repository.tcl:952 -msgid "The 'master' branch has not been initialized." -msgstr "Grenen \"master\" har inte initierats." - -#: lib/choose_repository.tcl:739 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Hårda länkar är inte tillgängliga. Faller tillbaka på kopiering." - -#: lib/choose_repository.tcl:751 -#, tcl-format -msgid "Cloning from %s" -msgstr "Klonar från %s" - -#: lib/choose_repository.tcl:782 -msgid "Copying objects" -msgstr "Kopierar objekt" - -#: lib/choose_repository.tcl:783 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:807 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Kunde inte kopiera objekt: %s" - -#: lib/choose_repository.tcl:817 -msgid "Linking objects" -msgstr "Länkar objekt" - -#: lib/choose_repository.tcl:818 -msgid "objects" -msgstr "objekt" - -#: lib/choose_repository.tcl:826 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Kunde inte hårdlänka objekt: %s" - -#: lib/choose_repository.tcl:881 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer." - -#: lib/choose_repository.tcl:892 -msgid "Cannot fetch tags. See console output for details." -msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer." - -#: lib/choose_repository.tcl:916 -msgid "Cannot determine HEAD. See console output for details." -msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer." - -#: lib/choose_repository.tcl:925 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Kunde inte städa upp %s" - -#: lib/choose_repository.tcl:931 -msgid "Clone failed." -msgstr "Kloning misslyckades." - -#: lib/choose_repository.tcl:938 -msgid "No default branch obtained." -msgstr "Hämtade ingen standardgren." - -#: lib/choose_repository.tcl:949 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Kunde inte slå upp %s till någon incheckning." - -#: lib/choose_repository.tcl:961 -msgid "Creating working directory" -msgstr "Skapar arbetskatalog" - -#: lib/choose_repository.tcl:962 lib/index.tcl:70 lib/index.tcl:136 -#: lib/index.tcl:207 -msgid "files" -msgstr "filer" - -#: lib/choose_repository.tcl:981 -msgid "Cannot clone submodules." -msgstr "Kan inte klona undermoduler." - -#: lib/choose_repository.tcl:990 -msgid "Cloning submodules" -msgstr "Klonar undermoduler" - -#: lib/choose_repository.tcl:1015 -msgid "Initial file checkout failed." -msgstr "Inledande filutcheckning misslyckades." - -#: lib/choose_repository.tcl:1059 -msgid "Open" -msgstr "Öppna" - -#: lib/choose_repository.tcl:1069 -msgid "Repository:" -msgstr "Arkiv:" - -#: lib/choose_repository.tcl:1118 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Kunde inte öppna arkivet %s:" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - ett grafiskt användargränssnitt för Git." - -#: lib/blame.tcl:73 -msgid "File Viewer" -msgstr "Filvisare" - -#: lib/blame.tcl:79 -msgid "Commit:" -msgstr "Incheckning:" - -#: lib/blame.tcl:280 -msgid "Copy Commit" -msgstr "Kopiera incheckning" - -#: lib/blame.tcl:284 -msgid "Find Text..." -msgstr "Sök text..." - -#: lib/blame.tcl:288 -msgid "Goto Line..." -msgstr "Gå till rad..." - -#: lib/blame.tcl:297 -msgid "Do Full Copy Detection" -msgstr "Gör full kopieringsigenkänning" - -#: lib/blame.tcl:301 -msgid "Show History Context" -msgstr "Visa historiksammanhang" - -#: lib/blame.tcl:304 -msgid "Blame Parent Commit" -msgstr "Klandra föräldraincheckning" - -#: lib/blame.tcl:466 -#, tcl-format -msgid "Reading %s..." -msgstr "Läser %s..." - -#: lib/blame.tcl:594 -msgid "Loading copy/move tracking annotations..." -msgstr "Läser annoteringar för kopiering/flyttning..." - -#: lib/blame.tcl:614 -msgid "lines annotated" -msgstr "rader annoterade" - -#: lib/blame.tcl:806 -msgid "Loading original location annotations..." -msgstr "Läser in annotering av originalplacering..." - -#: lib/blame.tcl:809 -msgid "Annotation complete." -msgstr "Annotering fullbordad." - -#: lib/blame.tcl:839 -msgid "Busy" -msgstr "Upptagen" - -#: lib/blame.tcl:840 -msgid "Annotation process is already running." -msgstr "Annoteringsprocess körs redan." - -#: lib/blame.tcl:879 -msgid "Running thorough copy detection..." -msgstr "Kör grundlig kopieringsigenkänning..." - -#: lib/blame.tcl:947 -msgid "Loading annotation..." -msgstr "Läser in annotering..." - -#: lib/blame.tcl:1000 -msgid "Author:" -msgstr "Författare:" - -#: lib/blame.tcl:1004 -msgid "Committer:" -msgstr "Incheckare:" - -#: lib/blame.tcl:1009 -msgid "Original File:" -msgstr "Ursprunglig fil:" - -#: lib/blame.tcl:1057 -msgid "Cannot find HEAD commit:" -msgstr "Hittar inte incheckning för HEAD:" - -#: lib/blame.tcl:1112 -msgid "Cannot find parent commit:" -msgstr "Hittar inte föräldraincheckning:" - -#: lib/blame.tcl:1127 -msgid "Unable to display parent" -msgstr "Kan inte visa förälder" - -#: lib/blame.tcl:1269 -msgid "Originally By:" -msgstr "Ursprungligen av:" - -#: lib/blame.tcl:1275 -msgid "In File:" -msgstr "I filen:" - -#: lib/blame.tcl:1280 -msgid "Copied Or Moved Here By:" -msgstr "Kopierad eller flyttad hit av:" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Inga nycklar hittades." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Hittade öppen nyckel i: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Skapa nyckel" - -#: lib/sshkey.tcl:58 -msgid "Copy To Clipboard" -msgstr "Kopiera till Urklipp" - -#: lib/sshkey.tcl:72 -msgid "Your OpenSSH Public Key" -msgstr "Din öppna OpenSSH-nyckel" - -#: lib/sshkey.tcl:80 -msgid "Generating..." -msgstr "Skapar..." - -#: lib/sshkey.tcl:86 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Kunde inte starta ssh-keygen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:113 -msgid "Generation failed." -msgstr "Misslyckades med att skapa." - -#: lib/sshkey.tcl:120 -msgid "Generation succeeded, but no keys found." -msgstr "Lyckades skapa nyckeln, men hittar inte någon nyckel." - -#: lib/sshkey.tcl:123 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Din nyckel finns i: %s" - -#: lib/branch_create.tcl:23 -msgid "Create Branch" -msgstr "Skapa gren" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "Skapa ny gren" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "Namn på gren" - -#: lib/branch_create.tcl:57 -msgid "Match Tracking Branch Name" -msgstr "Använd namn på spårad gren" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Inledande revision" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Uppdatera befintlig gren:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nej" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Endast snabbspolning" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Checka ut när skapad" - -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "Välj en gren att spåra." - -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Den spårade grenen %s är inte en gren i fjärrarkivet." - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Kan inte skriva genväg:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Kan inte skriva ikon:" - -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" -msgstr "Denna frånkopplade utcheckning" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Revisionsuttryck:" - -#: lib/choose_rev.tcl:72 -msgid "Local Branch" -msgstr "Lokal gren" - -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" -msgstr "Spårande gren" - -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 -msgid "Tag" -msgstr "Tagg" - -#: lib/choose_rev.tcl:321 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Ogiltig revision: %s" - -#: lib/choose_rev.tcl:342 -msgid "No revision selected." -msgstr "Ingen revision vald." - -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." -msgstr "Revisionsuttrycket är tomt." - -#: lib/choose_rev.tcl:537 -msgid "Updated" -msgstr "Uppdaterad" - -#: lib/choose_rev.tcl:565 -msgid "URL" -msgstr "Webbadress" - -#: 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 "" -"Det finns ingenting att utöka.\n" -"\n" -"Du håller på att skapa den inledande incheckningen. Det finns ingen tidigare " -"incheckning att utöka.\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 "" -"Kan inte utöka vid sammanslagning.\n" -"\n" -"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan inte " -"utöka tidigare incheckningar om du inte först avbryter den pågående " -"sammanslagningen.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Fel vid inläsning av incheckningsdata för utökning:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Kunde inte hämta din identitet:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "Felaktig GIT_COMMITTER_IDENT:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"." - -#: lib/commit.tcl:149 -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 "" -"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n" -"\n" -"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste " -"utföra en ny sökning innan du kan göra en ny incheckning.\n" -"\n" -"Sökningen kommer att startas automatiskt nu.\n" - -#: lib/commit.tcl:173 -#, 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 "" -"Osammanslagna filer kan inte checkas in.\n" -"\n" -"Filen %s har sammanslagningskonflikter. Du måste lösa dem och köa filen " -"innan du checkar in den.\n" - -#: lib/commit.tcl:181 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Okänd filstatus %s upptäckt.\n" -"\n" -"Filen %s kan inte checkas in av programmet.\n" - -#: lib/commit.tcl:189 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Inga ändringar att checka in.\n" -"\n" -"Du måste köa åtminstone en fil innan du kan checka in.\n" - -#: lib/commit.tcl:204 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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 "" -"Ange ett incheckningsmeddelande.\n" -"\n" -"Ett bra incheckningsmeddelande har följande format:\n" -"\n" -"- Första raden: Beskriv i en mening vad du gjorde.\n" -"- Andra raden: Tom\n" -"- Följande rader: Beskriv varför det här är en bra ändring.\n" - -#: lib/commit.tcl:235 -msgid "Calling pre-commit hook..." -msgstr "Anropar kroken före incheckning (pre-commit)..." - -#: lib/commit.tcl:250 -msgid "Commit declined by pre-commit hook." -msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)." - -#: lib/commit.tcl:269 -msgid "" -"You are about to commit on a detached head. This is a potentially dangerous " -"thing to do because if you switch to another branch you will lose your " -"changes and it can be difficult to retrieve them later from the reflog. You " -"should probably cancel this commit and create a new branch to continue.\n" -" \n" -" Do you really want to proceed with your Commit?" -msgstr "" -"Du är på väg att checka in på ett frånkopplat huvud. Det kan potentiellt " -"vara farligt, eftersom du kommer förlora dina ändringar om du växlar till en " -"annan gren och det kan vara svårt att hämta dem senare från ref-loggen. Du " -"bör troligen avbryta incheckningen och skapa en ny gren för att fortsätta.\n" -" \n" -" Vill du verkligen fortsätta checka in?" - -#: lib/commit.tcl:290 -msgid "Calling commit-msg hook..." -msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..." - -#: lib/commit.tcl:305 -msgid "Commit declined by commit-msg hook." -msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)." - -#: lib/commit.tcl:318 -msgid "Committing changes..." -msgstr "Checkar in ändringar..." - -#: lib/commit.tcl:334 -msgid "write-tree failed:" -msgstr "write-tree misslyckades:" - -#: lib/commit.tcl:335 lib/commit.tcl:379 lib/commit.tcl:400 -msgid "Commit failed." -msgstr "Incheckningen misslyckades." - -#: lib/commit.tcl:352 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Incheckningen %s verkar vara trasig" - -#: lib/commit.tcl:357 -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 "" -"Inga ändringar att checka in.\n" -"\n" -"Inga filer ändrades av incheckningen och det var inte en sammanslagning.\n" -"\n" -"En sökning kommer att startas automatiskt nu.\n" - -#: lib/commit.tcl:364 -msgid "No changes to commit." -msgstr "Inga ändringar att checka in." - -#: lib/commit.tcl:378 -msgid "commit-tree failed:" -msgstr "commit-tree misslyckades:" - -#: lib/commit.tcl:399 -msgid "update-ref failed:" -msgstr "update-ref misslyckades:" - -#: lib/commit.tcl:492 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Skapade incheckningen %s: %s" - -#: lib/branch_delete.tcl:16 -msgid "Delete Branch" -msgstr "Ta bort gren" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "Ta bort lokal gren" - -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "Lokala grenar" - -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "Ta bara bort om sammanslagen med" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Följande grenar är inte till fullo sammanslagna med %s:" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Kunde inte ta bort grenar:\n" -"%s" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Kunde inte låsa upp indexet." - -#: lib/index.tcl:17 -msgid "Index Error" -msgstr "Indexfel" - -#: lib/index.tcl:19 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas " -"automatiskt för att synkronisera om git-gui." - -#: lib/index.tcl:30 -msgid "Continue" -msgstr "Fortsätt" - -#: lib/index.tcl:33 -msgid "Unlock Index" -msgstr "Lås upp index" - -#: lib/index.tcl:298 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Tar bort %s för incheckningskön" - -#: lib/index.tcl:337 -msgid "Ready to commit." -msgstr "Redo att checka in." - -#: lib/index.tcl:350 -#, tcl-format -msgid "Adding %s" -msgstr "Lägger till %s" - -#: lib/index.tcl:380 -#, tcl-format -msgid "Stage %d untracked files?" -msgstr "Köa %d ospårade filer?" - -#: lib/index.tcl:428 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Återställ ändringarna i filen %s?" - -#: lib/index.tcl:430 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Återställ ändringarna i dessa %i filer?" - -#: lib/index.tcl:438 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Alla oköade ändringar kommer permanent gå förlorade vid återställningen." - -#: lib/index.tcl:441 -msgid "Do Nothing" -msgstr "Gör ingenting" - -#: lib/index.tcl:459 -msgid "Reverting selected files" -msgstr "Återställer valda filer" - -#: lib/index.tcl:463 -#, tcl-format -msgid "Reverting %s" -msgstr "Återställer %s" - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Standard" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Systemets (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Annan" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ogiltigt datum från Git: %s" - -#: lib/database.tcl:42 -msgid "Number of loose objects" -msgstr "Antal lösa objekt" - -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" -msgstr "Diskutrymme använt av lösa objekt" - -#: lib/database.tcl:44 -msgid "Number of packed objects" -msgstr "Antal packade objekt" - -#: lib/database.tcl:45 -msgid "Number of packs" -msgstr "Antal paket" - -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" -msgstr "Diskutrymme använt av packade objekt" - -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" -msgstr "Packade objekt som väntar på städning" - -#: lib/database.tcl:48 -msgid "Garbage files" -msgstr "Skräpfiler" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Komprimerar objektdatabasen" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Verifierar objektdatabasen med fsck-objects" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Arkivet har för närvarande omkring %i lösa objekt.\n" -"\n" -"För att bibehålla optimal prestanda rekommenderas det å det bestämdaste att " -"du komprimerar databasen.\n" -"\n" -"Komprimera databasen nu?" - -#: lib/error.tcl:20 lib/error.tcl:116 -msgid "error" -msgstr "fel" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "varning" - -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." -msgstr "Du måste rätta till felen ovan innan du checkar in." - -#~ msgid "Displaying only %s of %s files." -#~ msgstr "Visar endast %s av %s filer." - -#~ msgid "Case-Sensitive" -#~ msgstr "Skilj på VERSALER/gemener" - -#~ msgid "Cannot use funny .git directory:" -#~ msgstr "Kan inte använda underlig .git-katalog:" - -#~ msgid "Preferences..." -#~ msgstr "Inställningar..." - -#~ msgid "Always (Do not perform merge test.)" -#~ msgstr "Alltid (utför inte sammanslagningstest)." - -#~ msgid "URL:" -#~ msgstr "Webbadress:" - -#~ msgid "Delete Remote Branch" -#~ msgstr "Ta bort fjärrgren" - -#~ msgid "" -#~ "Unable to start gitk:\n" -#~ "\n" -#~ "%s does not exist" -#~ msgstr "" -#~ "Kan inte starta gitk:\n" -#~ "\n" -#~ "%s finns inte" - -#~ msgid "Apple" -#~ msgstr "Äpple" - -#~ msgid "Not connected to aspell" -#~ msgstr "Inte ansluten till aspell" diff --git a/third_party/git/git-gui/po/vi.po b/third_party/git/git-gui/po/vi.po deleted file mode 100644 index d956b59a9eb2..000000000000 --- a/third_party/git/git-gui/po/vi.po +++ /dev/null @@ -1,2690 +0,0 @@ -# Vietnamese translation for GIT-GUI -# Bản dịch Tiếng Việt dành cho gói Git-gui. -# This file is distributed under the same license as the git-core package. -# First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2014. -# -msgid "" -msgstr "" -"Project-Id-Version: git-gui 0.19.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-26 13:42+0700\n" -"PO-Revision-Date: 2014-06-27 07:48+0700\n" -"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" -"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" -"Language: vi\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-Language: Vietnamese\n" -"X-Poedit-Country: VIET NAM\n" -"X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-Basepath: ../\n" - -#: git-gui.sh:859 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "Phông chữ không hợp lệ được đặc tả trong %s:" - -#: git-gui.sh:912 -msgid "Main Font" -msgstr "Phông chữ chính" - -#: git-gui.sh:913 -msgid "Diff/Console Font" -msgstr "Phông chữ cho Bảng điều khiển hay Diff" - -#: git-gui.sh:928 git-gui.sh:942 git-gui.sh:955 git-gui.sh:1045 -#: git-gui.sh:1064 git-gui.sh:3119 -msgid "git-gui: fatal error" -msgstr "git-gui: lỗi nghiêm trọng" - -#: git-gui.sh:929 -msgid "Cannot find git in PATH." -msgstr "Không tìm thấy git trong biến PATH." - -#: git-gui.sh:956 -msgid "Cannot parse Git version string:" -msgstr "Không thể phân tích chuỗi phiên bản Git:" - -#: git-gui.sh:981 -#, 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 "" -"Không thể nhận ra phiên bản của Git.\n" -"\n" -"%s nói đây là phiên bản '%s'.\n" -"\n" -"%s yêu cầu Git phiên bản từ 1.5.0 hay mới hơn.\n" -"\n" -"Cọi '%s' có phiên bản là 1.5.0?\n" - -#: git-gui.sh:1278 -msgid "Git directory not found:" -msgstr "Không tìm thấy thư mục git:" - -#: git-gui.sh:1312 -msgid "Cannot move to top of working directory:" -msgstr "Không thể di chuyển đến đỉnh của thư mục làm việc:" - -#: git-gui.sh:1320 -msgid "Cannot use bare repository:" -msgstr "Không thể dùng kho trần:" - -#: git-gui.sh:1328 -msgid "No working directory" -msgstr "Không có thư mục làm việc" - -#: git-gui.sh:1500 lib/checkout_op.tcl:306 -msgid "Refreshing file status..." -msgstr "Cập nhật lại trạng thái tập tin..." - -#: git-gui.sh:1560 -msgid "Scanning for modified files ..." -msgstr "Đang quét đĩa tìm tập tin thay đổi..." - -#: git-gui.sh:1636 -msgid "Calling prepare-commit-msg hook..." -msgstr "Đang gọi móc prepare-commit-msg..." - -#: git-gui.sh:1653 -msgid "Commit declined by prepare-commit-msg hook." -msgstr "Lần chuyển giao bị chối từ do móc prepare-commit-msg." - -#: git-gui.sh:1811 lib/browser.tcl:252 -msgid "Ready." -msgstr "Sẵn sàng." - -#: git-gui.sh:1969 -#, tcl-format -msgid "Displaying only %s of %s files." -msgstr "Chỉ hiển thị %s trong số %s tập tin." - -#: git-gui.sh:2095 -msgid "Unmodified" -msgstr "Không thay đổi gì" - -#: git-gui.sh:2097 -msgid "Modified, not staged" -msgstr "Đã sửa nhưng chưa đánh dấu để chuyển giao" - -#: git-gui.sh:2098 git-gui.sh:2110 -msgid "Staged for commit" -msgstr "Đánh dấu để chuyển giao" - -#: git-gui.sh:2099 git-gui.sh:2111 -msgid "Portions staged for commit" -msgstr "Các phần được đánh dấu là cần chuyển giao" - -#: git-gui.sh:2100 git-gui.sh:2112 -msgid "Staged for commit, missing" -msgstr "Đã đánh dấu là cần chuyển giao, thiếu" - -#: git-gui.sh:2102 -msgid "File type changed, not staged" -msgstr "Đã đổi kiểu tập tin nhưng chưa được đánh dấu cần chuyển giao" - -#: git-gui.sh:2103 git-gui.sh:2104 -msgid "File type changed, old type staged for commit" -msgstr "Đã đổi kiểu tập tin, kiểu cũ đã được đánh dấu cần chuyển giao" - -#: git-gui.sh:2105 -msgid "File type changed, staged" -msgstr "Đã đổi kiểu tập tin, đã được đánh dấu cần chuyển giao" - -#: git-gui.sh:2106 -msgid "File type change staged, modification not staged" -msgstr "" -"Thay đổi kiểu tập tin đã được đánh dấu cần chuyển giao, nhưng các thay đổi " -"thì chưa" - -#: git-gui.sh:2107 -msgid "File type change staged, file missing" -msgstr "" -"Thay đổi kiểu tập tin đã được đánh dấu cần chuyển giao, tập tin bị thiếu" - -#: git-gui.sh:2109 -msgid "Untracked, not staged" -msgstr "Chưa được theo dõi, chưa đánh dấu là cần chuyển giao" - -#: git-gui.sh:2114 -msgid "Missing" -msgstr "Thiếu" - -#: git-gui.sh:2115 -msgid "Staged for removal" -msgstr "Đã đánh dấu là cần gỡ bỏ" - -#: git-gui.sh:2116 -msgid "Staged for removal, still present" -msgstr "Đã đánh dấu là cần gỡ bỏ, nhưng vẫn hiện diện" - -#: git-gui.sh:2118 git-gui.sh:2119 git-gui.sh:2120 git-gui.sh:2121 -#: git-gui.sh:2122 git-gui.sh:2123 -msgid "Requires merge resolution" -msgstr "Các yêu cầu phân giải hòa trộn" - -#: git-gui.sh:2158 -msgid "Starting gitk... please wait..." -msgstr "Đang khởi động gitk... vui lòng chờ..." - -#: git-gui.sh:2170 -msgid "Couldn't find gitk in PATH" -msgstr "Không thể tìm thấy gitk trong PATH" - -#: git-gui.sh:2229 -msgid "Couldn't find git gui in PATH" -msgstr "Không thể tìm thấy git gui trong PATH" - -#: git-gui.sh:2648 lib/choose_repository.tcl:40 -msgid "Repository" -msgstr "Kho" - -#: git-gui.sh:2649 -msgid "Edit" -msgstr "Chỉnh sửa" - -#: git-gui.sh:2651 lib/choose_rev.tcl:567 -msgid "Branch" -msgstr "Nhánh" - -#: git-gui.sh:2654 lib/choose_rev.tcl:554 -msgid "Commit@@noun" -msgstr "Chuyển giao@@noun" - -#: git-gui.sh:2657 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 -msgid "Merge" -msgstr "Trộn" - -#: git-gui.sh:2658 lib/choose_rev.tcl:563 -msgid "Remote" -msgstr "Máy chủ" - -#: git-gui.sh:2661 -msgid "Tools" -msgstr "Công cụ" - -#: git-gui.sh:2670 -msgid "Explore Working Copy" -msgstr "Quét dò thư mục làm việc" - -#: git-gui.sh:2676 -msgid "Git Bash" -msgstr "Git Bash" - -#: git-gui.sh:2686 -msgid "Browse Current Branch's Files" -msgstr "Duyệt các Tập tin ở nhánh hiện nay" - -#: git-gui.sh:2690 -msgid "Browse Branch Files..." -msgstr "Duyệt các tập tin nhánh..." - -#: git-gui.sh:2695 -msgid "Visualize Current Branch's History" -msgstr "Hiển thị trực quan lịch sử nhánh hiện nay" - -#: git-gui.sh:2699 -msgid "Visualize All Branch History" -msgstr "Hiển thị trực quan lịch sử mọi nhánh" - -#: git-gui.sh:2706 -#, tcl-format -msgid "Browse %s's Files" -msgstr "Duyệt tập tin của %s..." - -#: git-gui.sh:2708 -#, tcl-format -msgid "Visualize %s's History" -msgstr "Duyệt lịch sử của %s trực quan" - -#: git-gui.sh:2713 lib/database.tcl:40 lib/database.tcl:66 -msgid "Database Statistics" -msgstr "Thống kê cơ sở dữ liệu" - -#: git-gui.sh:2716 lib/database.tcl:33 -msgid "Compress Database" -msgstr "Nén cơ sở dữ liệu" - -#: git-gui.sh:2719 -msgid "Verify Database" -msgstr "Thẩm tra cơ sở dữ liệu" - -#: git-gui.sh:2726 git-gui.sh:2730 git-gui.sh:2734 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 -msgid "Create Desktop Icon" -msgstr "Tạo lối tắt ở màn hình nền" - -#: git-gui.sh:2742 lib/choose_repository.tcl:192 lib/choose_repository.tcl:200 -msgid "Quit" -msgstr "Thoát" - -#: git-gui.sh:2750 -msgid "Undo" -msgstr "Hủy lệnh vừa rồi" - -#: git-gui.sh:2753 -msgid "Redo" -msgstr "Làm lại" - -#: git-gui.sh:2757 git-gui.sh:3362 -msgid "Cut" -msgstr "Cắt" - -#: git-gui.sh:2760 git-gui.sh:3365 git-gui.sh:3439 git-gui.sh:3524 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "Chép" - -#: git-gui.sh:2763 git-gui.sh:3368 -msgid "Paste" -msgstr "Dán" - -#: git-gui.sh:2766 git-gui.sh:3371 lib/branch_delete.tcl:28 -#: lib/remote_branch_delete.tcl:39 -msgid "Delete" -msgstr "Xóa bỏ" - -#: git-gui.sh:2770 git-gui.sh:3375 git-gui.sh:3528 lib/console.tcl:71 -msgid "Select All" -msgstr "Chọn tất cả" - -#: git-gui.sh:2779 -msgid "Create..." -msgstr "Tạo..." - -#: git-gui.sh:2785 -msgid "Checkout..." -msgstr "Lấy ra..." - -#: git-gui.sh:2791 -msgid "Rename..." -msgstr "Đổi tên..." - -#: git-gui.sh:2796 -msgid "Delete..." -msgstr "Xóa..." - -#: git-gui.sh:2801 -msgid "Reset..." -msgstr "Đặt lại.." - -#: git-gui.sh:2811 -msgid "Done" -msgstr "Xong" - -#: git-gui.sh:2813 -msgid "Commit@@verb" -msgstr "Chuyển giao@@verb" - -#: git-gui.sh:2822 git-gui.sh:3303 -msgid "New Commit" -msgstr "Lần chuyển giao mới" - -#: git-gui.sh:2830 git-gui.sh:3310 -msgid "Amend Last Commit" -msgstr "Tu bổ lần chuyển giao cuối" - -#: git-gui.sh:2840 git-gui.sh:3264 lib/remote_branch_delete.tcl:101 -msgid "Rescan" -msgstr "Quét lại" - -#: git-gui.sh:2846 -msgid "Stage To Commit" -msgstr "Đưa lên bệ phóng để chuyển giao" - -#: git-gui.sh:2852 -msgid "Stage Changed Files To Commit" -msgstr "Đánh dấu các tập tin đã thay đổi cần chuyển giao" - -#: git-gui.sh:2858 -msgid "Unstage From Commit" -msgstr "Đưa ra khỏi bệ phóng để không chuyển giao" - -#: git-gui.sh:2864 lib/index.tcl:442 -msgid "Revert Changes" -msgstr "Hoàn nguyên các thay đổi" - -#: git-gui.sh:2872 git-gui.sh:3575 git-gui.sh:3606 -msgid "Show Less Context" -msgstr "Hiện ít nội dung hơn" - -#: git-gui.sh:2876 git-gui.sh:3579 git-gui.sh:3610 -msgid "Show More Context" -msgstr "Hiện chi tiết hơn" - -#: git-gui.sh:2883 git-gui.sh:3277 git-gui.sh:3386 -msgid "Sign Off" -msgstr "Ký tên" - -#: git-gui.sh:2899 -msgid "Local Merge..." -msgstr "Trộn nội bộ..." - -#: git-gui.sh:2904 -msgid "Abort Merge..." -msgstr "Hủy bỏ hòa trộn..." - -#: git-gui.sh:2916 git-gui.sh:2944 -msgid "Add..." -msgstr "Thêm..." - -#: git-gui.sh:2920 -msgid "Push..." -msgstr "Đẩy lên..." - -#: git-gui.sh:2924 -msgid "Delete Branch..." -msgstr "Xoá nhánh..." - -#: git-gui.sh:2934 git-gui.sh:3557 -msgid "Options..." -msgstr "Tùy chọn..." - -#: git-gui.sh:2945 -msgid "Remove..." -msgstr "Gỡ bỏ..." - -#: git-gui.sh:2954 lib/choose_repository.tcl:54 -msgid "Help" -msgstr "Trợ giúp" - -#: git-gui.sh:2958 git-gui.sh:2962 lib/about.tcl:14 -#: lib/choose_repository.tcl:48 lib/choose_repository.tcl:57 -#, tcl-format -msgid "About %s" -msgstr "Giới thiệu về %s" - -#: git-gui.sh:2986 -msgid "Online Documentation" -msgstr "Đọc tài liệu trực tuyến" - -#: git-gui.sh:2989 lib/choose_repository.tcl:51 lib/choose_repository.tcl:60 -msgid "Show SSH Key" -msgstr "Hiện khoá SSH" - -#: git-gui.sh:3008 git-gui.sh:3140 -msgid "Usage" -msgstr "Cách dùng" - -#: git-gui.sh:3089 lib/blame.tcl:573 -msgid "Error" -msgstr "Lỗi" - -#: git-gui.sh:3120 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" -"lỗi nghiêm trọng: không thể lấy thông tin về đường dẫn %s: Không có tập tin " -"hoặc thư mục như vậy" - -#: git-gui.sh:3153 -msgid "Current Branch:" -msgstr "Nhánh hiện hành:" - -#: git-gui.sh:3179 -msgid "Staged Changes (Will Commit)" -msgstr "Đánh dấu các thay đổi (Sẽ chuyển giao)" - -#: git-gui.sh:3199 -msgid "Unstaged Changes" -msgstr "Bỏ ra khỏi bệ phóng các thay đổi" - -#: git-gui.sh:3270 -msgid "Stage Changed" -msgstr "Đặt lên bệ phóng các thay đổi" - -#: git-gui.sh:3289 lib/transport.tcl:137 lib/transport.tcl:229 -msgid "Push" -msgstr "Đẩy lên" - -#: git-gui.sh:3324 -msgid "Initial Commit Message:" -msgstr "Phần chú thích cho lần chuyển giao khởi tạo:" - -#: git-gui.sh:3325 -msgid "Amended Commit Message:" -msgstr "Phần chú giải cho lần chuyển giao tu bổ:" - -#: git-gui.sh:3326 -msgid "Amended Initial Commit Message:" -msgstr "Phần chú giải cho lần chuyển giao tu bổ lần khởi tạo:" - -#: git-gui.sh:3327 -msgid "Amended Merge Commit Message:" -msgstr "Phần chú giải cho lần chuyển giao tu bổ lần hòa trộn" - -#: git-gui.sh:3328 -msgid "Merge Commit Message:" -msgstr "Ghi chú của lần chuyển giao hòa trộn:" - -#: git-gui.sh:3329 -msgid "Commit Message:" -msgstr "Chú thích của lần chuyển giao:" - -#: git-gui.sh:3378 git-gui.sh:3532 lib/console.tcl:73 -msgid "Copy All" -msgstr "Chép tất cả" - -#: git-gui.sh:3402 lib/blame.tcl:105 -msgid "File:" -msgstr "Tập tin:" - -#: git-gui.sh:3520 -msgid "Refresh" -msgstr "Làm tươi lại" - -#: git-gui.sh:3541 -msgid "Decrease Font Size" -msgstr "Giảm kích cỡ phông" - -#: git-gui.sh:3545 -msgid "Increase Font Size" -msgstr "Tăng kích cỡ phông" - -#: git-gui.sh:3553 lib/blame.tcl:294 -msgid "Encoding" -msgstr "Bảng mã" - -#: git-gui.sh:3564 -msgid "Apply/Reverse Hunk" -msgstr "Áp dụng hay đảo ngược cả khối" - -#: git-gui.sh:3569 -msgid "Apply/Reverse Line" -msgstr "Áp dụng hay đảo ngược dòng" - -#: git-gui.sh:3588 -msgid "Run Merge Tool" -msgstr "Chạy công cụ hòa trộn" - -#: git-gui.sh:3593 -msgid "Use Remote Version" -msgstr "Dùng phiên bản ở máy chủ" - -#: git-gui.sh:3597 -msgid "Use Local Version" -msgstr "Dùng phiên bản ở máy nội bộ" - -#: git-gui.sh:3601 -msgid "Revert To Base" -msgstr "Trở lại cơ bản" - -#: git-gui.sh:3619 -msgid "Visualize These Changes In The Submodule" -msgstr "Hiển thị trực quan các thay đổi trong mô-đun con" - -#: git-gui.sh:3623 -msgid "Visualize Current Branch History In The Submodule" -msgstr "Hiển thị trực quan lịch sử nhánh hiện tại trong mô-đun con" - -#: git-gui.sh:3627 -msgid "Visualize All Branch History In The Submodule" -msgstr "Hiển thị trực quan lịch sử mọi nhánh trong mô-đun con" - -#: git-gui.sh:3632 -msgid "Start git gui In The Submodule" -msgstr "Khởi chạy git gui trong mô-đun-con" - -#: git-gui.sh:3667 -msgid "Unstage Hunk From Commit" -msgstr "Bỏ đánh dấu đoạn cần chuyển giao" - -#: git-gui.sh:3669 -msgid "Unstage Lines From Commit" -msgstr "Bỏ đánh dấu các dòng cần chuyển giao" - -#: git-gui.sh:3671 -msgid "Unstage Line From Commit" -msgstr "Bỏ đánh dấu dòng cần chuyển giao" - -#: git-gui.sh:3674 -msgid "Stage Hunk For Commit" -msgstr "Đánh dấu đoạn cần chuyển giao" - -#: git-gui.sh:3676 -msgid "Stage Lines For Commit" -msgstr "Đánh dấu các dòng cần chuyển giao" - -#: git-gui.sh:3678 -msgid "Stage Line For Commit" -msgstr "Đánh dấu dòng cần chuyển giao" - -#: git-gui.sh:3703 -msgid "Initializing..." -msgstr "Đang khởi tạo..." - -#: git-gui.sh:3846 -#, 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 "" -"Gần như chắc chắn là môi trường tồn tại.\n" -"\n" -"Các biến môi trường sau đây có lẽ sẽ bị bỏ qua bởi các tiến trình con git\n" -"chạy bởi %s:\n" -"\n" - -#: git-gui.sh:3875 -msgid "" -"\n" -"This is due to a known issue with the\n" -"Tcl binary distributed by Cygwin." -msgstr "" -"\n" -"Cái này có nguyên nhân bởi một lỗi phát ra từ\n" -"Tcl phân phối bởi Cygwin." - -#: git-gui.sh:3880 -#, 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" -"Thay thế tốt cho %s\n" -"là thay thế các giá trị cài đặt cho user.name và\n" -"user.email thành tập tin cá nhân của bạn\n" -"~/.gitconfig.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - công cụ đồ họa dành cho Git." - -#: lib/blame.tcl:73 -msgid "File Viewer" -msgstr "Bộ Xem Tập Tin" - -#: lib/blame.tcl:79 -msgid "Commit:" -msgstr "Lần chuyển giao:" - -#: lib/blame.tcl:280 -msgid "Copy Commit" -msgstr "Chép lần chuyển giao" - -#: lib/blame.tcl:284 -msgid "Find Text..." -msgstr "Tìm chữ..." - -#: lib/blame.tcl:288 -msgid "Goto Line..." -msgstr "Nhảy đến dòng..." - -#: lib/blame.tcl:297 -msgid "Do Full Copy Detection" -msgstr "Thực hiện dò tìm chép toàn bộ" - -#: lib/blame.tcl:301 -msgid "Show History Context" -msgstr "Hiển thị nội dung của lịch sử" - -#: lib/blame.tcl:304 -msgid "Blame Parent Commit" -msgstr "Xem công trạng của lần chuyển giao cha mẹ" - -#: lib/blame.tcl:466 -#, tcl-format -msgid "Reading %s..." -msgstr "Đang đọc %s..." - -#: lib/blame.tcl:594 -msgid "Loading copy/move tracking annotations..." -msgstr "Đang tải phần chú giải theo dõi chép/chuyển..." - -#: lib/blame.tcl:614 -msgid "lines annotated" -msgstr "dòng chú giải" - -#: lib/blame.tcl:806 -msgid "Loading original location annotations..." -msgstr "Đang tải các chú giải vị trí nguyên gốc..." - -#: lib/blame.tcl:809 -msgid "Annotation complete." -msgstr "Chú giải hoàn tất." - -#: lib/blame.tcl:839 -msgid "Busy" -msgstr "Bận" - -#: lib/blame.tcl:840 -msgid "Annotation process is already running." -msgstr "Tiến trình chú giải đang diễn ra." - -#: lib/blame.tcl:879 -msgid "Running thorough copy detection..." -msgstr "Đang chạy dò tìm sao chép toàn diện..." - -#: lib/blame.tcl:947 -msgid "Loading annotation..." -msgstr "Đang tải phần chú giải..." - -#: lib/blame.tcl:1000 -msgid "Author:" -msgstr "Tác giả:" - -#: lib/blame.tcl:1004 -msgid "Committer:" -msgstr "Người chuyển giao:" - -#: lib/blame.tcl:1009 -msgid "Original File:" -msgstr "Tập tin gốc:" - -#: lib/blame.tcl:1057 -msgid "Cannot find HEAD commit:" -msgstr "Không thể tìm thấy HEAD của lần chuyển giao:" - -#: lib/blame.tcl:1112 -msgid "Cannot find parent commit:" -msgstr "Không thể tìm thấy lần chuyển giao mẹ:" - -#: lib/blame.tcl:1127 -msgid "Unable to display parent" -msgstr "Không thể hiển thị cha mẹ" - -#: lib/blame.tcl:1128 lib/diff.tcl:341 -msgid "Error loading diff:" -msgstr "Gặp lỗi khi tải diff:" - -#: lib/blame.tcl:1269 -msgid "Originally By:" -msgstr "Nguyên gốc bởi:" - -#: lib/blame.tcl:1275 -msgid "In File:" -msgstr "Trong tập tin:" - -#: lib/blame.tcl:1280 -msgid "Copied Or Moved Here By:" -msgstr "Đã chép hoặc Di chuyển đến đây bởi:" - -#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "Lấy ra nhánh" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "Lấy ra" - -#: lib/branch_checkout.tcl:30 lib/branch_create.tcl:37 -#: lib/branch_delete.tcl:34 lib/branch_rename.tcl:32 lib/browser.tcl:292 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:45 lib/merge.tcl:174 -#: lib/option.tcl:127 lib/remote_add.tcl:34 lib/remote_branch_delete.tcl:43 -#: lib/tools_dlg.tcl:41 lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 -#: lib/transport.tcl:141 -msgid "Cancel" -msgstr "Thôi" - -#: lib/branch_checkout.tcl:35 lib/browser.tcl:297 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "Điểm sửa đổi" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:69 lib/option.tcl:309 -msgid "Options" -msgstr "Tùy chọn" - -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Lấy về nhánh được theo dõi" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "Tách rời từ Nhánh nội bộ" - -#: lib/branch_create.tcl:23 -msgid "Create Branch" -msgstr "Tạo nhánh" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "Tạo nhánh mới" - -#: lib/branch_create.tcl:33 lib/choose_repository.tcl:391 -msgid "Create" -msgstr "Tạo" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "Tên nhánh" - -#: lib/branch_create.tcl:44 lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 -msgid "Name:" -msgstr "Tên:" - -#: lib/branch_create.tcl:57 -msgid "Match Tracking Branch Name" -msgstr "Khớp với tên nhánh được theo dõi" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Điểm đầu" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Cập nhật nhánh sẵn có:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Không" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Chỉ fast-forward" - -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Đặt lại" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Lấy ra sau khi tạo" - -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "Vui lòng chọn nhánh theo dõi." - -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Nhánh theo dõi %s không phải là một nhánh trên kho chứa máy chủ." - -#: lib/branch_create.tcl:154 lib/branch_rename.tcl:92 -msgid "Please supply a branch name." -msgstr "Hãy cung cấp tên nhánh." - -#: lib/branch_create.tcl:165 lib/branch_rename.tcl:112 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "'%s' không phải là một tên nhánh được chấp nhận." - -#: lib/branch_delete.tcl:16 -msgid "Delete Branch" -msgstr "Xoá nhánh" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "Xóa nhánh nội bộ" - -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "Nhánh nội bộ" - -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "Chỉ xóa nếu đã hòa trộn vào" - -#: lib/branch_delete.tcl:53 lib/remote_branch_delete.tcl:120 -msgid "Always (Do not perform merge checks)" -msgstr "Luôn (Không thực hiện kiểm tra hòa trộn)" - -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Các nhánh sau đây không được hòa trộn hoàn toàn vào %s:" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:218 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Khôi phục các nhánh đã bị xóa là việc khó khăn.\n" -"\n" -"Xóa nhánh đã chọn chứ?" - -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Gặp lỗi khi xóa các nhánh:\n" -"%s" - -#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "Đổi tên nhánh" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "Đổi tên" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "Nhánh:" - -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "Tên mới:" - -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "Hãy chọn nhánh cần đổi tên." - -#: lib/branch_rename.tcl:102 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Nhánh '%s' đã có rồi." - -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Gặp lỗi khi đổi tên '%s'." - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Đang khởi động..." - -#: lib/browser.tcl:27 -msgid "File Browser" -msgstr "Bộ duyệt tập tin" - -#: lib/browser.tcl:132 lib/browser.tcl:149 -#, tcl-format -msgid "Loading %s..." -msgstr "Đang tải %s..." - -#: lib/browser.tcl:193 -msgid "[Up To Parent]" -msgstr "[Tới cha mẹ]" - -#: lib/browser.tcl:275 lib/browser.tcl:282 -msgid "Browse Branch Files" -msgstr "Duyệt các tập tin nhánh" - -#: lib/browser.tcl:288 lib/choose_repository.tcl:406 -#: lib/choose_repository.tcl:493 lib/choose_repository.tcl:502 -#: lib/choose_repository.tcl:1029 -msgid "Browse" -msgstr "Tìm duyệt" - -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" -msgstr "Đang lấy về %s từ %s" - -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" -msgstr "gặp lỗi nghiêm trọng: Không thể phân giải %s" - -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:30 -#: lib/sshkey.tcl:55 -msgid "Close" -msgstr "Đóng" - -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." -msgstr "Chưa có nhánh '%s'" - -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." -msgstr "Gặp lỗi khi cấu hình git-pull đơn giản dành cho '%s'." - -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." -msgstr "" -"Nhánh '%s' đã sẵn có.\n" -"\n" -"Không thể fast-forward thành %s.\n" -"Bạn cần phải hòa trộn." - -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." -msgstr "Không hỗ trợ chiến lược hòa trộn '%s'." - -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." -msgstr "Gặp lỗi khi cập nhật '%s'." - -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." -msgstr "Vùng bệ phóng (chỉ mục) đã bị khóa rồi." - -#: lib/checkout_op.tcl:289 -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 "" -"Trạng thái quét không khớp với trạng thái kho.\n" -"\n" -"Có Git khác đã sửa kho này kể từ lần quét cuối. Cần quét lại trước khi thực " -"hiện việc chuyển nhánh.\n" -"\n" -"Sẽ thực hiện việc quét lại ngay bây giời.\n" - -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." -msgstr "Cập nhật thư mục làm việc thành '%s'..." - -#: lib/checkout_op.tcl:346 -msgid "files checked out" -msgstr "các tập tin cần lấy ra" - -#: lib/checkout_op.tcl:376 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "Hủy bỏ lấy ra '%s' (cần hòa trộn mức tập tin)." - -#: lib/checkout_op.tcl:377 -msgid "File level merge required." -msgstr "Cần mức hòa trộn tập tin." - -#: lib/checkout_op.tcl:381 -#, tcl-format -msgid "Staying on branch '%s'." -msgstr "Đang ở trên nhánh '%s'." - -#: lib/checkout_op.tcl:452 -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 "" -"Bạn hiện không còn ở nhánh nội bộ.\n" -"\n" -"Nếu bạn muốn trên một nhánh, hãy tạo một cái từ 'Đây là lấy ra tách rời'." - -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 -#, tcl-format -msgid "Checked out '%s'." -msgstr "Đã lấy ra '%s'." - -#: lib/checkout_op.tcl:535 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Đặt lại '%s' thành '%s' sẽ làm mất những lần chuyển giao sau đây:" - -#: lib/checkout_op.tcl:557 -msgid "Recovering lost commits may not be easy." -msgstr "Lấy lại những lần chuyển giao đã mất là không dễ." - -#: lib/checkout_op.tcl:562 -#, tcl-format -msgid "Reset '%s'?" -msgstr "Đặt lại '%s'?" - -#: lib/checkout_op.tcl:567 lib/merge.tcl:166 lib/tools_dlg.tcl:336 -msgid "Visualize" -msgstr "Trực quan" - -#: lib/checkout_op.tcl:635 -#, 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 "" -"Gặp lỗi khi đặt nhánh hiện hành.\n" -"\n" -"Thư mục làm việc chỉ chuyển không hoàn toàn. Chúng tôi cập nhật thành công " -"các tập tin của bạn, nhưng lại gặp lỗi khi cập nhật một tập tin của Git.\n" -"\n" -"Điều này đáng lẽ không thể xảy ra. %s giờ sẽ đóng lại và đầu hàng." - -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "Chọn" - -#: lib/choose_font.tcl:55 -msgid "Font Family" -msgstr "Họ phông chữ" - -#: lib/choose_font.tcl:76 -msgid "Font Size" -msgstr "Cỡ phông chữ" - -#: lib/choose_font.tcl:93 -msgid "Font Example" -msgstr "Phông chữ ví dụ" - -#: lib/choose_font.tcl:105 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"Đây là chữ mẫu.\n" -"Nếu bạn thích chữ như thế này thì chọn phông chữ này." - -#: lib/choose_repository.tcl:32 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:91 lib/choose_repository.tcl:396 -msgid "Create New Repository" -msgstr "Tạo kho mới" - -#: lib/choose_repository.tcl:97 -msgid "New..." -msgstr "Mới..." - -#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:480 -msgid "Clone Existing Repository" -msgstr "Nhân bản một kho sẵn có" - -#: lib/choose_repository.tcl:115 -msgid "Clone..." -msgstr "Nhân bản..." - -#: lib/choose_repository.tcl:122 lib/choose_repository.tcl:1019 -msgid "Open Existing Repository" -msgstr "Mở một kho đã có." - -#: lib/choose_repository.tcl:128 -msgid "Open..." -msgstr "Mở..." - -#: lib/choose_repository.tcl:141 -msgid "Recent Repositories" -msgstr "Các kho mới dùng" - -#: lib/choose_repository.tcl:147 -msgid "Open Recent Repository:" -msgstr "Mở kho mới dùng:" - -#: lib/choose_repository.tcl:315 lib/choose_repository.tcl:322 -#: lib/choose_repository.tcl:329 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "Gặp lỗi khi tạo kho %s:" - -#: lib/choose_repository.tcl:401 -msgid "Directory:" -msgstr "Thư mục:" - -#: lib/choose_repository.tcl:431 lib/choose_repository.tcl:552 -#: lib/choose_repository.tcl:1053 -msgid "Git Repository" -msgstr "Kho Git" - -#: lib/choose_repository.tcl:456 -#, tcl-format -msgid "Directory %s already exists." -msgstr "Thư mục %s đã sẵn có." - -#: lib/choose_repository.tcl:460 -#, tcl-format -msgid "File %s already exists." -msgstr "Tập tin %s đã có sẵn." - -#: lib/choose_repository.tcl:475 -msgid "Clone" -msgstr "Nhân bản" - -#: lib/choose_repository.tcl:488 -msgid "Source Location:" -msgstr "Vị trí nguồn:" - -#: lib/choose_repository.tcl:497 -msgid "Target Directory:" -msgstr "Thư mục đích:" - -#: lib/choose_repository.tcl:507 -msgid "Clone Type:" -msgstr "Kiểu nhân bản:" - -#: lib/choose_repository.tcl:512 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "Tiêu chuẩn (Nhanh, Semi-Redundant, Hardlinks)" - -#: lib/choose_repository.tcl:517 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "Sao chép toàn bộ (Chậm hơn, Redundant Backup)" - -#: lib/choose_repository.tcl:522 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "Chia sẻ (Nhanh nhất, Không nên dùng, No Backup)" - -#: lib/choose_repository.tcl:558 lib/choose_repository.tcl:605 -#: lib/choose_repository.tcl:751 lib/choose_repository.tcl:821 -#: lib/choose_repository.tcl:1059 lib/choose_repository.tcl:1067 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "Không phải là kho git: %s" - -#: lib/choose_repository.tcl:594 -msgid "Standard only available for local repository." -msgstr "Tiêu chuẩn chỉ sẵn sàng với kho nội bộ." - -#: lib/choose_repository.tcl:598 -msgid "Shared only available for local repository." -msgstr "'Chia sẻ' chỉ sẵn sàng với kho nội bộ." - -#: lib/choose_repository.tcl:619 -#, tcl-format -msgid "Location %s already exists." -msgstr "Miền địa phương %s đã sẵn có." - -#: lib/choose_repository.tcl:630 -msgid "Failed to configure origin" -msgstr "Gặp lỗi khi cấu hình bản gốc" - -#: lib/choose_repository.tcl:642 -msgid "Counting objects" -msgstr "Đang đếm số đối tượng" - -#: lib/choose_repository.tcl:643 -msgid "buckets" -msgstr "xô" - -#: lib/choose_repository.tcl:667 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "Không thể sao chép objects/info/alternates: %s" - -#: lib/choose_repository.tcl:703 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "Không có gì để nhân bản từ %s" - -#: lib/choose_repository.tcl:705 lib/choose_repository.tcl:919 -#: lib/choose_repository.tcl:931 -msgid "The 'master' branch has not been initialized." -msgstr "Nhánh 'master' chưa được khởi tạo." - -#: lib/choose_repository.tcl:718 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Liên kết cứng không sẵn sàng. Trở lại chế độ sao chép." - -#: lib/choose_repository.tcl:730 -#, tcl-format -msgid "Cloning from %s" -msgstr "Đang nhân bản từ %s" - -#: lib/choose_repository.tcl:761 -msgid "Copying objects" -msgstr "Đang chép các đối tượng" - -#: lib/choose_repository.tcl:762 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:786 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "Không thể chép đối tượng: %s" - -#: lib/choose_repository.tcl:796 -msgid "Linking objects" -msgstr "Đang liên kết các đối tượng" - -#: lib/choose_repository.tcl:797 -msgid "objects" -msgstr "đối tượng" - -#: lib/choose_repository.tcl:805 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "Không thể tạo liên kết cứng đối tượng: %s" - -#: lib/choose_repository.tcl:860 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" -"Không thể lấy các nhánh và đối tượng. Xem kết xuất từ bảng điều khiển để có " -"thêm thông tin." - -#: lib/choose_repository.tcl:871 -msgid "Cannot fetch tags. See console output for details." -msgstr "" -"Không thể lấy về các thẻ. Hãy xem kết xuất từ bảng điều khiển để có thêm " -"thông tin chi tiết." - -#: lib/choose_repository.tcl:895 -msgid "Cannot determine HEAD. See console output for details." -msgstr "" -"Không thể dò tìm HEAD. Hãy xem kết xuất từ bảng điều khiển để có thêm thông " -"tin chi tiết." - -#: lib/choose_repository.tcl:904 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "Không thể dọn sạch %s" - -#: lib/choose_repository.tcl:910 -msgid "Clone failed." -msgstr "Gặp lỗi khi nhân bản." - -#: lib/choose_repository.tcl:917 -msgid "No default branch obtained." -msgstr "Không tìm thấy nhánh mặc định." - -#: lib/choose_repository.tcl:928 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "Không thể phân giải %s như là một lần chuyển giao." - -#: lib/choose_repository.tcl:940 -msgid "Creating working directory" -msgstr "Đang tạo thư mục làm việc" - -#: lib/choose_repository.tcl:941 lib/index.tcl:70 lib/index.tcl:136 -#: lib/index.tcl:207 -msgid "files" -msgstr "tập tin" - -#: lib/choose_repository.tcl:970 -msgid "Initial file checkout failed." -msgstr "Lấy ra tập tin khởi tạo gặp lỗi." - -#: lib/choose_repository.tcl:1014 -msgid "Open" -msgstr "Mở" - -#: lib/choose_repository.tcl:1024 -msgid "Repository:" -msgstr "Kho:" - -#: lib/choose_repository.tcl:1073 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "Gặp lỗi khi mở kho %s:" - -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" -msgstr "Đây là việc lấy ra bị tách rời" - -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" -msgstr "Biểu thức điểm xét:" - -#: lib/choose_rev.tcl:72 -msgid "Local Branch" -msgstr "Nhánh nội bộ" - -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" -msgstr "Nhánh Theo dõi" - -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 -msgid "Tag" -msgstr "Thẻ" - -#: lib/choose_rev.tcl:321 -#, tcl-format -msgid "Invalid revision: %s" -msgstr "Điểm xét duyệt không hợp lệ: %s" - -#: lib/choose_rev.tcl:342 -msgid "No revision selected." -msgstr "Chưa chọn điểm xét duyệt." - -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." -msgstr "Biểu thức chính quy rỗng." - -#: lib/choose_rev.tcl:537 -msgid "Updated" -msgstr "Đã cập nhật" - -#: lib/choose_rev.tcl:565 -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 "" -"Ở đây chẳng có gì để tu bổ cả.\n" -"\n" -"Bạn đang tạo lần chuyển giao khởi tạo. Ở đây không có lần chuyển giao trước " -"nào để mà tu bổ.\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 "" -"Không thể tu bổ trong khi hòa trộn.\n" -"\n" -"Bạn hiện đang ở giữa quá trình hòa trôn, mà nó chưa hoàn tất. Bạn không thể " -"tu bổ lần chuyển giao tiền nhiệm trừ phi bạn bãi bỏ lần hòa trộn hiện đang " -"kích hoạt.\n" - -#: lib/commit.tcl:48 -msgid "Error loading commit data for amend:" -msgstr "Gặp lỗi khi tải dữ liệu chuyển giao cho lệnh tu bổ:" - -#: lib/commit.tcl:75 -msgid "Unable to obtain your identity:" -msgstr "Không thể lấy được định danh của bạn:" - -#: lib/commit.tcl:80 -msgid "Invalid GIT_COMMITTER_IDENT:" -msgstr "GIT_COMMITTER_IDENT không hợp lệ:" - -#: lib/commit.tcl:129 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "cảnh báo: Tcl không hỗ trợ bảng mã '%s'." - -#: lib/commit.tcl:149 -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 "" -"Trạng thái quét không khớp với trạng thái kho.\n" -"\n" -"Có Git khác đã sửa kho này kể từ lần quét cuối. Cần quét lại trước khi thực " -"hiện việc chuyển giao khác.\n" -"\n" -"Sẽ thực hiện việc quét lại ngay bây giời.\n" - -#: lib/commit.tcl:173 -#, 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 "" -"Các tập tin chưa hòa trộn không thể được chuyển giao.\n" -"\n" -"Tập tin %s có xung đột hòa trộn. Bạn phải giải quyết chúng và đưa lên bệ " -"phóng trước khi chuyển giao.\n" - -#: lib/commit.tcl:181 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" -msgstr "" -"Tìm thấy trạng thái tập tim không hiểu %s.\n" -"\n" -"Tập tin %s không thể được chuyển giao bởi chương trình này.\n" - -#: lib/commit.tcl:189 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" -msgstr "" -"Không có thay đổi nào cần chuyển giao.\n" -"\n" -"Bạn phải đưa lên bệ phóng ít nhất là một tập tin trước khi có thể chuyển " -"giao.\n" - -#: lib/commit.tcl:204 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\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 "" -"Hãy cung cấp lời chú giải cho lần chuyển giao.\n" -"\n" -"Lời chú giải tốt nhất nên có định dạng sau:\n" -"\n" -"- Dòng đầu tiên: Mô tả những gì bạn đã làm.\n" -"- Dòng thứ hai: Để trống\n" -"- Các dòng còn lại: Mô tả xem vì sao những thay đổi này là cần thiết.\n" - -#: lib/commit.tcl:235 -msgid "Calling pre-commit hook..." -msgstr "Đang gọi móc (hook) pre-commit..." - -#: lib/commit.tcl:250 -msgid "Commit declined by pre-commit hook." -msgstr "Lần chuyển giao bị khước từ do móc pre-commit." - -#: lib/commit.tcl:269 -msgid "" -"You are about to commit on a detached head. This is a potentially dangerous " -"thing to do because if you switch to another branch you will lose your " -"changes and it can be difficult to retrieve them later from the reflog. You " -"should probably cancel this commit and create a new branch to continue.\n" -" \n" -" Do you really want to proceed with your Commit?" -msgstr "" -"Bạn thực hiện chuyển giao ở chỗ đã tách rời khỏi các đầu. Điều này là nguy " -"hiểm bởi nếu bạn chuyển sang nhánh khác thì bạn sẽ mất những thay đổi này và " -"việc lấy lại chúng từ reflog cũng khó khăn. Bạn gần như chắc chắn là nên hủy " -"bỏ lần chuyển giao này và tạo một nhánh mới trước khi tiếp tục.\n" -" \n" -" Bạn có thực sự muốn tiếp tục chuyển giao?" - -#: lib/commit.tcl:290 -msgid "Calling commit-msg hook..." -msgstr "Đang gọi móc commit-msg..." - -#: lib/commit.tcl:305 -msgid "Commit declined by commit-msg hook." -msgstr "Lần chuyển giao bị khước từ do móc commit-msg." - -#: lib/commit.tcl:318 -msgid "Committing changes..." -msgstr "Chuyển giao các thay đổi..." - -#: lib/commit.tcl:334 -msgid "write-tree failed:" -msgstr "gặp lỗi khi write-tree:" - -#: lib/commit.tcl:335 lib/commit.tcl:379 lib/commit.tcl:400 -msgid "Commit failed." -msgstr "Gặp lỗi khi chuyển giao." - -#: lib/commit.tcl:352 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "Lần chuyển giao %s có vẻ đã hư hỏng" - -#: lib/commit.tcl:357 -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 "" -"Không có thay đổi nào để chuyển giao.\n" -"\n" -"Không có tập tin nào được sửa bởi lần chuyển giao này và nó không phải là " -"lần chuyển giao hòa trộn.\n" -"\n" -"Sẽ thực hiện việc quét lại ngay bây giờ.\n" - -#: lib/commit.tcl:364 -msgid "No changes to commit." -msgstr "Không có thay đổi nào để chuyển giao." - -#: lib/commit.tcl:378 -msgid "commit-tree failed:" -msgstr "commit-tree gặp lỗi:" - -#: lib/commit.tcl:399 -msgid "update-ref failed:" -msgstr "cập nhật tham chiếu thất bại:" - -#: lib/commit.tcl:492 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "Lần chuyển giao đã tạo %s: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Đang chạy.. vui lòng đợi..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Thành công" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Lỗi: Câu lệnh gặp lỗi" - -#: lib/database.tcl:42 -msgid "Number of loose objects" -msgstr "Số lượng đối tượng bị mất" - -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" -msgstr "Dung lượng đĩa được dùng bởi các đối tượng bị mất" - -#: lib/database.tcl:44 -msgid "Number of packed objects" -msgstr "Số lượng đối tượng được đóng gói" - -#: lib/database.tcl:45 -msgid "Number of packs" -msgstr "Số lượng gói" - -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" -msgstr "Dung lượng đĩa được dùng bởi các đối tượng gói" - -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" -msgstr "Các đối tượng gói chờ xén bớt" - -#: lib/database.tcl:48 -msgid "Garbage files" -msgstr "Các tập tin rác" - -#: lib/database.tcl:72 -msgid "Compressing the object database" -msgstr "Nén cơ sở dữ liệu đối tượng" - -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" -msgstr "Đang kiểm tra cơ sở dữ liệu đối tượng bằng lệnh fsck" - -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" -msgstr "" -"Hiện kho này mất ước chừng khoảng %i đối tượng.\n" -"\n" -"Để tối ưu hóa hiệu suất, khuyến nghị bạn nên nén cơ sở dữ liệu của mình " -"lại.\n" -"\n" -"Nén cơ sở dữ liệu chứ?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ngày tháng không hợp lệ từ Git: %s" - -#: lib/diff.tcl:64 -#, 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 "" -"Không tìm thấy khác biệt gì.\n" -"\n" -"%s không thay đổi.\n" -"\n" -"Thời gian sửa đổi của tập tin này được cập nhật bởi ứng dụng khác, nhưng nội " -"dung bên trong tập tin thì không thay đổi.\n" -"\n" -"Sẽ thực hiện quét lại một cách tự động để tìm các tập tin khác cái mà có thể " -"có cùng tình trạng." - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Đang tải diff của %s..." - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"NỘIBỘ: đã xoá\n" -"MÁYCHỦ:\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"MÁYCHỦ: đã xoá\n" -"NỘIBỘ:\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "NỘI-BỘ:\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "MÁY-CHỦ:\n" - -#: lib/diff.tcl:202 lib/diff.tcl:340 -#, tcl-format -msgid "Unable to display %s" -msgstr "Không thể hiển thị %s" - -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "Lỗi khi tải tập tin:" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Kho Git (dự án con)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* Tập tin nhị phân (không hiển thị nội dung)." - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Tập tin chưa theo dõi là %d byte.\n" -"* Chỉ hiển thị %d byte đầu .\n" - -#: lib/diff.tcl:233 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Tập tin chưa theo dõi được cắt tại đây bởi %s.\n" -"* Để xem toàn bộ tập tin, hãy dùng ứng dụng biên soạn bên ngoài.\n" - -#: lib/diff.tcl:560 -msgid "Failed to unstage selected hunk." -msgstr "Gặp lỗi khi bỏ ra khỏi bệ phóng khối đã chọn" - -#: lib/diff.tcl:567 -msgid "Failed to stage selected hunk." -msgstr "Gặp lỗi khi đưa lên bệ phóng khối đã chọn" - -#: lib/diff.tcl:646 -msgid "Failed to unstage selected line." -msgstr "Gặp lỗi khi bỏ ra khỏi bệ phóng dòng đã chọn" - -#: lib/diff.tcl:654 -msgid "Failed to stage selected line." -msgstr "Gặp lỗi khi đưa lên bệ phóng dòng đã chọn" - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Mặc định" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Hệ thống (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Khác" - -#: lib/error.tcl:20 lib/error.tcl:116 -msgid "error" -msgstr "lỗi" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "cảnh báo" - -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." -msgstr "Bạn phải sửa các lỗi trên trước khi chuyển giao." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Không thể bỏ khóa bảng mục lục" - -#: lib/index.tcl:17 -msgid "Index Error" -msgstr "Lỗi mục lục" - -#: lib/index.tcl:19 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Cập nhật mục lục cho Git gặp lỗi. Việc quét lại sẽ tự động được khởi chạy để " -"đồng hóa lại với git-gui." - -#: lib/index.tcl:30 -msgid "Continue" -msgstr "Tiếp tục" - -#: lib/index.tcl:33 -msgid "Unlock Index" -msgstr "Bỏ khóa mục lục" - -#: lib/index.tcl:298 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Bỏ %s ra khỏi việc chuyển giao" - -#: lib/index.tcl:337 -msgid "Ready to commit." -msgstr "Đã chuyển giao rồi." - -#: lib/index.tcl:350 -#, tcl-format -msgid "Adding %s" -msgstr "Đang thêm %s" - -#: lib/index.tcl:380 -#, tcl-format -msgid "Stage %d untracked files?" -msgstr "Đưa %d tập tin chưa theo dõi lên bệ phóng để chuyển giao?" - -#: lib/index.tcl:428 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Hoàn nguyên các thay đổi trong tập tin %s?" - -#: lib/index.tcl:430 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Hoàn nguyên các thay đổi trong %i tập tin?" - -#: lib/index.tcl:438 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Mọi thay đổi chưa được đưa lên bệ phóng sẽ mất vĩnh viễn do lệnh revert." - -#: lib/index.tcl:441 -msgid "Do Nothing" -msgstr "Không làm gì" - -#: lib/index.tcl:459 -msgid "Reverting selected files" -msgstr "Đang hoàn nguyên các tập tin đã chọn" - -#: lib/index.tcl:463 -#, tcl-format -msgid "Reverting %s" -msgstr "Đang hoàn nguyên %s" - -#: lib/line.tcl:17 -msgid "Goto Line:" -msgstr "Nhảy đến dòng:" - -#: lib/line.tcl:23 -msgid "Go" -msgstr "Nhảy" - -#: 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 "" -"Không thể hòa trộn trong khi tu bổ.\n" -"\n" -"Bạn phải hoàn tất việc tu bổ lần chuyển giao trước khi bắt đầu bất kỳ kiểu " -"hòa trộn nào.\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 "" -"Trạng thái quét không khớp với trạng thái kho.\n" -"\n" -"Có Git khác đã sửa kho này kể từ lần quét cuối. Cần quét lại trước khi thực " -"hiện việc hòa trộn.\n" -"\n" -"Sẽ thực hiện việc quét lại ngay bây giời.\n" - -#: lib/merge.tcl:45 -#, 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 "" -"Bạn đang ở giữa việc thay đổi.\n" -"\n" -"Tập tin %s đã bị sửa đổi.\n" -"\n" -"Bạn nên hoàn thiện lần chuyển giao hiện nay trước khi hòa trộn. Chỉ có thế " -"bạn mới có thể bắt đầu hòa trộn cái .\n" - -#: lib/merge.tcl:55 -#, 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 "" -"Bạn đang ở giữa việc thay đổi.\n" -"\n" -"Tập tin %s đã bị sửa đổi.\n" -"\n" -"Bạn nên hoàn thiện lần chuyển giao hiện nay trước khi hòa trộn. Làm như vậy " -"giúp bạn có thể loại bỏ việc lỗi trong hòa trộn.\n" - -#: lib/merge.tcl:108 -#, tcl-format -msgid "%s of %s" -msgstr "%s trên %s" - -#: lib/merge.tcl:122 -#, tcl-format -msgid "Merging %s and %s..." -msgstr "Đang hòa trộn %s và %s..." - -#: lib/merge.tcl:133 -msgid "Merge completed successfully." -msgstr "Hòa trộn đã thực hiện thành công." - -#: lib/merge.tcl:135 -msgid "Merge failed. Conflict resolution is required." -msgstr "Hòa trộn gặp lỗi. Cần giải quyết các xung đột trước." - -#: lib/merge.tcl:160 -#, tcl-format -msgid "Merge Into %s" -msgstr "Hòa trộn vào %s" - -#: lib/merge.tcl:179 -msgid "Revision To Merge" -msgstr "Điểm cần hòa trộn" - -#: lib/merge.tcl:214 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"Không thể hủy bỏ trong khi đang tu bổ.\n" -"\n" -"Bạn cần phải hoàn tất việc tu bổ lần chuyển giao này.\n" - -#: lib/merge.tcl:224 -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 "" -"Bãi bỏ hòa trộn?\n" -"\n" -"Bãi bỏ hòa trộn hiện nay sẽ làm *TẤT CẢ* các thay đổi chưa được chuyển giao " -"bị mất.\n" -"\n" -"Tiếp tục bãi bỏ việc hòa trộn hiện tại?" - -#: lib/merge.tcl:230 -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 "" -"Đặt lại mọi thay đổi?\n" -"\n" -"Việc đặt lại các thay đổi sẽ làm *MỌI* thay đổi chưa chuyển giao biến mất.\n" -"\n" -"Vẫn tiếp tục đặt lại các thay đổi hiện tại?" - -#: lib/merge.tcl:241 -msgid "Aborting" -msgstr "Bãi bỏ" - -#: lib/merge.tcl:241 -msgid "files reset" -msgstr "đặt lại các tập tin" - -#: lib/merge.tcl:269 -msgid "Abort failed." -msgstr "Gặp lỗi khi bãi bỏ." - -#: lib/merge.tcl:271 -msgid "Abort completed. Ready." -msgstr "Đã bãi bỏ xong. Sẵn sàng." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Buộc phân giải thành nhánh cơ sở?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Buộc phân giải thành nhánh này?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Buộc phân giải thành nhánh khác?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Chú ý là diff chỉ hiển thị những thay đổi xung đột.\n" -"\n" -"%s sẽ bị ghi đè.\n" -"\n" -"Thao tác này chỉ có thể bỏ dở bằng cách khởi động lại việc hòa trộn." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "" -"Tập tin %s có vẻ chưa được giải quyết xung đột, vẫn đánh dấu là cần chuyển " -"giao?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Đang phân giải cho %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "Không thể phân giải xung đột xóa hay liên kết dùng một công cụ" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Tập tin xung đột không tồn tại" - -#: lib/mergetool.tcl:246 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Không phải là một công cụ hòa trộn GUI: '%s'" - -#: lib/mergetool.tcl:275 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Không hỗ trợ công cụ trộn '%s'" - -#: lib/mergetool.tcl:310 -msgid "Merge tool is already running, terminate it?" -msgstr "Công cụ hòa trộn đang chạy rồi, chấm dứt nó?" - -#: lib/mergetool.tcl:330 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Gặp lỗi khi truy lại phiên bản:\n" -"%s" - -#: lib/mergetool.tcl:350 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Không thể khởi chạy công cụ hòa trộn:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:354 -msgid "Running merge tool..." -msgstr "Đang chạy công cụ trộn..." - -#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 -msgid "Merge tool failed." -msgstr "Công cụ trộn gặp lỗi." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Bảng mã toàn cục không hợp lệ '%s'" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Bảng mã kho chứa không hợp lệ '%s'" - -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "Phục hồi thành mặc định" - -#: lib/option.tcl:123 -msgid "Save" -msgstr "Ghi lại" - -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "%s kho" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "Toàn cục (Mọi kho)" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "Tên người dùng" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "Địa chỉ thư điện tử" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "Tổng hợp về hòa trộn các lần chuyển giao" - -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "Chi tiết việc hòa trộn" - -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "Hiển thị thống kê khác biệt sau hòa trộn" - -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "Dùng Công cụ trộn" - -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "Tin dấu vết thời gian sửa đổi tập tin" - -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "Xén các nhánh theo dõi trong khi lấy về" - -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "Khớp nhánh theo dõi" - -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "Dùng Textconv Cho Diffs và Blames" - -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "Chỉ chép blame trên các tập tin thay đổi" - -#: lib/option.tcl:153 -msgid "Maximum Length of Recent Repositories List" -msgstr "Số lượng kho mới dùng tối đa được lưu trữ" - -#: lib/option.tcl:154 -msgid "Minimum Letters To Blame Copy On" -msgstr "Chữ tối thiểu để blame chép vào" - -#: lib/option.tcl:155 -msgid "Blame History Context Radius (days)" -msgstr "Bán kính ngữ cảnh lịch sử blame (ngày)" - -#: lib/option.tcl:156 -msgid "Number of Diff Context Lines" -msgstr "Số dòng nội dung Diff" - -#: lib/option.tcl:157 -msgid "Additional Diff Parameters" -msgstr "Đối số bổ xung cho Diff" - -#: lib/option.tcl:158 -msgid "Commit Message Text Width" -msgstr "Chiều rộng của phần chú thích" - -#: lib/option.tcl:159 -msgid "New Branch Name Template" -msgstr "Mẫu tên nhánh mới" - -#: lib/option.tcl:160 -msgid "Default File Contents Encoding" -msgstr "Bảng mã dành cho nội dung tập tin mặc định" - -#: lib/option.tcl:161 -msgid "Warn before committing to a detached head" -msgstr "Cảnh báo trước khi chuyển giao một đầu bị tách rời" - -#: lib/option.tcl:162 -msgid "Staging of untracked files" -msgstr "Đánh dấu những tập tin chưa được theo dõi là cần chuyển giao" - -#: lib/option.tcl:163 -msgid "Show untracked files" -msgstr "Hiện các tập tin chưa được theo dõi" - -#: lib/option.tcl:209 -msgid "Change" -msgstr "Thay đổi" - -#: lib/option.tcl:253 -msgid "Spelling Dictionary:" -msgstr "Từ điển chính tả:" - -#: lib/option.tcl:283 -msgid "Change Font" -msgstr "Đổi phông chữ" - -#: lib/option.tcl:287 -#, tcl-format -msgid "Choose %s" -msgstr "Chọn %s" - -#: lib/option.tcl:293 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:307 -msgid "Preferences" -msgstr "Cá nhân hóa" - -#: lib/option.tcl:344 -msgid "Failed to completely save options:" -msgstr "Gặp lỗi khi hoàn tất ghi lại các tùy chọn:" - -#: lib/remote_add.tcl:20 -msgid "Add Remote" -msgstr "Thêm máy chủ" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "Thêm máy chủ mới" - -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "Thêm vào" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "Chi tiết về máy chủ" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Vị trí:" - -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "Hành động thêm" - -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "Lấy về ngay lập tức" - -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "Khởi tạo Kho máy chủ và đẩy dữ liệu lên" - -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "Không làm gì cả" - -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "Hãy cung cấp tên máy chủ." - -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "'%s' không phải là tên máy chủ được chấp nhận." - -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Gặp lỗi khi thêm máy chủ '%s' của vị trí '%s'." - -#: lib/remote_add.tcl:132 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "lấy về %s" - -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "Đang lấy về %s" - -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "Không hiểu làm thế nào để khởi tạo kho chứa tại vị trí '%s'." - -#: lib/remote_add.tcl:162 lib/transport.tcl:54 lib/transport.tcl:92 -#: lib/transport.tcl:110 -#, tcl-format -msgid "push %s" -msgstr "đẩy %s lên máy chủ" - -#: lib/remote_add.tcl:163 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Cài đặt '%s' (tại %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Xóa nhánh trên máy chủ" - -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" -msgstr "Từ Kho" - -#: lib/remote_branch_delete.tcl:51 lib/transport.tcl:165 -msgid "Remote:" -msgstr "Máy chủ:" - -#: lib/remote_branch_delete.tcl:72 lib/transport.tcl:187 -msgid "Arbitrary Location:" -msgstr "Địa điểm tùy ý:" - -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" -msgstr "Nhánh" - -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" -msgstr "Chỉ xoá Nếu" - -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" -msgstr "Đã trộn vào:" - -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." -msgstr "Cần một nhánh cho 'Hòa trộn vào'." - -#: lib/remote_branch_delete.tcl:185 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Các nhánh sau đây không được hòa trộn hoàn toàn vào %s:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:190 -#, 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 "" -"Một hay nhiều hơn kiểm tra hòa trộn không đạt bởi vì bạn đã không lấy về " -"những lần chuyển giao cần thiết. Hãy lấy về từ %s trước đã." - -#: lib/remote_branch_delete.tcl:208 -msgid "Please select one or more branches to delete." -msgstr "Xin hãy chọn một hay nhiều nhánh cần xóa." - -#: lib/remote_branch_delete.tcl:227 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Đang xoá các nhánh từ %s" - -#: lib/remote_branch_delete.tcl:300 -msgid "No repository selected." -msgstr "Chưa chọn kho." - -#: lib/remote_branch_delete.tcl:305 -#, tcl-format -msgid "Scanning %s..." -msgstr "Đang quét: %s..." - -#: lib/remote.tcl:200 -msgid "Push to" -msgstr "Đẩy lên" - -#: lib/remote.tcl:218 -msgid "Remove Remote" -msgstr "Gỡ bỏ Máy chủ" - -#: lib/remote.tcl:223 -msgid "Prune from" -msgstr "Xén từ" - -#: lib/remote.tcl:228 -msgid "Fetch from" -msgstr "Lấy về từ" - -#: lib/search.tcl:48 -msgid "Find:" -msgstr "Tìm:" - -#: lib/search.tcl:50 -msgid "Next" -msgstr "Tiếp" - -#: lib/search.tcl:51 -msgid "Prev" -msgstr "Trước" - -#: lib/search.tcl:52 -msgid "RegExp" -msgstr "BTCQ" - -#: lib/search.tcl:54 -msgid "Case" -msgstr "Hoa" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "Không thể ghi lối tắt:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "Không thể ghi biểu tượng:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Không hỗ trợ kiểm tra chính tả" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Kiểm tra chính tả không sẵn sàng" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Cấu hình bộ soát chính tả không hợp lệ" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Đang hoàn nguyên từ điển thành %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Phần kiểm tra chính tả đã gặp lỗi khi khởi động" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Không chấp nhận bộ kiểm tra chính tả" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Không có gợi ý" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Gặp kết thúc bất ngờ từ bộ kiểm tra chính tả" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Kiểm tra chính tả không thành công" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "Không tìm thấy khóa nào." - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Tìm thấy khoá công khai trong: %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Tạo khoá" - -#: lib/sshkey.tcl:58 -msgid "Copy To Clipboard" -msgstr "Chép vào clipboard" - -#: lib/sshkey.tcl:72 -msgid "Your OpenSSH Public Key" -msgstr "Khóa công OpenSSH của bạn" - -#: lib/sshkey.tcl:80 -msgid "Generating..." -msgstr "Đang tạo..." - -#: lib/sshkey.tcl:86 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Không thể chạy ssh-keygen:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:113 -msgid "Generation failed." -msgstr "Việc tạo khoá đã thất bại." - -#: lib/sshkey.tcl:120 -msgid "Generation succeeded, but no keys found." -msgstr "Việc tạo thành công nhưng lại không tìm thấy khóa." - -#: lib/sshkey.tcl:123 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Khóa của bạn trong: %s" - -#: lib/status_bar.tcl:87 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i trong %*i %s (%3i%%)" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "Thêm công cụ" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Thêm lệnh công cụ mới" - -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "Thêm toàn cục" - -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "Chi tiết công cụ" - -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Dùng dấu ngăn cách '/' để tạo cây trình đơn con:" - -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "Lệnh:" - -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "Hiển thị hộp thoại trước khi chạy" - -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Hỏi người dùng chọn điểm xem xét (đặt biến $REVISION)" - -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Hỏi người dùng các đối số bổ xung thêm (đặt biến $ARGS)" - -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "Không hiển thị cửa sổ kết xuất câu lệnh" - -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Chỉ chạy nếu diff được chọn (biến $FILENAME không rỗng)" - -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "Hãy cung cấp tên cho công cụ." - -#: lib/tools_dlg.tcl:126 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Công cụ '%s' đã sẵn có." - -#: lib/tools_dlg.tcl:148 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Không thể thêm công cụ:\n" -"%s" - -#: lib/tools_dlg.tcl:187 -msgid "Remove Tool" -msgstr "Gỡ bỏ công cụ" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "Gỡ bỏ công cụ lệnh" - -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "Gỡ bỏ" - -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "(Các công cụ chỉ thị kho-nội-bộ xanh)" - -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "Chạy lệnh: %s" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "Đối số" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "Đồng ý" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Chạy %s yêu cầu cần phải chọn một tập tin." - -#: lib/tools.tcl:91 -#, tcl-format -msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "Bạn có chắc là muốn chạy %1$s trên tập tin \"%2$s\" không?" - -#: lib/tools.tcl:95 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Bạn có chắc là muốn chạy %s không?" - -#: lib/tools.tcl:116 -#, tcl-format -msgid "Tool: %s" -msgstr "Công cụ: %s" - -#: lib/tools.tcl:117 -#, tcl-format -msgid "Running: %s" -msgstr "Đang chạy: %s" - -#: lib/tools.tcl:155 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Công cụ được biên dịch thành công: %s" - -#: lib/tools.tcl:157 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Công cụ gặp lỗi: %s" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Lấy các thay đổi mới từ %s" - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "xén bớt trên máy chủ %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Xén bớt các nhánh theo dõi bị xóa từ %s" - -#: lib/transport.tcl:25 -msgid "fetch all remotes" -msgstr "lấy về từ tất cả các máy chủ" - -#: lib/transport.tcl:26 -msgid "Fetching new changes from all remotes" -msgstr "Đang lấy các thay đổi mới từ mọi máy chủ" - -#: lib/transport.tcl:40 -msgid "remote prune all remotes" -msgstr "xén bớt mọi máy chủ" - -#: lib/transport.tcl:41 -msgid "Pruning tracking branches deleted from all remotes" -msgstr "Xén tỉa các nhánh đã theo dõi bị xóa từ mọi máy chủ" - -#: lib/transport.tcl:55 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Đang đẩy các nhánh lên %s" - -#: lib/transport.tcl:93 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Bản sao đến %s" - -#: lib/transport.tcl:111 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "Đang (đẩy) %s %s lên %s" - -#: lib/transport.tcl:132 -msgid "Push Branches" -msgstr "Đẩy lên các nhánh" - -#: lib/transport.tcl:147 -msgid "Source Branches" -msgstr "Nhánh nguồn" - -#: lib/transport.tcl:162 -msgid "Destination Repository" -msgstr "Kho chứa đích" - -#: lib/transport.tcl:205 -msgid "Transfer Options" -msgstr "Tùy chọn truyền" - -#: lib/transport.tcl:207 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "Ép buộc ghi đè nhánh sẵn có (có thể sẽ loại bỏ các thay đổi)" - -#: lib/transport.tcl:211 -msgid "Use thin pack (for slow network connections)" -msgstr "Dùng gói mỏng (dành cho kết nối mạng chậm)" - -#: lib/transport.tcl:215 -msgid "Include tags" -msgstr "Bao gồm các thẻ" - -#~ msgid "Case-Sensitive" -#~ msgstr "Có phân biệt HOA/thường" diff --git a/third_party/git/git-gui/po/zh_cn.po b/third_party/git/git-gui/po/zh_cn.po deleted file mode 100644 index 91c1be23c2bb..000000000000 --- a/third_party/git/git-gui/po/zh_cn.po +++ /dev/null @@ -1,1967 +0,0 @@ -# Translation of git-gui to Chinese -# Copyright (C) 2007 Shawn Pearce -# This file is distributed under the same license as the git-gui package. -# Xudong Guan <xudong.guan@gmail.com>, 2007. -# -# Please use the following translation throughout the file for consistence: -# -# repository 版本库 -# commit 提交 -# revision 版本 -# branch 分支 -# tag 标签 -# annotation 标注 -# merge 合并 -# fast forward 快速合并(??) -# stage 缓存 (译自 index/cache) -# amend 修正 -# reset 复位 -# -# 2008-01-06 Eric Miao <eric.y.miao@gmail.com> -# FIXME: checkout 的标准翻译 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: git-gui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-14 07:18+0100\n" -"PO-Revision-Date: 2007-07-21 01:23-0700\n" -"Last-Translator: Eric Miao <eric.y.miao@gmail.com>\n" -"Language-Team: Chinese\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 -msgid "git-gui: fatal error" -msgstr "git-gui: 致命错误" - -#: git-gui.sh:593 -#, tcl-format -msgid "Invalid font specified in %s:" -msgstr "%s 中指定的字体无效:" - -#: git-gui.sh:620 -msgid "Main Font" -msgstr "主要字体" - -#: git-gui.sh:621 -msgid "Diff/Console Font" -msgstr "Diff/控制终端字体" - -#: git-gui.sh:635 -msgid "Cannot find git in PATH." -msgstr "PATH 中没有找到 git" - -#: git-gui.sh:662 -msgid "Cannot parse Git version string:" -msgstr "无法解析 Git 的版本信息:" - -#: git-gui.sh:680 -#, 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:918 -msgid "Git directory not found:" -msgstr "Git 目录无法找到:" - -#: git-gui.sh:925 -msgid "Cannot move to top of working directory:" -msgstr "无法移动到工作根目录:" - -#: git-gui.sh:932 -msgid "Cannot use funny .git directory:" -msgstr "无法使用 .git 目录:" - -#: git-gui.sh:937 -msgid "No working directory" -msgstr "没有工作目录" - -#: git-gui.sh:1084 lib/checkout_op.tcl:283 -msgid "Refreshing file status..." -msgstr "更新文件状态..." - -#: git-gui.sh:1149 -msgid "Scanning for modified files ..." -msgstr "扫描修改过的文件 ..." - -#: git-gui.sh:1324 lib/browser.tcl:246 -msgid "Ready." -msgstr "就绪" - -#: git-gui.sh:1590 -msgid "Unmodified" -msgstr "未修改" - -#: git-gui.sh:1592 -msgid "Modified, not staged" -msgstr "修改但未缓存" - -#: git-gui.sh:1593 git-gui.sh:1598 -msgid "Staged for commit" -msgstr "缓存为提交" - -#: git-gui.sh:1594 git-gui.sh:1599 -msgid "Portions staged for commit" -msgstr "部分缓存为提交" - -#: git-gui.sh:1595 git-gui.sh:1600 -msgid "Staged for commit, missing" -msgstr "缓存为提交, 不存在" - -#: git-gui.sh:1597 -msgid "Untracked, not staged" -msgstr "未跟踪, 未缓存" - -#: git-gui.sh:1602 -msgid "Missing" -msgstr "不存在" - -#: git-gui.sh:1603 -msgid "Staged for removal" -msgstr "缓存为删除" - -#: git-gui.sh:1604 -msgid "Staged for removal, still present" -msgstr "缓存为删除, 但仍存在" - -#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609 -msgid "Requires merge resolution" -msgstr "需要解决合并冲突" - -#: git-gui.sh:1644 -msgid "Starting gitk... please wait..." -msgstr "启动 gitk... 请等待..." - -#: git-gui.sh:1653 -#, tcl-format -msgid "" -"Unable to start gitk:\n" -"\n" -"%s does not exist" -msgstr "" -"无法启动 gitk:\n" -"\n" -"%s 不存在" - -#: git-gui.sh:1860 lib/choose_repository.tcl:36 -msgid "Repository" -msgstr "版本库(repository)" - -#: git-gui.sh:1861 -msgid "Edit" -msgstr "编辑" - -#: git-gui.sh:1863 lib/choose_rev.tcl:561 -msgid "Branch" -msgstr "分支(branch)" - -#: git-gui.sh:1866 lib/choose_rev.tcl:548 -msgid "Commit@@noun" -msgstr "提交(commit)" - -#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167 -msgid "Merge" -msgstr "合并(merge)" - -#: git-gui.sh:1870 lib/choose_rev.tcl:557 -msgid "Remote" -msgstr "远端(remote)" - -#: git-gui.sh:1879 -msgid "Browse Current Branch's Files" -msgstr "浏览当前分支上的文件" - -#: git-gui.sh:1883 -msgid "Browse Branch Files..." -msgstr "浏览分支上的文件..." - -#: git-gui.sh:1888 -msgid "Visualize Current Branch's History" -msgstr "图示当前分支的历史" - -#: git-gui.sh:1892 -msgid "Visualize All Branch History" -msgstr "图示所有分支的历史" - -#: git-gui.sh:1899 -#, tcl-format -msgid "Browse %s's Files" -msgstr "浏览 %s 上的文件" - -#: git-gui.sh:1901 -#, tcl-format -msgid "Visualize %s's History" -msgstr "图示 %s 分支的历史" - -#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67 -msgid "Database Statistics" -msgstr "数据库统计信息" - -#: git-gui.sh:1909 lib/database.tcl:34 -msgid "Compress Database" -msgstr "压缩数据库" - -#: git-gui.sh:1912 -msgid "Verify Database" -msgstr "验证数据库" - -#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 -msgid "Create Desktop Icon" -msgstr "创建桌面图标" - -#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185 -msgid "Quit" -msgstr "退出" - -#: git-gui.sh:1939 -msgid "Undo" -msgstr "撤销" - -#: git-gui.sh:1942 -msgid "Redo" -msgstr "重做" - -#: git-gui.sh:1946 git-gui.sh:2443 -msgid "Cut" -msgstr "剪切" - -#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614 -#: lib/console.tcl:69 -msgid "Copy" -msgstr "复制" - -#: git-gui.sh:1952 git-gui.sh:2449 -msgid "Paste" -msgstr "粘贴" - -#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 -msgid "Delete" -msgstr "删除" - -#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71 -msgid "Select All" -msgstr "全选" - -#: git-gui.sh:1968 -msgid "Create..." -msgstr "新建..." - -#: git-gui.sh:1974 -msgid "Checkout..." -msgstr "Checkout..." - -#: git-gui.sh:1980 -msgid "Rename..." -msgstr "更名..." - -#: git-gui.sh:1985 git-gui.sh:2085 -msgid "Delete..." -msgstr "删除..." - -#: git-gui.sh:1990 -msgid "Reset..." -msgstr "复位(Reset)..." - -#: git-gui.sh:2002 git-gui.sh:2389 -msgid "New Commit" -msgstr "新建提交" - -#: git-gui.sh:2010 git-gui.sh:2396 -msgid "Amend Last Commit" -msgstr "修正上次提交" - -#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99 -msgid "Rescan" -msgstr "重新扫描" - -#: git-gui.sh:2025 -msgid "Stage To Commit" -msgstr "缓存为提交" - -#: git-gui.sh:2031 -msgid "Stage Changed Files To Commit" -msgstr "缓存修改的文件为提交" - -#: git-gui.sh:2037 -msgid "Unstage From Commit" -msgstr "从本次提交撤除" - -#: git-gui.sh:2042 lib/index.tcl:395 -msgid "Revert Changes" -msgstr "撤销修改" - -#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467 -msgid "Sign Off" -msgstr "签名(Sign Off)" - -#: git-gui.sh:2053 git-gui.sh:2372 -msgid "Commit@@verb" -msgstr "提交" - -#: git-gui.sh:2064 -msgid "Local Merge..." -msgstr "本地合并..." - -#: git-gui.sh:2069 -msgid "Abort Merge..." -msgstr "中止合并..." - -#: git-gui.sh:2081 -msgid "Push..." -msgstr "上传..." - -#: git-gui.sh:2092 lib/choose_repository.tcl:41 -msgid "Apple" -msgstr "苹果" - -#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 -#, tcl-format -msgid "About %s" -msgstr "关于 %s" - -#: git-gui.sh:2099 -msgid "Preferences..." -msgstr "首选项..." - -#: git-gui.sh:2107 git-gui.sh:2639 -msgid "Options..." -msgstr "选项..." - -#: git-gui.sh:2113 lib/choose_repository.tcl:47 -msgid "Help" -msgstr "帮助" - -#: git-gui.sh:2154 -msgid "Online Documentation" -msgstr "在线文档" - -#: git-gui.sh:2238 -#, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在" - -#: git-gui.sh:2271 -msgid "Current Branch:" -msgstr "当前分支:" - -#: git-gui.sh:2292 -msgid "Staged Changes (Will Commit)" -msgstr "已缓存的改动 (将被提交)" - -#: git-gui.sh:2312 -msgid "Unstaged Changes" -msgstr "未缓存的改动" - -#: git-gui.sh:2362 -msgid "Stage Changed" -msgstr "缓存改动" - -#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182 -msgid "Push" -msgstr "上传" - -#: git-gui.sh:2408 -msgid "Initial Commit Message:" -msgstr "初始的提交描述:" - -#: git-gui.sh:2409 -msgid "Amended Commit Message:" -msgstr "修正的提交描述:" - -#: git-gui.sh:2410 -msgid "Amended Initial Commit Message:" -msgstr "修正的初始提交描述:" - -#: git-gui.sh:2411 -msgid "Amended Merge Commit Message:" -msgstr "修正的合并提交描述:" - -#: git-gui.sh:2412 -msgid "Merge Commit Message:" -msgstr "合并提交描述:" - -#: git-gui.sh:2413 -msgid "Commit Message:" -msgstr "提交描述:" - -#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73 -msgid "Copy All" -msgstr "全部复制" - -#: git-gui.sh:2483 lib/blame.tcl:107 -msgid "File:" -msgstr "文件:" - -#: git-gui.sh:2589 -msgid "Apply/Reverse Hunk" -msgstr "应用/撤消此修改块" - -#: git-gui.sh:2595 -msgid "Show Less Context" -msgstr "显示更少上下文" - -#: git-gui.sh:2602 -msgid "Show More Context" -msgstr "显示更多上下文" - -#: git-gui.sh:2610 -msgid "Refresh" -msgstr "刷新" - -#: git-gui.sh:2631 -msgid "Decrease Font Size" -msgstr "缩小字体" - -#: git-gui.sh:2635 -msgid "Increase Font Size" -msgstr "放大字体" - -#: git-gui.sh:2646 -msgid "Unstage Hunk From Commit" -msgstr "从提交中撤除修改块" - -#: git-gui.sh:2648 -msgid "Stage Hunk For Commit" -msgstr "缓存修改块为提交" - -#: git-gui.sh:2667 -msgid "Initializing..." -msgstr "初始化..." - -#: git-gui.sh:2762 -#, 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:2792 -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:2797 -#, 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" -"%s 的一个很好的替代方案是将 user.name 以及\n" -"user.email 设置放在你的个人 ~/.gitconfig 文件中.\n" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - Git 的图形化用户界面" - -#: lib/blame.tcl:77 -msgid "File Viewer" -msgstr "文件查看器" - -#: lib/blame.tcl:81 -msgid "Commit:" -msgstr "提交:" - -#: lib/blame.tcl:264 -msgid "Copy Commit" -msgstr "复制提交" - -#: lib/blame.tcl:384 -#, tcl-format -msgid "Reading %s..." -msgstr "读取 %s..." - -#: lib/blame.tcl:488 -msgid "Loading copy/move tracking annotations..." -msgstr "装载复制/移动跟踪标注..." - -#: lib/blame.tcl:508 -msgid "lines annotated" -msgstr "标注行" - -#: lib/blame.tcl:689 -msgid "Loading original location annotations..." -msgstr "装载原始位置标注..." - -#: lib/blame.tcl:692 -msgid "Annotation complete." -msgstr "标注完成." - -#: lib/blame.tcl:746 -msgid "Loading annotation..." -msgstr "裝載标注..." - -#: lib/blame.tcl:802 -msgid "Author:" -msgstr "作者:" - -#: lib/blame.tcl:806 -msgid "Committer:" -msgstr "提交者:" - -#: lib/blame.tcl:811 -msgid "Original File:" -msgstr "原始文件:" - -#: lib/blame.tcl:925 -msgid "Originally By:" -msgstr "最初由:" - -#: lib/blame.tcl:931 -msgid "In File:" -msgstr "在文件:" - -#: lib/blame.tcl:936 -msgid "Copied Or Moved Here By:" -msgstr "由复制或移动至此:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "Checkout 分支" - -#: 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:282 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171 -#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 -msgid "Cancel" -msgstr "取消" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 -msgid "Revision" -msgstr "版本" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242 -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:371 -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 "在创建后Checkout" - -#: 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: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:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "装载 %s..." - -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[上层目录]" - -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "浏览分支文件" - -#: lib/browser.tcl:278 lib/choose_repository.tcl:387 -#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484 -#: lib/choose_repository.tcl:987 -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:81 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 "缓存区域 (index) 已被锁定." - -#: 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:323 -msgid "files checked out" -msgstr "" - -#: lib/checkout_op.tcl:353 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." -msgstr "中止 '%s' 的 checkout 操作 (需要做文件级合并)." - -#: 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" -"如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支." - -#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450 -#, tcl-format -msgid "Checked out '%s'." -msgstr "'%s' 已被 checkout" - -#: 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:163 -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" -"\n" -"这本不该发生, %s 将关闭并放弃." - -#: lib/choose_font.tcl:39 -msgid "Select" -msgstr "选择" - -#: lib/choose_font.tcl:53 -msgid "Font Family" -msgstr "字体族" - -#: lib/choose_font.tcl:74 -msgid "Font Size" -msgstr "字体大小" - -#: lib/choose_font.tcl:91 -msgid "Font Example" -msgstr "字体样例" - -#: lib/choose_font.tcl:103 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." -msgstr "" -"这是样例文本.\n" -"如果你喜欢, 你可以设置该字体." - -#: lib/choose_repository.tcl:28 -msgid "Git Gui" -msgstr "Git Gui" - -#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376 -msgid "Create New Repository" -msgstr "创建新的版本库" - -#: lib/choose_repository.tcl:87 -msgid "New..." -msgstr "新建..." - -#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460 -msgid "Clone Existing Repository" -msgstr "克隆已有版本库" - -#: lib/choose_repository.tcl:100 -msgid "Clone..." -msgstr "克隆..." - -#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976 -msgid "Open Existing Repository" -msgstr "打开已有版本库" - -#: lib/choose_repository.tcl:113 -msgid "Open..." -msgstr "打开..." - -#: lib/choose_repository.tcl:126 -msgid "Recent Repositories" -msgstr "最近版本库" - -#: lib/choose_repository.tcl:132 -msgid "Open Recent Repository:" -msgstr "打开最近版本库" - -#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303 -#: lib/choose_repository.tcl:310 -#, tcl-format -msgid "Failed to create repository %s:" -msgstr "无法创建版本库 %s:" - -#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478 -msgid "Directory:" -msgstr "目录:" - -#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537 -#: lib/choose_repository.tcl:1011 -msgid "Git Repository" -msgstr "Git 版本库" - -#: lib/choose_repository.tcl:437 -#, tcl-format -msgid "Directory %s already exists." -msgstr "目录 %s 已经存在." - -#: lib/choose_repository.tcl:441 -#, tcl-format -msgid "File %s already exists." -msgstr "文件 %s 已经存在." - -#: lib/choose_repository.tcl:455 -msgid "Clone" -msgstr "克隆" - -#: lib/choose_repository.tcl:468 -msgid "URL:" -msgstr "URL:" - -#: lib/choose_repository.tcl:489 -msgid "Clone Type:" -msgstr "克隆类型:" - -#: lib/choose_repository.tcl:495 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "标准方式 (快速, 部分备份, 作硬连接)" - -#: lib/choose_repository.tcl:501 -msgid "Full Copy (Slower, Redundant Backup)" -msgstr "全部复制 (较慢, 做备份)" - -#: lib/choose_repository.tcl:507 -msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "共享方式 (最快, 不推荐, 不做备份)" - -#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590 -#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806 -#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025 -#, tcl-format -msgid "Not a Git repository: %s" -msgstr "不是一个 Git 版本库: %s" - -#: lib/choose_repository.tcl:579 -msgid "Standard only available for local repository." -msgstr "标准方式仅当是本地版本库时有效." - -#: lib/choose_repository.tcl:583 -msgid "Shared only available for local repository." -msgstr "共享方式仅当是本地版本库时有效." - -#: lib/choose_repository.tcl:604 -#, tcl-format -msgid "Location %s already exists." -msgstr "位置 %s 已经存在." - -#: lib/choose_repository.tcl:615 -msgid "Failed to configure origin" -msgstr "无法配置 origin" - -#: lib/choose_repository.tcl:627 -msgid "Counting objects" -msgstr "清点对象" - -#: lib/choose_repository.tcl:628 -#, fuzzy -msgid "buckets" -msgstr "水桶??" - -#: lib/choose_repository.tcl:652 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" -msgstr "无法复制 objects/info/alternates: %s" - -#: lib/choose_repository.tcl:688 -#, tcl-format -msgid "Nothing to clone from %s." -msgstr "没有东西可从 %s 克隆." - -#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904 -#: lib/choose_repository.tcl:916 -msgid "The 'master' branch has not been initialized." -msgstr "'master'分支尚未初始化." - -#: lib/choose_repository.tcl:703 -msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "硬连接不可用. 使用复制." - -#: lib/choose_repository.tcl:715 -#, tcl-format -msgid "Cloning from %s" -msgstr "从 %s 克隆" - -#: lib/choose_repository.tcl:746 -msgid "Copying objects" -msgstr "复制 objects" - -#: lib/choose_repository.tcl:747 -msgid "KiB" -msgstr "KiB" - -#: lib/choose_repository.tcl:771 -#, tcl-format -msgid "Unable to copy object: %s" -msgstr "无法复制 object: %s" - -#: lib/choose_repository.tcl:781 -msgid "Linking objects" -msgstr "链接 objects" - -#: lib/choose_repository.tcl:782 -msgid "objects" -msgstr "objects" - -#: lib/choose_repository.tcl:790 -#, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "无法硬链接 object: %s" - -#: lib/choose_repository.tcl:845 -msgid "Cannot fetch branches and objects. See console output for details." -msgstr "无法获取分支和对象. 请查看控制终端的输出." - -#: lib/choose_repository.tcl:856 -msgid "Cannot fetch tags. See console output for details." -msgstr "无法获取标签. 请查看控制终端的输出." - -#: lib/choose_repository.tcl:880 -msgid "Cannot determine HEAD. See console output for details." -msgstr "无法确定 HEAD. 请查看控制终端的输出." - -#: lib/choose_repository.tcl:889 -#, tcl-format -msgid "Unable to cleanup %s" -msgstr "无法清理 %s" - -#: lib/choose_repository.tcl:895 -msgid "Clone failed." -msgstr "克隆失败." - -#: lib/choose_repository.tcl:902 -msgid "No default branch obtained." -msgstr "没有获取缺省分支" - -#: lib/choose_repository.tcl:913 -#, tcl-format -msgid "Cannot resolve %s as a commit." -msgstr "无法解析 %s 为提交." - -#: lib/choose_repository.tcl:925 -msgid "Creating working directory" -msgstr "创建工作目录" - -#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127 -#: lib/index.tcl:193 -msgid "files" -msgstr "文件" - -#: lib/choose_repository.tcl:955 -msgid "Initial file checkout failed." -msgstr "初始的文件checkout失败" - -#: lib/choose_repository.tcl:971 -msgid "Open" -msgstr "打开" - -#: lib/choose_repository.tcl:981 -msgid "Repository:" -msgstr "版本库" - -#: lib/choose_repository.tcl:1031 -#, tcl-format -msgid "Failed to open repository %s:" -msgstr "无法打开版本库 %s:" - -#: lib/choose_rev.tcl:53 -msgid "This Detached Checkout" -msgstr "该脱节的Checkout" - -#: 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:538 -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:531 -msgid "Updated" -msgstr "已更新" - -#: lib/choose_rev.tcl:559 -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" -"否则无法修正之前的提交.\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 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:207 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "警告: Tcl 不支持编码方式 '%s'." - -#: lib/commit.tcl:221 -msgid "Calling pre-commit hook..." -msgstr "" - -#: lib/commit.tcl:236 -msgid "Commit declined by pre-commit hook." -msgstr "" - -#: lib/commit.tcl:259 -msgid "Calling commit-msg hook..." -msgstr "" - -#: lib/commit.tcl:274 -msgid "Commit declined by commit-msg hook." -msgstr "" - -#: lib/commit.tcl:287 -msgid "Committing changes..." -msgstr "" - -#: lib/commit.tcl:303 -msgid "write-tree failed:" -msgstr "write-tree 失败:" - -#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368 -#, fuzzy -msgid "Commit failed." -msgstr "克隆失败." - -#: lib/commit.tcl:321 -#, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "提交 %s 似乎已损坏" - -#: lib/commit.tcl:326 -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:333 -msgid "No changes to commit." -msgstr "没有改动要提交." - -#: lib/commit.tcl:347 -msgid "commit-tree failed:" -msgstr "commit-tree 失败:" - -#: lib/commit.tcl:367 -msgid "update-ref failed:" -msgstr "update-ref 失败:" - -#: lib/commit.tcl:454 -#, tcl-format -msgid "Created commit %s: %s" -msgstr "创建了 commit %s: %s" - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "工作中... 请等待..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "成功" - -#: lib/console.tcl:200 -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" -"\n" -"现在就压缩数据库么?" - -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "无效的日期: %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" -"该文件的修改日期被另一个程序所更新, 但其内容并没有变化.\n" -"\n" -"对于类似情况的其他文件的重新扫描将自动开始." - -#: lib/diff.tcl:81 -#, fuzzy, tcl-format -msgid "Loading diff of %s..." -msgstr "装载 %s 的 diff ..." - -#: 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:303 -msgid "Failed to unstage selected hunk." -msgstr "无法将选择的代码段从缓存中删除." - -#: lib/diff.tcl:310 -msgid "Failed to stage selected hunk." -msgstr "无法缓存所选代码段." - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "错误" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "警告" - -#: lib/error.tcl:94 -msgid "You must correct the above errors before committing." -msgstr "你必须在提交前修正上述错误." - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "无法解锁缓存 (index)" - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "缓存(Index)错误" - -#: lib/index.tcl:21 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui." - -#: lib/index.tcl:27 -msgid "Continue" -msgstr "继续" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "解锁 Index" - -#: lib/index.tcl:282 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "从提交缓存中删除 %s" - -#: lib/index.tcl:313 -#, fuzzy -msgid "Ready to commit." -msgstr "缓存为提交" - -#: lib/index.tcl:326 -#, tcl-format -msgid "Adding %s" -msgstr "添加 %s" - -#: lib/index.tcl:381 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "撤销文件 %s 中的改动?" - -#: lib/index.tcl:383 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "撤销这些 (%i个) 文件的改动?" - -#: lib/index.tcl:391 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "任何未缓存的改动将在这次撤销中永久丢失." - -#: lib/index.tcl:394 -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 "" - -#: lib/merge.tcl:119 -#, fuzzy, tcl-format -msgid "Merging %s and %s..." -msgstr "合并 %s 和 %s" - -#: lib/merge.tcl:130 -msgid "Merge completed successfully." -msgstr "合并成功完成." - -#: lib/merge.tcl:132 -msgid "Merge failed. Conflict resolution is required." -msgstr "合并失败. 需要解决冲突." - -#: lib/merge.tcl:157 -#, tcl-format -msgid "Merge Into %s" -msgstr "合并到 %s" - -#: lib/merge.tcl:176 -msgid "Revision To Merge" -msgstr "要合并的版本" - -#: lib/merge.tcl:211 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" -msgstr "" -"修正操作中无法中止.\n" -"\n" -"你必须先完成本次修正操作.\n" - -#: lib/merge.tcl:221 -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:227 -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:238 -msgid "Aborting" -msgstr "中止" - -#: lib/merge.tcl:238 -#, fuzzy -msgid "files reset" -msgstr "文件" - -#: lib/merge.tcl:265 -msgid "Abort failed." -msgstr "中止失败" - -#: lib/merge.tcl:267 -msgid "Abort completed. Ready." -msgstr "中止完成. 就绪." - -#: lib/option.tcl:95 -msgid "Restore Defaults" -msgstr "恢复默认值" - -#: lib/option.tcl:99 -msgid "Save" -msgstr "保存" - -#: lib/option.tcl:109 -#, tcl-format -msgid "%s Repository" -msgstr "%s 版本库" - -#: lib/option.tcl:110 -msgid "Global (All Repositories)" -msgstr "全局 (所有版本库)" - -#: lib/option.tcl:116 -msgid "User Name" -msgstr "用户名" - -#: lib/option.tcl:117 -msgid "Email Address" -msgstr "Email 地址" - -#: lib/option.tcl:119 -msgid "Summarize Merge Commits" -msgstr "概述合并提交:" - -#: lib/option.tcl:120 -msgid "Merge Verbosity" -msgstr "合并冗余度" - -#: lib/option.tcl:121 -msgid "Show Diffstat After Merge" -msgstr "在合并后显示 Diffstat" - -#: lib/option.tcl:123 -msgid "Trust File Modification Timestamps" -msgstr "相信文件的改动时间" - -#: lib/option.tcl:124 -msgid "Prune Tracking Branches During Fetch" -msgstr "获取时清除跟踪分支" - -#: lib/option.tcl:125 -msgid "Match Tracking Branches" -msgstr "匹配跟踪分支" - -#: lib/option.tcl:126 -msgid "Number of Diff Context Lines" -msgstr "Diff 上下文行数" - -#: lib/option.tcl:127 -#, fuzzy -msgid "Commit Message Text Width" -msgstr "提交描述:" - -#: lib/option.tcl:128 -msgid "New Branch Name Template" -msgstr "新建分支命名模板" - -#: lib/option.tcl:192 -msgid "Spelling Dictionary:" -msgstr "" - -#: lib/option.tcl:216 -msgid "Change Font" -msgstr "更改字体" - -#: lib/option.tcl:220 -#, tcl-format -msgid "Choose %s" -msgstr "选择 %s" - -#: lib/option.tcl:226 -msgid "pt." -msgstr "磅" - -#: lib/option.tcl:240 -msgid "Preferences" -msgstr "首选项" - -#: lib/option.tcl:275 -msgid "Failed to completely save options:" -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 "Remote:" - -#: 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/remote.tcl:165 -msgid "Prune from" -msgstr "从..清除(prune)" - -#: lib/remote.tcl:170 -msgid "Fetch from" -msgstr "从..获取(fetch)" - -#: lib/remote.tcl:213 -msgid "Push to" -msgstr "上传到(push)" - -#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 -msgid "Cannot write shortcut:" -msgstr "无法修改快捷方式:" - -#: lib/shortcut.tcl:136 -msgid "Cannot write icon:" -msgstr "无法修改图标:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "" - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "" - -#: lib/spellcheck.tcl:180 -msgid "No Suggestions" -msgstr "" - -#: lib/spellcheck.tcl:381 -msgid "Unexpected EOF from spell checker" -msgstr "" - -#: lib/spellcheck.tcl:385 -msgid "Spell Checker Failed" -msgstr "" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i of %*i %s (%3i%%)" - -#: lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "获取(fetch)" - -#: 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 "清除" - -#: 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 "上传 %s %s 到 %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 "包含标签" diff --git a/third_party/git/git-gui/windows/git-gui.sh b/third_party/git/git-gui/windows/git-gui.sh deleted file mode 100755 index b1845c505500..000000000000 --- a/third_party/git/git-gui/windows/git-gui.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Tcl ignores the next line -*- tcl -*- \ -exec wish "$0" -- "$@" - -if { $argc >=2 && [lindex $argv 0] == "--working-dir" } { - set workdir [lindex $argv 1] - cd $workdir - if {[lindex [file split $workdir] end] eq {.git}} { - # Workaround for Explorer right click "Git GUI Here" on .git/ - cd .. - } - set argv [lrange $argv 2 end] - incr argc -2 -} - -set basedir [file dirname \ - [file dirname \ - [file dirname [info script]]]] -set bindir [file join $basedir bin] -set bindir "$bindir;[file join $basedir mingw bin]" -regsub -all ";" $bindir "\\;" bindir -set env(PATH) "$bindir;$env(PATH)" -unset bindir - -source [file join [file dirname [info script]] git-gui.tcl] |